Started converting to 3rd edition. agents.py converted plus a little extra cleanup.

darius · darius · commit 5eb77e69ae19 · 2011-10-11T03:45:02.000Z
diff --git a/agents.py b/agents.py
@@ -122,6 +122,36 @@ def program(percept):
             return random.choice(actions)
         Agent.__init__(self, program)
 
+#______________________________________________________________________________
+
+class SimpleReflexAgent(Agent):
+    "This agent takes action based solely on the percept. [Fig. 2.10]"
+
+    def __init__(self, rules, interpret_input):
+        def program(percept):
+            state = interpret_input(percept)
+            rule = rule_match(state, rules)
+            action = rule.action
+            return action
+        Agent.__init__(self, program)
+
+class ModelBasedReflexAgent(Agent):
+    "This agent takes action based on the percept and state. [Fig. 2.12]"
+
+    def __init__(self, rules, update_state):
+        def program(percept):
+            program.state = update_state(program.state, program.action, percept)
+            rule = rule_match(program.state, rules)
+            action = rule.action
+            return action
+        program.state = program.action = None
+        Agent.__init__(self, program)
+
+def rule_match(state, rules):
+    "Find the first rule that matches state."
+    for rule in rules:
+        if rule.matches(state):
+            return rule
 
 #______________________________________________________________________________
 
@@ -165,7 +195,7 @@ class ModelBasedVacuumAgent(Agent):
     def __init__(self):
         model = {loc_A: None, loc_B: None}
         def program((location, status)):
-            "Same as ReflexVacuumAgent, except if everything is clean, do NoOp"
+            "Same as ReflexVacuumAgent, except if everything is clean, do NoOp."
             model[location] = status ## Update the model here
             if model[loc_A] == model[loc_B] == 'Clean': return 'NoOp'
             elif status == 'Dirty': return 'Suck'
@@ -446,37 +476,6 @@ def default_location(self, object):
         "Agents start in either location at random."
         return random.choice([loc_A, loc_B])
 
-#______________________________________________________________________________
-
-class SimpleReflexAgent(Agent):
-    """This agent takes action based solely on the percept. [Fig. 2.13]"""
-
-    def __init__(self, rules, interpret_input):
-        def program(percept):
-            state = interpret_input(percept)
-            rule = rule_match(state, rules)
-            action = rule.action
-            return action
-        Agent.__init__(self, program)
-
-class ReflexAgentWithState(Agent):
-    """This agent takes action based on the percept and state. [Fig. 2.16]"""
-
-    def __init__(self, rules, update_state):
-        def program(percept):
-            program.state = update_state(program.state, program.action, percept)
-            rule = rule_match(program.state, rules)
-            action = rule.action
-            return action
-        program.state = program.action = None
-        Agent.__init__(self, program)
-
-def rule_match(state, rules):
-    "Find the first rule that matches state."
-    for rule in rules:
-        if rule.matches(state):
-            return rule
-
 #______________________________________________________________________________
 ## The Wumpus World
 
@@ -589,7 +588,8 @@ def __init__(self, parent, env, canvas):
 
         # Create buttons and other controls
         
-        for txt, cmd in [('Step >', self.env.step), ('Run >>', self.run),
+        for txt, cmd in [('Step >', self.env.step),
+                         ('Run >>', self.run),
                          ('Stop [ ]', self.stop),
                          ('List objects', self.list_objects),
                          ('List agents', self.list_agents)]:
diff --git a/csp.py b/csp.py
@@ -1,5 +1,8 @@
 """CSP (Constraint Satisfaction Problems) problems and solvers. (Chapter 5)."""
 
+# (Written for the second edition of AIMA; expect some discrepanciecs
+# from the third edition until this gets reviewed.)
+
 from __future__ import generators
 from utils import *
 import search
diff --git a/games.py b/games.py
@@ -1,6 +1,8 @@
 """Games, or Adversarial Search. (Chapter 6)
 
 """
+# (Written for the second edition of AIMA; expect some discrepanciecs
+# from the third edition until this gets reviewed.)
 
 from utils import *
 import random 
diff --git a/learning.py b/learning.py
@@ -1,5 +1,8 @@
 """Learn to estimate functions  from examples. (Chapters 18-20)"""
 
+# (Written for the second edition of AIMA; expect some discrepanciecs
+# from the third edition until this gets reviewed.)
+
 from utils import *
 import agents, random, operator
 
diff --git a/logic.py b/logic.py
@@ -23,6 +23,8 @@
     unify            Do unification of two FOL sentences
     diff, simp       Symbolic differentiation and simplification             
 """
+# (Written for the second edition of AIMA; expect some discrepanciecs
+# from the third edition until this gets reviewed.)
 
 from __future__ import generators
 import re
diff --git a/mdp.py b/mdp.py
@@ -6,6 +6,9 @@
 dictionary of {state:number} pairs.  We then define the value_iteration 
 and policy_iteration algorithms."""
 
+# (Written for the second edition of AIMA; expect some discrepanciecs
+# from the third edition until this gets reviewed.)
+
 from utils import *
 
 class MDP:
diff --git a/nlp.py b/nlp.py
@@ -1,5 +1,8 @@
 """A chart parser and some grammars. (Chapter 22)"""
 
+# (Written for the second edition of AIMA; expect some discrepanciecs
+# from the third edition until this gets reviewed.)
+
 from utils import *
 
 #______________________________________________________________________________
diff --git a/planning.py b/planning.py
@@ -1,4 +1,4 @@
-"""Planning (Chapters 11-12)
+"""Planning (Chapters 10-11)
 """
 
 from __future__ import generators
diff --git a/probability.py b/probability.py
@@ -1,5 +1,7 @@
 """Probability models. (Chapter 13-15)
 """
+# (Written for the second edition of AIMA; expect some discrepanciecs
+# from the third edition until this gets reviewed.)
 
 from utils import *
 from logic import extend
diff --git a/search.py b/search.py
@@ -4,8 +4,8 @@
 then create problem instances and solve them with calls to the various search
 functions."""
 
-# The future is here, but if you're still in the past, uncomment next line
-# from __future__ import generators
+# (Written for the second edition of AIMA; expect some discrepanciecs
+# from the third edition until this gets reviewed.)
 
 from utils import *
 import agents
diff --git a/text.py b/text.py
@@ -4,6 +4,9 @@
 Then we show a very simple Information Retrieval system, and an example
 working on a tiny sample of Unix manual pages."""
 
+# (Written for the second edition of AIMA; expect some discrepanciecs
+# from the third edition until this gets reviewed.)
+
 from utils import *
 from math import log, exp
 import re, probability, string, search

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-"""Planning (Chapters 11-12)`
	`1`	`+"""Planning (Chapters 10-11)`
`2`	`2`	`"""`
`3`	`3`
`4`	`4`	`from __future__ import generators`