Merge pull request projectmesa#981 from rht/refactor

forest_fire: Remove unnecessary code
rambam613 · Jan 29, 2021 · 8d9d3cf · 8d9d3cf
2 parents d376920 + 8136712
commit 8d9d3cf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 20 deletions.
diff --git a/examples/forest_fire/Forest Fire Model.ipynb b/examples/forest_fire/Forest Fire Model.ipynb
@@ -126,11 +126,6 @@
     "            height, width: The size of the grid to model\n",
     "            density: What fraction of grid cells have a tree in them.\n",
     "        '''\n",
-    "        # Initialize model parameters\n",
-    "        self.height = height\n",
-    "        self.width = width\n",
-    "        self.density = density\n",
-    "        \n",
     "        # Set up model objects\n",
     "        self.schedule = RandomActivation(self)\n",
     "        self.grid = Grid(height, width, torus=False)\n",
@@ -141,7 +136,7 @@
     "        # Place a tree in each cell with Prob = density\n",
     "        for x in range(self.width):\n",
     "            for y in range(self.height):\n",
-    "                if self.random.random() < self.density:\n",
+    "                if self.random.random() < density:\n",
     "                    # Create a tree\n",
     "                    new_tree = TreeCell(self, (x, y))\n",
     "                    # Set all trees in the first column on fire.\n",
@@ -584,9 +579,9 @@
  "metadata": {
   "anaconda-cloud": {},
   "kernelspec": {
-   "display_name": "Python [conda env:mesa]",
+   "display_name": "Python 3",
    "language": "python",
-   "name": "conda-env-mesa-py"
+   "name": "python3"
   },
   "language_info": {
    "codemirror_mode": {
@@ -598,13 +593,13 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.6"
+   "version": "3.8.6"
   },
   "widgets": {
    "state": {},
    "version": "1.1.2"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 1
+ "nbformat_minor": 4
 }
diff --git a/examples/forest_fire/forest_fire/agent.py b/examples/forest_fire/forest_fire/agent.py
@@ -34,6 +34,3 @@ def step(self):
                 if neighbor.condition == "Fine":
                     neighbor.condition = "On Fire"
             self.condition = "Burned Out"
-
-    def get_pos(self):
-        return self.pos
diff --git a/examples/forest_fire/forest_fire/model.py b/examples/forest_fire/forest_fire/model.py
@@ -19,11 +19,6 @@ def __init__(self, height=100, width=100, density=0.65):
             height, width: The size of the grid to model
             density: What fraction of grid cells have a tree in them.
         """
-        # Initialize model parameters
-        self.height = height
-        self.width = width
-        self.density = density
-
         # Set up model objects
         self.schedule = RandomActivation(self)
         self.grid = Grid(height, width, torus=False)
@@ -38,7 +33,7 @@ def __init__(self, height=100, width=100, density=0.65):
 
         # Place a tree in each cell with Prob = density
         for (contents, x, y) in self.grid.coord_iter():
-            if self.random.random() < self.density:
+            if self.random.random() < density:
                 # Create a tree
                 new_tree = TreeCell((x, y), self)
                 # Set all trees in the first column on fire.

diff --git a/examples/forest_fire/forest_fire/server.py b/examples/forest_fire/forest_fire/server.py
@@ -11,7 +11,7 @@ def forest_fire_portrayal(tree):
     if tree is None:
         return
     portrayal = {"Shape": "rect", "w": 1, "h": 1, "Filled": "true", "Layer": 0}
-    (x, y) = tree.get_pos()
+    (x, y) = tree.pos
     portrayal["x"] = x
     portrayal["y"] = y
     portrayal["Color"] = COLORS[tree.condition]