wip

Author: andrewcropper

popper/combine.py

@@ -184,8 +184,7 @@ def find_combination(self, timeout):
                     weights.append(NEG_EXAMPLE_WEIGHT)
 
         # PRUNE INCONSISTENT
-        for prog_hash in self.inconsistent:
-            prog = self.prog_lookup[prog_hash]
+        for prog in self.inconsistent:
             should_add = True
             ids = []
             for rule in prog:

popper/loop.py

@@ -402,7 +402,7 @@ def run(self, bkcons):
                         # if inconsistent, prune generalisations
                         add_gen = True
                         if is_recursive:
-                            combiner.add_inconsistent(hash(prog))
+                            combiner.add_inconsistent(prog)
                             cons_ = frozenset(self.explain_inconsistent(prog))
                             new_cons.extend(cons_)
                             pruned_sub_inconsistent = len(cons_) > 0
@@ -843,10 +843,8 @@ def filter_combine_programs(self, combiner, to_combine):
         for prog_hash in to_delete:
             # AC: DELETE FROM SUCCESS_SETS_NOISE
             if prog_hash in combiner.saved_progs:
-                print('del1', prog_hash)
                 combiner.saved_progs.remove(prog_hash)
             else:
-                print('del2', prog_hash)
                 to_combine.remove(prog_hash)
 
     def subsumed_by_two_new(self, pos_covered, prog_size):