add use_filtered_integer_values parameter to IntegerPlaceholderTransformer

Author: martineberlein

src/fdlearn/learning/instantiation.py

@@ -41,6 +41,7 @@ def instantiate_patterns(
         positive_inputs: set[FandangoInput],
         value_maps: ValueMap,
         reachability_map: ReachabilityMap = None,
+        use_filtered_integer_values=True,
     ) -> set[FandangoConstraintCandidate]:
 
         transformers = [
@@ -51,6 +52,7 @@ def instantiate_patterns(
             IntegerPlaceholderTransformer(
                 value_map=value_maps,
                 test_inputs=positive_inputs,
+                use_filtered_integer_values=use_filtered_integer_values,
             ),
             StringPlaceholderTransformer(
                 value_map=value_maps,
@@ -361,9 +363,9 @@ def _expand_searches(
                             for nt_ in path[1:-1]:
                                 tmp_ = AttributeSearch(RuleSearch(nt_), tmp_)
                             final = AttributeSearch(RuleSearch(bound_symbol), tmp_)
-                            #print(final)
+                            # print(final)
                             new_searches[key] = final
-                        #print("New:", new_searches)
+                        # print("New:", new_searches)
                         final_expanded.append(new_searches)
                         any_expanded = True
                     # else:
@@ -407,4 +409,3 @@ def _expand_searches(
                 final_final_expanded.append(new_searches)
 
         return final_final_expanded
-

src/fdlearn/learning/value_transformer.py

@@ -419,6 +419,16 @@ def _visit_expression(
 
 class IntegerPlaceholderTransformer(ValuePlaceholderTransformer):
 
+    def __init__(
+        self,
+        value_map: ValueMap,
+        test_inputs: set[FandangoInput],
+        use_partial_evaluation: bool = False,
+        use_filtered_integer_values=True,
+    ):
+        super().__init__(value_map, test_inputs, use_partial_evaluation)
+        self.use_filtered_integer_values = use_filtered_integer_values
+
     def update_value_map(self, bound: NonTerminal, search: RuleSearch):
         """Update the value map for the given bound with the search symbol."""
         if search.symbol in self.value_maps.numeric_values:
@@ -445,11 +455,17 @@ def _visit_comparison(
 
         result: list[ComparisonConstraint] = []
 
+        integer_values = (
+            self.value_maps.filtered_numeric_values
+            if self.use_filtered_integer_values
+            else self.value_maps.numeric_values
+        )
+
         new_replacements, found_pl = self.replace_placeholders(
             constraint,
             bounded_non_terminals,
             placeholder=NonTerminal("<INTEGER>"),
-            value_map=self.value_maps.numeric_values, # Changed from filtered_numeric_values
+            value_map=integer_values,
         )
 
         if not new_replacements and not found_pl: