Merge pull request aimacode#169 from tolusalako/master

Multiple updates to agents.py (WumpusEnvironment and XYEnvironment)

Author: norvig

agents.ipynb

@@ -15,7 +15,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 29,
+   "execution_count": 1,
    "metadata": {
     "collapsed": false,
     "scrolled": true
@@ -43,7 +43,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 30,
+   "execution_count": 2,
    "metadata": {
     "collapsed": false
    },
@@ -82,7 +82,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 43,
+   "execution_count": 3,
    "metadata": {
     "collapsed": false
    },
@@ -95,8 +95,8 @@
     "    pass\n",
     "\n",
     "class Park(Environment):\n",
-    "    '''prints & return a list of things that are in our dog's location'''\n",
     "    def percept(self, agent):\n",
+    "        '''prints & return a list of things that are in our agent's location'''\n",
     "        things = self.list_things_at(agent.location)\n",
     "        print(things)\n",
     "        return things\n",
@@ -151,7 +151,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 44,
+   "execution_count": 4,
    "metadata": {
     "collapsed": false
    },
@@ -191,7 +191,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 45,
+   "execution_count": 5,
    "metadata": {
     "collapsed": false
    },
@@ -230,17 +230,48 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "That's how easy it is to implement an agent, its program, and environment. But that was a very simple case. What if our environment was 2-Dimentional instead of 1? And what if we had multiple agents?"
+    "That's how easy it is to implement an agent, its program, and environment. But that was a very simple case. What if our environment was 2-Dimentional instead of 1? And what if we had multiple agents?\n",
+    "\n",
+    "To make our Park 2D, we will need to make it a subclass of <b>XYEnvironment</b> instead of Environment. Also, let's add a person to play fetch with the dog."
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 6,
    "metadata": {
     "collapsed": true
    },
    "outputs": [],
-   "source": []
+   "source": [
+    "class Park(XYEnvironment):\n",
+    "    def percept(self, agent):\n",
+    "        '''prints & return a list of things that are in our agent's location'''\n",
+    "        things = self.list_things_at(agent.location)\n",
+    "        print(things)\n",
+    "        return things\n",
+    "    \n",
+    "    def execute_action(self, agent, action):\n",
+    "        '''changes the state of the environment based on what the agent does.'''\n",
+    "        if action == \"move down\":\n",
+    "            agent.movedown()\n",
+    "        elif action == \"eat\":\n",
+    "            items = self.list_things_at(agent.location, tclass=Food)\n",
+    "            if len(items) != 0:\n",
+    "                if agent.eat(items[0]): #Have the dog pick eat the first item\n",
+    "                    self.delete_thing(items[0]) #Delete it from the Park after.\n",
+    "        elif action == \"drink\":\n",
+    "            items = self.list_things_at(agent.location, tclass=Water)\n",
+    "            if len(items) != 0:\n",
+    "                if agent.drink(items[0]): #Have the dog drink the first item\n",
+    "                    self.delete_thing(items[0]) #Delete it from the Park after.\n",
+    "                    \n",
+    "    def is_done(self):\n",
+    "        '''By default, we're done when we can't find a live agent, \n",
+    "        but to prevent killing our cute dog, we will or it with when there is no more food or water'''\n",
+    "        no_edibles = not any(isinstance(thing, Food) or isinstance(thing, Water) for thing in self.things)\n",
+    "        dead_agents = not any(agent.is_alive() for agent in self.agents)\n",
+    "        return dead_agents or no_edibles"
+   ]
   }
  ],
  "metadata": {