Changes to planning.py (aimacode#452)

Chipe1 · norvig · commit 28d799688387 · 2017-04-17T14:17:01.000-07:00
* Removed redundant condition

* moved gola_test inside function

* refactor goal_test()
diff --git a/planning.py b/planning.py
@@ -110,10 +110,7 @@ def air_cargo():
 
     def goal_test(kb):
         required = [expr('At(C1 , JFK)'), expr('At(C2 ,SFO)')]
-        for q in required:
-            if kb.ask(q) is False:
-                return False
-        return True
+        return all([kb.ask(q) is not False for q in required])
 
     # Actions
 
@@ -151,11 +148,8 @@ def spare_tire():
             expr('At(Spare, Trunk)')]
 
     def goal_test(kb):
-        required = [expr('At(Spare, Axle)'), expr('At(Flat, Ground)')]
-        for q in required:
-            if kb.ask(q) is False:
-                return False
-        return True
+        required = [expr('At(Spare, Axle)')]
+        return all(kb.ask(q) is not False for q in required)
 
     # Actions
 
@@ -197,10 +191,7 @@ def three_block_tower():
 
     def goal_test(kb):
         required = [expr('On(A, B)'), expr('On(B, C)')]
-        for q in required:
-            if kb.ask(q) is False:
-                return False
-        return True
+        return all(kb.ask(q) is not False for q in required)
 
     # Actions
 
@@ -228,10 +219,7 @@ def have_cake_and_eat_cake_too():
 
     def goal_test(kb):
         required = [expr('Have(Cake)'), expr('Eaten(Cake)')]
-        for q in required:
-            if kb.ask(q) is False:
-                return False
-        return True
+        return all(kb.ask(q) is not False for q in required)
 
     # Actions
 
@@ -517,18 +505,14 @@ def extract_solution(self, goals_pos, goals_neg, index):
         return solution
 
 
-def goal_test(kb, goals):
-    for q in goals:
-        if kb.ask(q) is False:
-            return False
-    return True
-
-
 def spare_tire_graphplan():
     pddl = spare_tire()
     negkb = FolKB([expr('At(Flat, Trunk)')])
     graphplan = GraphPlan(pddl, negkb)
 
+    def goal_test(kb, goals):
+        return all(kb.ask(q) is not False for q in goals)
+
     # Not sure
     goals_pos = [expr('At(Spare, Axle)'), expr('At(Flat, Ground)')]
     goals_neg = []
@@ -553,10 +537,7 @@ def double_tennis_problem():
 
     def goal_test(kb):
         required = [expr('Goal(Returned(Ball))'), expr('At(a, RightNet)'), expr('At(a, LeftNet)')]
-        for q in required:
-            if kb.ask(q) is False:
-                return False
-        return True
+        return all(kb.ask(q) is not False for q in required)
 
     # Actions
 
