renamed forward planner

dmeoli · dmeoli · commit c4139e50e3a7 · 2019-08-31T12:03:54.000+02:00
diff --git a/planning.py b/planning.py
@@ -487,7 +487,10 @@ def double_tennis_problem():
                         effect='At(actor, to) & ~At(actor, loc)')])
 
 
-class ForwardPlanner(search.Problem):
+class ForwardPlan(search.Problem):
+    """
+    Forward state-space search [Section 10.2.1]
+    """
 
     def __init__(self, planning_problem):
         super().__init__(associate('&', planning_problem.initial), associate('&', planning_problem.goals))
diff --git a/tests/test_planning.py b/tests/test_planning.py
@@ -202,18 +202,18 @@ def test_graphPlan():
 
 
 def test_forwardPlanner():
-    spare_tire_solution = astar_search(ForwardPlanner(spare_tire())).solution()
+    spare_tire_solution = astar_search(ForwardPlan(spare_tire())).solution()
     spare_tire_solution = list(map(lambda action: Expr(action.name, *action.args), spare_tire_solution))
     assert expr('Remove(Flat, Axle)') in spare_tire_solution
     assert expr('Remove(Spare, Trunk)') in spare_tire_solution
     assert expr('PutOn(Spare, Axle)') in spare_tire_solution
 
-    cake_solution = astar_search(ForwardPlanner(have_cake_and_eat_cake_too())).solution()
+    cake_solution = astar_search(ForwardPlan(have_cake_and_eat_cake_too())).solution()
     cake_solution = list(map(lambda action: Expr(action.name, *action.args), cake_solution))
     assert expr('Eat(Cake)') in cake_solution
     assert expr('Bake(Cake)') in cake_solution
 
-    air_cargo_solution = astar_search(ForwardPlanner(air_cargo())).solution()
+    air_cargo_solution = astar_search(ForwardPlan(air_cargo())).solution()
     air_cargo_solution = list(map(lambda action: Expr(action.name, *action.args), air_cargo_solution))
     assert expr('Load(C2, P2, JFK)') in air_cargo_solution
     assert expr('Fly(P2, JFK, SFO)') in air_cargo_solution
@@ -222,19 +222,19 @@ def test_forwardPlanner():
     assert expr('Fly(P2, SFO, JFK)') in air_cargo_solution
     assert expr('Unload(C1, P2, JFK)') in air_cargo_solution
 
-    sussman_anomaly_solution = astar_search(ForwardPlanner(three_block_tower())).solution()
+    sussman_anomaly_solution = astar_search(ForwardPlan(three_block_tower())).solution()
     sussman_anomaly_solution = list(map(lambda action: Expr(action.name, *action.args), sussman_anomaly_solution))
     assert expr('MoveToTable(C, A)') in sussman_anomaly_solution
     assert expr('Move(B, Table, C)') in sussman_anomaly_solution
     assert expr('Move(A, Table, B)') in sussman_anomaly_solution
 
-    blocks_world_solution = astar_search(ForwardPlanner(simple_blocks_world())).solution()
+    blocks_world_solution = astar_search(ForwardPlan(simple_blocks_world())).solution()
     blocks_world_solution = list(map(lambda action: Expr(action.name, *action.args), blocks_world_solution))
     assert expr('ToTable(A, B)') in blocks_world_solution
     assert expr('FromTable(B, A)') in blocks_world_solution
     assert expr('FromTable(C, B)') in blocks_world_solution
 
-    shopping_problem_solution = astar_search(ForwardPlanner(shopping_problem())).solution()
+    shopping_problem_solution = astar_search(ForwardPlan(shopping_problem())).solution()
     shopping_problem_solution = list(map(lambda action: Expr(action.name, *action.args), shopping_problem_solution))
     assert expr('Go(Home, SM)') in shopping_problem_solution
     assert expr('Buy(Banana, SM)') in shopping_problem_solution
