fixed build error

Author: dmeoli

agents_4e.py

@@ -113,9 +113,11 @@ def new_program(percept):
         action = old_program(percept)
         print('{} perceives {} and does {}'.format(agent, percept, action))
         return action
+
     agent.program = new_program
     return agent
 
+
 # ______________________________________________________________________________
 
 
@@ -130,6 +132,7 @@ def program(percept):
         percepts.append(percept)
         action = table.get(tuple(percepts))
         return action
+
     return program
 
 
@@ -146,26 +149,31 @@ def RandomAgentProgram(actions):
     """
     return lambda percept: random.choice(actions)
 
+
 # ______________________________________________________________________________
 
 
 def SimpleReflexAgentProgram(rules, interpret_input):
     """This agent takes action based solely on the percept. [Figure 2.10]"""
+
     def program(percept):
         state = interpret_input(percept)
         rule = rule_match(state, rules)
         action = rule.action
         return action
+
     return program
 
 
 def ModelBasedReflexAgentProgram(rules, update_state, trainsition_model, sensor_model):
     """This agent takes action based on the percept and state. [Figure 2.12]"""
+
     def program(percept):
         program.state = update_state(program.state, program.action, percept, trainsition_model, sensor_model)
         rule = rule_match(program.state, rules)
         action = rule.action
         return action
+
     program.state = program.action = None
     return program
 
@@ -176,6 +184,7 @@ def rule_match(state, rules):
         if rule.matches(state):
             return rule
 
+
 # ______________________________________________________________________________
 
 
@@ -219,6 +228,7 @@ def ReflexVacuumAgent():
     >>> environment.status == {(1,0):'Clean' , (0,0) : 'Clean'}
     True
     """
+
     def program(percept):
         location, status = percept
         if status == 'Dirty':
@@ -227,6 +237,7 @@ def program(percept):
             return 'Right'
         elif location == loc_B:
             return 'Left'
+
     return Agent(program)
 
 
@@ -253,8 +264,10 @@ def program(percept):
             return 'Right'
         elif location == loc_B:
             return 'Left'
+
     return Agent(program)
 
+
 # ______________________________________________________________________________
 
 
@@ -392,22 +405,22 @@ def __add__(self, heading):
         True
         """
         if self.direction == self.R:
-            return{
+            return {
                 self.R: Direction(self.D),
                 self.L: Direction(self.U),
             }.get(heading, None)
         elif self.direction == self.L:
-            return{
+            return {
                 self.R: Direction(self.U),
                 self.L: Direction(self.D),
             }.get(heading, None)
         elif self.direction == self.U:
-            return{
+            return {
                 self.R: Direction(self.R),
                 self.L: Direction(self.L),
             }.get(heading, None)
         elif self.direction == self.D:
-            return{
+            return {
                 self.R: Direction(self.L),
                 self.L: Direction(self.R),
             }.get(heading, None)
@@ -425,13 +438,13 @@ def move_forward(self, from_location):
         """
         x, y = from_location
         if self.direction == self.R:
-            return (x + 1, y)
+            return x + 1, y
         elif self.direction == self.L:
-            return (x - 1, y)
+            return x - 1, y
         elif self.direction == self.U:
-            return (x, y - 1)
+            return x, y - 1
         elif self.direction == self.D:
-            return (x, y + 1)
+            return x, y + 1
 
 
 class XYEnvironment(Environment):
@@ -462,7 +475,7 @@ def things_near(self, location, radius=None):
         radius2 = radius * radius
         return [(thing, radius2 - distance_squared(location, thing.location))
                 for thing in self.things if distance_squared(
-                                                location, thing.location) <= radius2]
+                location, thing.location) <= radius2]
 
     def percept(self, agent):
         """By default, agent perceives things within a default radius."""
@@ -476,17 +489,17 @@ def execute_action(self, agent, action):
             agent.direction += Direction.L
         elif action == 'Forward':
             agent.bump = self.move_to(agent, agent.direction.move_forward(agent.location))
-#         elif action == 'Grab':
-#             things = [thing for thing in self.list_things_at(agent.location)
-#                     if agent.can_grab(thing)]
-#             if things:
-#                 agent.holding.append(things[0])
+        #         elif action == 'Grab':
+        #             things = [thing for thing in self.list_things_at(agent.location)
+        #                     if agent.can_grab(thing)]
+        #             if things:
+        #                 agent.holding.append(things[0])
         elif action == 'Release':
             if agent.holding:
                 agent.holding.pop()
 
     def default_location(self, thing):
