keep track of strategy index (#275)

such that the individual strategy statistics will be correct
data61 · Jul 7, 2023 · 604b02c · 604b02c
1 parent 083ec4c
commit 604b02c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/blocklib/pprlpsig.py b/blocklib/pprlpsig.py
@@ -58,8 +58,8 @@ def build_reversed_index(self, data: Sequence[Sequence], header: Optional[List[s
 
             signatures = generate_signatures(self.signature_strategies, dtuple, self.null_sentinel, feature_to_index)
 
-            for i, signature in enumerate(signatures):
-                reversed_index_per_strategy[i][signature].append(rec_id)
+            for strategy_index, signature in signatures:
+                reversed_index_per_strategy[strategy_index][signature].append(rec_id)
 
         reversed_index_per_strategy = [self.filter_reversed_index(data, reversed_index) for reversed_index in
                                        reversed_index_per_strategy]

diff --git a/blocklib/signature_generator.py b/blocklib/signature_generator.py
@@ -105,7 +105,7 @@ def generate_signatures(
     :param feature_to_index:
         Mapping from feature name to feature index
 
-    :return signatures: set of str
+    :return signatures: list of tuples (strategy_index, signature)
     """
     # signatures to return
     signatures = []
@@ -152,7 +152,7 @@ def generate_signatures(
                 sig.append(s)
         if len(sig) > 0:
             signatures.append(
-                "{}_{}".format(i, "_".join([x for x in sig if x is not None]))
+                (i, "{}_{}".format(i, "_".join([x for x in sig if x is not None])))
             )
 
     return signatures
diff --git a/tests/test_signature_generator.py b/tests/test_signature_generator.py
@@ -24,7 +24,7 @@ def test_feature_value(self):
             )
         ]
         signatures = generate_signatures(signatures, dtuple, "")
-        assert signatures == ["0_Joyce_Wang"]
+        assert signatures == [(0, "0_Joyce_Wang")]
 
     def test_char_at(self):
         """Test signatures generated by characters-at."""
@@ -40,7 +40,7 @@ def test_char_at(self):
         print(signatures)
 
         signatures = generate_signatures(signatures, dtuple, "")
-        assert signatures == ["0_oyc_ang"]
+        assert signatures == [(0, "0_oyc_ang")]
 
         # test :end_ind
         strategy = [
@@ -49,7 +49,7 @@ def test_char_at(self):
             ]
         ]
         signature = generate_signatures(strategy, dtuple, "")
-        assert signature == ["0_Joceyy"]
+        assert signature == [(0, "0_Joceyy")]
 
         res = generate_signatures(strategy, ('', ''), "")
         assert res == []
@@ -72,7 +72,7 @@ def test_metaphone(self):
             ]
         ]
         signatures = generate_signatures(signature_strategies, dtuple, "")
-        assert signatures == ["0_SM0XMT"]
+        assert signatures == [(0, "0_SM0XMT")]
 
     def test_generate_signatures(self):
         """Test a multi-strategy signatures."""
@@ -91,7 +91,7 @@ def test_generate_signatures(self):
             ]
         )
         signatures = generate_signatures(signatures, dtuple, "")
-        assert signatures == ["0_Joyce_Wang", "1_JSAS_ANKFNK"]
+        assert signatures == [(0, "0_Joyce_Wang"), (1, "1_JSAS_ANKFNK")]
 
     def test_generate_signatures_with_null(self):
         signature_strats = parse_obj_as(