Merge pull request #31 from andrewcropper/revert-30-variantconstraints

Revert "only build variants using existing variables when the size is bounded…"

Author: andrewcropper

popper/gen2.py

@@ -210,7 +210,7 @@ def unsat_constraint2(self, body):
 
     def build_generalisation_constraint3(self, prog, size=None):
         rule = tuple(prog)[0]
-        for body in self.find_variants(rule, max_rule_vars=True):
+        for body in self.find_variants(rule):
             body = list(body)
             body.append((True, 'body_size', (0, len(body))))
             if size:
@@ -228,13 +228,10 @@ def build_specialisation_constraint3(self, prog, size=None):
             body.append((True, 'program_size_at_least', (size,)))
             yield frozenset(body)
 
-    def find_variants(self, rule, max_rule_vars=False):
+    def find_variants(self, rule):
         head, body = rule
         body_vars = frozenset(x for literal in body for x in literal.arguments if x >= len(head.arguments))
-        if max_rule_vars:
-            subset = range(len(head.arguments), len(body_vars)+1)
-        else:
-            subset = range(len(head.arguments), self.settings.max_vars)
+        subset = range(len(head.arguments), self.settings.max_vars)
         for xs in permutations(subset, len(body_vars)):
             xs = head.arguments + xs
             new_body = []

popper/gen3.py

@@ -431,7 +431,7 @@ def build_generalisation_constraint3(self, prog, size=None):
                 return
 
             self.new_seen_rules.update(self.build_seen_rule2(rule, False))
-            for variant in self.find_variants3(rule, max_rule_vars=True):
+            for variant in self.find_variants3(rule):
                 con = []
                 con.extend(variant)
                 con.append((True, 'body_size', (0, len(body))))
@@ -452,7 +452,7 @@ def build_generalisation_constraint3(self, prog, size=None):
             bases.append(frozenset(con))
         else:
             self.new_seen_rules.update(self.build_seen_rule2(base, False))
-            for variant in self.find_variants3(base, ruleid=0, max_rule_vars=True):
+            for variant in self.find_variants3(base, ruleid=0):
                 con = []
                 con.extend(variant)
                 con.append((True, 'body_size', (0, len(base_body))))
@@ -469,7 +469,7 @@ def build_generalisation_constraint3(self, prog, size=None):
             bases.append(frozenset(con))
         else:
             self.new_seen_rules.update(self.build_seen_rule2(rec, True))
-            for variant in self.find_variants3(rec, ruleid=1, max_rule_vars=True):
+            for variant in self.find_variants3(rec, ruleid=1):
                 con = []
                 con.extend(variant)
                 con.append((True, 'body_size', (1, len(rec_body))))
@@ -501,7 +501,7 @@ def build_banish_constraint(self, prog):
 
             self.new_seen_rules.update(self.build_seen_rule2(rule, False))
 
-            for variant in self.find_variants3(rule, max_rule_vars=True):
+            for variant in self.find_variants3(rule):
                 con = []
                 con.extend(variant)
                 con.append((True, 'body_size', (0, len(body))))
@@ -521,7 +521,7 @@ def build_banish_constraint(self, prog):
             bases.append(frozenset(con))
         else:
             self.new_seen_rules.update(self.build_seen_rule2(base, False))
-            for variant in self.find_variants3(base, ruleid=0, max_rule_vars=True):
+            for variant in self.find_variants3(base, ruleid=0):
                 con = []
                 con.extend(variant)
                 con.append((True, 'body_size', (0, len(base_body))))
@@ -538,7 +538,7 @@ def build_banish_constraint(self, prog):
             bases.append(frozenset(con))
         else:
             self.new_seen_rules.update(self.build_seen_rule2(rec, True))
-            for variant in self.find_variants3(rec, ruleid=1, max_rule_vars=True):
+            for variant in self.find_variants3(rec, ruleid=1):
                 con = []
                 con.extend(variant)
                 con.append((True, 'body_size', (1, len(rec_body))))
@@ -548,14 +548,10 @@ def build_banish_constraint(self, prog):
             for r2 in recs:
                 yield r1 | r2
 
-    def find_variants3(self, rule, ruleid=0, max_rule_vars=False):
+    def find_variants3(self, rule, ruleid=0):
         head, body = rule
         head_arity = len(self.settings.head_literal.arguments)
         body_vars = frozenset(x for literal in body for x in literal.arguments if x >= head_arity)
-        if max_rule_vars:
-            subset = range(len(head.arguments), len(body_vars)+1)
-        else:
-            subset = range(len(head.arguments), self.settings.max_vars)
         subset = range(head_arity, self.settings.max_vars)
         for xs in permutations(subset, len(body_vars)):
             xs = head.arguments + xs