merged in new changes to code, expanded rulesets and changes WherewhenHowNoFoa defaults

Author: eharpste

agents/WhereWhenHowNoFoa.py

@@ -7,7 +7,7 @@
 from concept_formation.structure_mapper import rename_flat
 
 from agents.BaseAgent import BaseAgent
-# from learners.WhereLearner import SpecificToGeneral
+from learners.WhereLearner import SpecificToGeneral
 # from learners.WhereLearner import RelationalLearner
 from learners.WhereLearner import MostSpecific
 from learners.WhenLearner import when_learners
@@ -26,9 +26,9 @@ class WhereWhenHowNoFoa(BaseAgent):
     This is the basis for the 2 mechanism model.
     """
     def __init__(self, action_set):
-        # self.where = SpecificToGeneral
+        self.where = SpecificToGeneral
         # self.where = RelationalLearner
-        self.where = MostSpecific
+        # self.where = MostSpecific
         # self.when = 'naive bayes'
         # self.when = 'always true'
         self.when = 'trestle'

learners/WhereLearner.py

@@ -412,7 +412,7 @@ def ifit(self, t, x, y):
 
 class SpecificToGeneral(BaseILP):
 
-    def __init__(self, remove_attrs=None):
+    def __init__(self, args=None, constraints=None, remove_attrs=None):
         self.pos = set()
         self.operator = None
         self.concept = Cobweb3Node()
@@ -424,10 +424,10 @@ def __init__(self, remove_attrs=None):
         self.remove_attrs = remove_attrs
 
     def num_pos(self):
-        return self.pos_concept.count()
+        return self.pos_concept.count
 
     def num_neg(self):
-        return self.neg_concept.count()
+        return self.neg_concept.count
 
     def __len__(self):
         return self.count

planners/rulesets.py

@@ -2,10 +2,10 @@
 
 # from nltk import ViterbiParser
 
-from planners.fo_planner import Operator
-from planners.fo_planner import FoPlanner
-from learners.Grammar import grammar
-from learners.WhatLearner import ViterbiParser
+from fo_planner import Operator
+from fo_planner import FoPlanner
+# from learners.Grammar import grammar
+# from learners.WhatLearner import ViterbiParser
 
 _then_gensym_counter = 0
 
@@ -427,17 +427,81 @@ def concatenate_without_space(x, y):
 
 if __name__ == "__main__":
 
-    facts = [(('value', 'a'), '3'),
-             (('value', 'b'), '3x')]
-    kb = FoPlanner(facts, [string_subtract_rule])
-    kb.fc_infer()
-    print(kb.facts)
+    # facts = [(('value', 'a'), '3'),
+    #          (('value', 'b'), '3x')]
+
+    facts = [
+              # (('x', ('bound', '?b1')), '?xv')
+              (('x', ('pos','rect1')),2),
+              (('y', ('pos','rect1')),1),
+              (('x', ('bound','rect1')),3),
+              (('y', ('bound','rect1')),1),
+
+              (('x', ('pos','block1')),1),
+              (('y', ('pos','block1')),2),
+              (('x', ('bound','block1')),1),
+              (('y', ('bound','block1')),1),
+
+              (('x', ('bound','block2')),1),
+              (('y', ('bound','block2')),1),
+
+              (('x', ('pos','check1')),1),
+              (('y', ('pos','check1')),1),
+
+              (('x', ('pos','check2')),1),
+              (('y', ('pos','check2')),3),
+
+              (('x', ('pos','check3')),3),
+              (('y', ('pos','check3')),1),
+
+              (('x', ('pos','check4')),3),
+              (('y', ('pos','check4')),3),
+
+              ]
+
+
+    # kb = FoPlanner(facts, [string_subtract_rule])
+    # kb.fc_infer()
+    # print(kb.facts)
 
     # facts = [(('value', 'x'), '17'),
     #          (('value', 'y'), '7')]
-    # kb = FoPlanner(facts, arith_rules + [half_val])
-    # from pprint import pprint
-    # for sol in kb.fc_query([(('value', '?a'), '98')], 3):
+    kb = FoPlanner(facts, rb_rules)
+    from pprint import pprint
+    
+
+    print('X')
+    i = 0
+    for sol in kb.fc_query([(('x', '?a'),3)], 2):
+      if i % 5 == 0:
+        pprint(sol)
+      if i > 5 * 10:
+        break
+      i += 1
+
+
+    print('Y')
+    i = 0
+    for sol in kb.fc_query([(('y', '?a'),2)], 2):
+      if i % 5 == 0:
+        pprint(sol)
+      if i > 5 * 10:
+        break
+      i += 1
+
+
+    
+    # print(len(xs))
+    # pprint(xs[:10])
+    
+    # ys = [sol for sol in kb.fc_query([(('y', '?a'),2)], 2)]
+    # print('Y')
+    # print(len(ys))
+    # pprint(ys[:10])    
+
+    # print('Y')
+    # for sol in kb.fc_query([(('y', '?a'),2)], 2):
     #     pprint(sol)
     # kb.fc_infer()
-    # print(kb.facts)
+    # pprint(kb.facts)
+