-        return (random.choice(self.width), random.choice(self.height))
+        return random.choice(self.width), random.choice(self.height)
 
     def move_to(self, thing, destination):
         """Move a thing to a new location. Returns True on success or False if there is an Obstacle.
@@ -505,7 +518,7 @@ def move_to(self, thing, destination):
     def add_thing(self, thing, location=(1, 1), exclude_duplicate_class_items=False):
         """Add things to the world. If (exclude_duplicate_class_items) then the item won't be
         added if the location has at least one item of the same class."""
-        if (self.is_inbounds(location)):
+        if self.is_inbounds(location):
             if (exclude_duplicate_class_items and
                     any(isinstance(t, thing.__class__) for t in self.list_things_at(location))):
                 return
@@ -514,14 +527,14 @@ def add_thing(self, thing, location=(1, 1), exclude_duplicate_class_items=False)
     def is_inbounds(self, location):
         """Checks to make sure that the location is inbounds (within walls if we have walls)"""
         x, y = location
-        return not (x < self.x_start or x >= self.x_end or y < self.y_start or y >= self.y_end)
+        return not (x < self.x_start or x > self.x_end or y < self.y_start or y > self.y_end)
 
     def random_location_inbounds(self, exclude=None):
         """Returns a random location that is inbounds (within walls if we have walls)"""
         location = (random.randint(self.x_start, self.x_end),
                     random.randint(self.y_start, self.y_end))
         if exclude is not None:
-            while(location == exclude):
+            while location == exclude:
                 location = (random.randint(self.x_start, self.x_end),
                             random.randint(self.y_start, self.y_end))
         return location
@@ -543,7 +556,7 @@ def add_walls(self):
         for x in range(self.width):
             self.add_thing(Wall(), (x, 0))
             self.add_thing(Wall(), (x, self.height - 1))
-        for y in range(1, self.height-1):
+        for y in range(1, self.height - 1):
             self.add_thing(Wall(), (0, y))
             self.add_thing(Wall(), (self.width - 1, y))
 
@@ -574,6 +587,7 @@ class Obstacle(Thing):
 class Wall(Obstacle):
     pass
 
+
 # ______________________________________________________________________________
 
 
@@ -682,6 +696,7 @@ def __init__(self, coordinates):
         super().__init__()
         self.coordinates = coordinates
 
+
 # ______________________________________________________________________________
 # Vacuum environment
 
@@ -691,7 +706,6 @@ class Dirt(Thing):
 
 
 class VacuumEnvironment(XYEnvironment):
-
     """The environment of [Ex. 2.12]. Agent perceives dirty or clean,
     and bump (into obstacle) or not; 2D discrete world of unknown size;
     performance measure is 100 for each dirt cleaned, and -1 for
@@ -710,7 +724,7 @@ def percept(self, agent):
         Unlike the TrivialVacuumEnvironment, location is NOT perceived."""
         status = ('Dirty' if self.some_things_at(
             agent.location, Dirt) else 'Clean')
-        bump = ('Bump' if agent.bump else'None')
+        bump = ('Bump' if agent.bump else 'None')
         return (status, bump)
 
     def execute_action(self, agent, action):
@@ -729,7 +743,6 @@ def execute_action(self, agent, action):
 
 
 class TrivialVacuumEnvironment(Environment):
-
     """This environment has two locations, A and B. Each can be Dirty
     or Clean. The agent perceives its location and the location's
     status. This serves as an example of how to implement a simple
@@ -766,6 +779,7 @@ def default_location(self, thing):
         """Agents start in either location at random."""
         return random.choice([loc_A, loc_B])
 
+
 # ______________________________________________________________________________
 # The Wumpus World
 
@@ -775,6 +789,7 @@ class Gold(Thing):
     def __eq__(self, rhs):
         """All Gold are equal"""
         return rhs.__class__ == Gold
+
     pass
 
 
@@ -824,6 +839,7 @@ def can_grab(self, thing):
 
 class WumpusEnvironment(XYEnvironment):
     pit_probability = 0.2  # Probability to spawn a pit in a location. (From Chapter 7.2)
+
     # Room should be 4x4 grid of rooms. The extra 2 for walls
 
     def __init__(self, agent_program, width=6, height=6):
@@ -901,12 +917,9 @@ def percept(self, agent):
         """Return things in adjacent (not diagonal) cells of the agent.
         Result format: [Left, Right, Up, Down, Center / Current location]"""
         x, y = agent.location
-        result = []
-        result.append(self.percepts_from(agent, (x - 1, y)))
-        result.append(self.percepts_from(agent, (x + 1, y)))
-        result.append(self.percepts_from(agent, (x, y - 1)))
-        result.append(self.percepts_from(agent, (x, y + 1)))
-        result.append(self.percepts_from(agent, (x, y)))
+        result = [self.percepts_from(agent, (x - 1, y)), self.percepts_from(agent, (x + 1, y)),
+                  self.percepts_from(agent, (x, y - 1)), self.percepts_from(agent, (x, y + 1)),
+                  self.percepts_from(agent, (x, y))]
 
         """The wumpus gives out a loud scream once it's killed."""
         wumpus = [thing for thing in self.things if isinstance(thing, Wumpus)]
@@ -949,7 +962,7 @@ def execute_action(self, agent, action):
             """The arrow travels straight down the path the agent is facing"""
             if agent.has_arrow:
                 arrow_travel = agent.direction.move_forward(agent.location)
-                while(self.is_inbounds(arrow_travel)):
+                while self.is_inbounds(arrow_travel):
                     wumpus = [thing for thing in self.list_things_at(arrow_travel)
                               if isinstance(thing, Wumpus)]
                     if len(wumpus):
@@ -979,12 +992,13 @@ def is_done(self):
                 print("Death by {} [-1000].".format(explorer[0].killed_by))
         else:
             print("Explorer climbed out {}."
-                  .format(
-                      "with Gold [+1000]!" if Gold() not in self.things else "without Gold [+0]"))
+                .format(
+                "with Gold [+1000]!" if Gold() not in self.things else "without Gold [+0]"))
         return True
 
-
     # TODO: Arrow needs to be implemented
+
+
 # ______________________________________________________________________________
 
 
@@ -1016,13 +1030,16 @@ def test_agent(AgentFactory, steps, envs):
     >>> result == 5
     True
     """
+
     def score(env):
         agent = AgentFactory()
         env.add_thing(agent)
         env.run(steps)
         return agent.performance
+
     return mean(map(score, envs))
 
+
 # _________________________________________________________________________