More agent-program cleanup, and incorporated fix from AIMA3e pseudocode.

darius · darius · commit 5fb618b73d49 · 2011-10-07T07:03:34.000Z
diff --git a/search.py b/search.py
@@ -91,8 +91,7 @@ def expand(self, problem):
 
 class SimpleProblemSolvingAgent(agents.Agent):
     """Abstract framework for problem-solving agent. [Fig. 3.1]"""
-    def __init__(self):
-        Agent.__init__(self)
+    def make_agent_program(self):
         state = []
         seq = []
 
@@ -102,12 +101,10 @@ def program(percept):
                 goal = self.formulate_goal(state)
                 problem = self.formulate_problem(state, goal)
                 seq = self.search(problem)
-            action = seq[0]
-            seq[0:1] = []
-            return action
-
-        self.program = program
+                if not seq: return None
+            return seq.pop(0)
 
+        return program
 #______________________________________________________________________________
 ## Uninformed Search algorithms
 
