+1

Author: chfast

analysis/code_analysis.py

@@ -169,7 +169,7 @@ def encode(self, chunks: dict[int, int]) -> tuple[list[int], int]:
         for i, fio in chunks.items():
             delta = i - last_chunk_index
             ops += self.encode_entry(delta, fio)
-            last_chunk_index = i
+            last_chunk_index = i + 1
 
         return ops, self.WIDTH * len(ops)
 
@@ -189,6 +189,7 @@ def decode(self, ops: list[int]) -> dict[int, int]:
             i += delta
             m[i] = value
             running_skip = 0  # FIXME: unit test missing
+            i += 1
         return m
 
 
@@ -200,8 +201,8 @@ def test_scheme_consecutive():
     chunks = {0: 1, 1: 2, 2: 3}
     ops, _ = sch.encode(chunks)
     assert ops[0] == 0 * sch.VALUE_MOD + 1
-    assert ops[1] == 1 * sch.VALUE_MOD + 2
-    assert ops[2] == 1 * sch.VALUE_MOD + 3
+    assert ops[1] == 0 * sch.VALUE_MOD + 2
+    assert ops[2] == 0 * sch.VALUE_MOD + 3
 
     assert sch.decode(ops) == chunks
 
@@ -213,7 +214,7 @@ def test_scheme_skip_one():
     chunks = {0: 1, 2: 3}
     ops, _ = sch.encode(chunks)
     assert ops[0] == 0 * sch.VALUE_MOD + 1
-    assert ops[1] == 2 * sch.VALUE_MOD + 3
+    assert ops[1] == 1 * sch.VALUE_MOD + 3
 
     assert sch.decode(ops) == chunks
 
@@ -224,16 +225,15 @@ def test_scheme_skip_first():
     chunks = {1: 2, 2: 3}
     ops, _ = sch.encode(chunks)
     assert ops[0] == 1 * sch.VALUE_MOD + 2
-    assert ops[1] == 1 * sch.VALUE_MOD + 3
+    assert ops[1] == 0 * sch.VALUE_MOD + 3
 
     assert sch.decode(ops) == chunks
 
 
 def test_scheme_sparse_values():
     sch = Scheme("", 8)
-    gap = [Chunk(0, [], False)]
 
-    chunks = {0: 1, 2: 2, 4: 3}
+    chunks = {0: 1, 3: 2, 6: 3}
     ops, _ = sch.encode(chunks)
     assert ops[0] == 0 * sch.VALUE_MOD + 1
     assert ops[1] == 2 * sch.VALUE_MOD + 2
@@ -248,8 +248,8 @@ def test_scheme_skip_entry_0():
     chunks = {0: 1, 130: 3}
     ops, _ = sch.encode(chunks)
     assert ops[0] == 0 * sch.VALUE_MOD + 1
-    # assert ops[1] == sch.SKIP_ONLY + 127
-    # assert ops[2] == 0 * sch.VALUE_MOD + 3
+    assert ops[1] == sch.SKIP_ONLY + 127
+    assert ops[2] == 0 * sch.VALUE_MOD + 3
 
     assert sch.decode(ops) == chunks