Add tests with very small blocks

flanglet · Nov 28, 2023 · 02ec874 · 02ec874
1 parent 0702dd4
commit 02ec874
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/v2/entropy/Entropy_test.go b/v2/entropy/Entropy_test.go
@@ -103,23 +103,34 @@ func testEntropyCorrectness(name string) error {
 		fmt.Printf("\n\nTest %v", ii)
 		var values []byte
 
-		if ii == 3 {
-			values = []byte{0, 0, 32, 15, -4 & 0xFF, 16, 0, 16, 0, 7, -1 & 0xFF, -4 & 0xFF, -32 & 0xFF, 0, 31, -1 & 0xFF}
-		} else if ii == 2 {
-			values = []byte{0x3d, 0x4d, 0x54, 0x47, 0x5a, 0x36, 0x39, 0x26, 0x72, 0x6f, 0x6c, 0x65, 0x3d, 0x70, 0x72, 0x65}
-		} else if ii == 1 {
+		switch ii {
+		case 1:
 			values = make([]byte, 32)
 
 			for i := range values {
 				values[i] = byte(2) // all identical
 			}
-		} else if ii == 5 {
+
+		case 2:
+			values = []byte{0x3d, 0x4d, 0x54, 0x47, 0x5a, 0x36, 0x39, 0x26, 0x72, 0x6f, 0x6c, 0x65, 0x3d, 0x70, 0x72, 0x65}
+
+		case 3:
+			values = []byte{0, 0, 32, 15, 252, 16, 0, 16, 0, 7, 255, 252, 224, 0, 31, 255}
+
+		case 4:
 			values = make([]byte, 32)
 
 			for i := range values {
 				values[i] = byte(2 + (i & 1)) // 2 symbols
 			}
-		} else {
+
+		case 5:
+			values = []byte{42}
+
+		case 6:
+			values = []byte{42, 42}
+
+		default:
 			values = make([]byte, 256)
 
 			for i := range values {

diff --git a/v2/entropy/HuffmanCodec.go b/v2/entropy/HuffmanCodec.go
@@ -235,6 +235,7 @@ func (this *HuffmanEncoder) updateFrequencies(freqs []int) (int, error) {
 	return count, nil
 }
 
+// Called only when more than 1 symbol (len(ranks)_ >= 2)
 func (this *HuffmanEncoder) computeCodeLengths(sizes []byte, ranks []int) (int, error) {
 	var frequencies [256]int
 	freqs := frequencies[0:len(ranks)]
@@ -300,6 +301,7 @@ func computeInPlaceSizesPhase1(data []int) {
 	}
 }
 
+// len(data) must be at least 2
 func computeInPlaceSizesPhase2(data []int) {
 	n := len(data)
 	levelTop := n - 2 //root