make pd_grid and hex_snowflake standards-compliant

examples/hex_snowflake/hex_snowflake/model.py

@@ -10,7 +10,7 @@ class HexSnowflake(Model):
     Represents the hex grid of cells. The grid is represented by a 2-dimensional array of cells with adjacency rules specific to hexagons.
     '''
 
-    def __init__(self, height, width):
+    def __init__(self, height=50, width=50):
         '''
         Create a new playing area of (height, width) cells.
         '''

examples/pd_grid/pd_grid/model.py

@@ -6,7 +6,7 @@
 from .agent import PDAgent
 
 
-class PDModel(Model):
+class PdGrid(Model):
     ''' Model class for iterated, spatial prisoner's dilemma model. '''
 
     schedule_types = {"Sequential": BaseScheduler,
@@ -21,7 +21,7 @@ class PDModel(Model):
               ("D", "C"): 1.6,
               ("D", "D"): 0}
 
-    def __init__(self, height, width, schedule_type, payoffs=None):
+    def __init__(self, height=50, width=50, schedule_type="Random", payoffs=None):
         '''
         Create a new Spatial Prisoners' Dilemma Model.
 

examples/pd_grid/pd_grid/server.py

@@ -3,7 +3,7 @@
 from mesa.visualization.UserParam import UserSettableParameter
 
 from .portrayal import portrayPDAgent
-from .model import PDModel
+from .model import PdGrid
 
 
 # Make a world that is 50x50, on a 500x500 display.
@@ -13,8 +13,8 @@
     "height": 50,
     "width": 50,
     "schedule_type": UserSettableParameter("choice", "Scheduler type", value="Random",
-                                           choices=list(PDModel.schedule_types.keys()))
+                                           choices=list(PdGrid.schedule_types.keys()))
 }
 
-server = ModularServer(PDModel, [canvas_element], "Prisoner's Dilemma",
+server = ModularServer(PdGrid, [canvas_element], "Prisoner's Dilemma",
                        model_params)

tests/test_examples.py

@@ -58,18 +58,6 @@ def test_examples(self):
                 model = Model()
                 (model.step() for _ in range(100))
 
-    def test_hex_snowflake(self):
-        with self.active_example_dir('hex_snowflake'):
-            from hex_snowflake.model import HexSnowflake
-            model = HexSnowflake(100, 100)
-            (model.step() for _ in range(100))
-
-    def test_pd_grid(self):
-        with self.active_example_dir('pd_grid'):
-            from pd_grid.model import PDModel
-            model = PDModel(100, 100, "Random")
-            (model.step() for _ in range(100))
-
     def test_shape_example(self):
         with self.active_example_dir('shape_example'):
             from shape_model.model import ShapesModel