Adding parameters and fixing style issues

Author: dmasad

examples/WolfSheep/WolfSheep.py

@@ -9,10 +9,8 @@
     Northwestern University, Evanston, IL.
 
 TODO: Implement grass
-
 '''
 
-
 import random
 
 from mesa import Model, Agent
@@ -29,18 +27,43 @@ class WolfSheepPredation(Model):
     initial_sheep = 100
     initial_wolves = 50
     sheep_gain_from_food = 4
+
+    grass = False
+
     wolf_gain_from_food = 20
     sheep_reproduce = 0.04
     wolf_reproduce = 0.05
 
     height = 20
     width = 20
 
-    def __init__(self):
+    def __init__(self, height=20, width=20, 
+                    initial_sheep=100, initial_wolves=50, sheep_reproduce=0.04,  
+                    wolf_reproduce=0.05, wolf_gain_from_food=20, 
+                    grass=False, sheep_gain_from_food=4):
         '''
         Create a new Wolf-Sheep model with the given parameters.
+
+        Args:
+            initial_sheep: Number of sheep to start with
+            initial_wolves: Number of wolves to start with
+            sheep_reproduce: Probability of each sheep reproducing each step
+            wolf_reproduce: Probability of each wolf reproducing each step
+            wolf_gain_from_food: Energy a wolf gains from eating a sheep
+            grass: Whether to have the sheep eat grass for energy
+            sheep_gain_from_food: Energy sheep gain from grass, if enabled.
         '''
-        #TODO: Accept all other parameters
+        
+        # Set parameters
+        self.height = height
+        self.width = width
+        self.initial_sheep = initial_sheep
+        self.initial_wolves = initial_wolves
+        self.sheep_reproduce = sheep_reproduce
+        self.wolf_reproduce = wolf_reproduce
+        self.wolf_gain_from_food = wolf_gain_from_food
+        self.grass = grass
+        self.sheep_gain_from_food = sheep_gain_from_food
 
         self.schedule = Random_Activation(self)
         self.grid = MultiGrid(self.height, self.width, torus=True)
@@ -118,13 +141,4 @@ def step(self, model):
             cub = Wolf(self.grid, self.x, self.y, self.moore, self.energy/2)
             self.energy = self.energy/2
             model.grid[self.y][self.x].add(cub)
-            model.schedule.add(cub)
-
-
-
-
-
-
-
-
-
+            model.schedule.add(cub)

examples/WolfSheep/WolfSheepVisualization.py

@@ -24,8 +24,7 @@ def draw_cell(cell):
             return " "
         if len([obj for obj in cell if isinstance(obj, Sheep)]) == len(cell):
             return "S"
-        elif len([obj for obj in cell if isinstance(obj, Wolf)]) == len(cell):
+        if len([obj for obj in cell if isinstance(obj, Wolf)]) == len(cell):
             return "W"
         else:
-            return "X"
-
+            return "X"