Actually use bitMatrix, remove gonum, and some minor refactoring

celestiaorg · Apr 5, 2021 · 2d7373d · 2d7373d
1 parent 8e170ab
commit 2d7373d
Show file tree

Hide file tree

Showing 5 changed files with 111 additions and 222 deletions.
diff --git a/bit_matrix.go b/bit_matrix.go
@@ -7,10 +7,8 @@ type bitMatrix struct {
 	squareSize int
 }
 
-func newBitMatrix(squareSize, bits int) bitMatrix {
-	if squareSize*squareSize != bits {
-		panic(fmt.Sprintf("invalid arguments %v*%v != %v", squareSize, squareSize, bits))
-	}
+func newBitMatrix(squareSize int) bitMatrix {
+	bits := squareSize * squareSize
 	return bitMatrix{mask: make([]uint64, (bits+63)/64), squareSize: squareSize}
 }
 

diff --git a/bit_matrix_test.go b/bit_matrix_test.go
@@ -40,7 +40,7 @@ func Test_bitMatrix_ColRangeIsOne(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			bm := newBitMatrix(tt.initParams.squareSize, tt.initParams.bits)
+			bm := newBitMatrix(tt.initParams.squareSize)
 			for _, flatIdx := range tt.setBits {
 				bm.SetFlat(flatIdx)
 			}
@@ -91,7 +91,7 @@ func Test_bitMatrix_ColumnIsOne(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			bm := newBitMatrix(tt.initParams.squareSize, tt.initParams.bits)
+			bm := newBitMatrix(tt.initParams.squareSize)
 			for _, flatIdx := range tt.setBits {
 				bm.SetFlat(flatIdx)
 			}
@@ -126,7 +126,7 @@ func Test_bitMatrix_Get(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			bm := newBitMatrix(tt.initParams.squareSize, tt.initParams.bits)
+			bm := newBitMatrix(tt.initParams.squareSize)
 			for _, ind := range tt.setIndices {
 				bm.Set(ind.row, ind.col)
 			}
@@ -183,7 +183,7 @@ func Test_bitMatrix_NumOnesInCol(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			bm := newBitMatrix(tt.initParams.squareSize, tt.initParams.bits)
+			bm := newBitMatrix(tt.initParams.squareSize)
 			for _, flatIdx := range tt.setBits {
 				bm.SetFlat(flatIdx)
 			}
@@ -233,7 +233,7 @@ func Test_bitMatrix_NumOnesInRow(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			bm := newBitMatrix(tt.initParams.squareSize, tt.initParams.bits)
+			bm := newBitMatrix(tt.initParams.squareSize)
 			for _, flatIdx := range tt.setBits {
 				bm.SetFlat(flatIdx)
 			}
@@ -268,7 +268,7 @@ func Test_bitMatrix_RowIsOne(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			bm := newBitMatrix(tt.initParams.squareSize, tt.initParams.bits)
+			bm := newBitMatrix(tt.initParams.squareSize)
 			for _, flatIdx := range tt.setBits {
 				bm.SetFlat(flatIdx)
 			}
@@ -315,7 +315,7 @@ func Test_bitMatrix_RowRangeIsOne(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			bm := newBitMatrix(tt.initParams.squareSize, tt.initParams.bits)
+			bm := newBitMatrix(tt.initParams.squareSize)
 			for _, flatIdx := range tt.setBits {
 				bm.SetFlat(flatIdx)
 			}