Minor cleanup.

darius · darius · commit 0f8c770744c3 · 2011-10-07T06:41:27.000Z
diff --git a/agents.py b/agents.py
@@ -545,13 +545,12 @@ def compare_agents(EnvFactory, AgentFactories, n=10, steps=1000):
 
 def test_agent(AgentFactory, steps, envs):
     "Return the mean score of running an agent in each of the envs, for steps"
-    total = 0
-    for env in envs:
+    def score(env):
         agent = AgentFactory()
         env.add_object(agent)
         env.run(steps)
-        total += agent.performance
-    return float(total)/len(envs)
+        return agent.performance
+    return mean(map(score, envs))
 
 #_________________________________________________________________________
 
@@ -567,7 +566,7 @@ def test_agent(AgentFactory, steps, envs):
 'Suck'
 
 >>> e = TrivialVacuumEnvironment()
->>> e.add_object(ModelBasedVacuumAgent()); None
+>>> e.add_object(ModelBasedVacuumAgent())
 >>> e.run(5)
 
 ## Environments, and some agents, are randomized, so the best we can
diff --git a/search.py b/search.py
@@ -156,8 +156,6 @@ def depth_first_graph_search(problem):
 
 def depth_limited_search(problem, limit=50):
     "[Fig. 3.12]"
-    # Would this not be more elegant with an exception instead of 'cutoff'?
-    # Or would an exception work better for the _successful_ case? ;-)
     def recursive_dls(node, problem, limit):
         if problem.goal_test(node.state):
             return node
@@ -484,7 +482,7 @@ def successor(self, state):
             return [] # All columns filled; no successors
         else:
             def place(col, row):
-                new = state[:] # copy the state
+                new = state[:]
                 new[col] = row
                 return new
             col = state.index(None)
