make Boid-Flockers and BankReserves standards-compliant

examples/bank_reserves/bank_reserves/model.py

@@ -77,7 +77,7 @@ def get_total_loans(model):
     return np.sum(agent_loans)
 
 
-class BankReservesModel(Model):
+class BankReserves(Model):
 
     # grid height
     grid_h = 20

examples/bank_reserves/bank_reserves/server.py

@@ -2,7 +2,7 @@
 from mesa.visualization.modules import CanvasGrid, ChartModule
 from mesa.visualization.UserParam import UserSettableParameter
 from bank_reserves.agents import Person
-from bank_reserves.model import BankReservesModel
+from bank_reserves.model import BankReserves
 
 """
 Citation:
@@ -66,7 +66,7 @@ def person_portrayal(agent):
                              {"Label": "Middle Class", "Color": MID_COLOR}])
 
 # create instance of Mesa ModularServer
-server = ModularServer(BankReservesModel, [canvas_element, chart_element],
+server = ModularServer(BankReserves, [canvas_element, chart_element],
                        "Bank Reserves Model",
                        model_params=model_params
                        )

examples/boid-flockers/boidflockers/model.py → examples/boid-flockers/boid_flockers/model.py

@@ -16,7 +16,7 @@
 from .boid import Boid
 
 
-class BoidModel(Model):
+class BoidFlockers(Model):
     '''
     Flocker model class. Handles agent creation, placement and scheduling.
     '''

examples/boid-flockers/boidflockers/server.py → examples/boid-flockers/boid_flockers/server.py

@@ -1,6 +1,6 @@
 from mesa.visualization.ModularVisualization import ModularServer
 
-from .model import BoidModel
+from .model import BoidServer
 from .SimpleContinuousModule import SimpleCanvas
 
 
@@ -18,4 +18,4 @@ def boid_draw(agent):
     "separation": 2
 }
 
-server = ModularServer(BoidModel, [boid_canvas], "Boids", model_params)
+server = ModularServer(BoidServer, [boid_canvas], "Boids", model_params)

examples/boid-flockers/run.py

@@ -1,3 +1,3 @@
-from boidflockers.server import server
+from boid_flockers.server import server
 
 server.launch()

tests/test_examples.py

@@ -58,18 +58,6 @@ def test_examples(self):
                 model = Model()
                 (model.step() for _ in range(100))
 
-    def test_bank_reserves(self):
-        with self.active_example_dir('bank_reserves'):
-            from bank_reserves.model import BankReservesModel
-            model = BankReservesModel()
-            (model.step() for _ in range(100))
-
-    def test_boid_flockers(self):
-        with self.active_example_dir('boid-flockers'):
-            from boidflockers.model import BoidModel
-            model = BoidModel()
-            (model.step() for _ in range(100))
-
     def test_boltzmann_wealth_model(self):
         with self.active_example_dir('boltzmann_wealth_model'):
             from wealth_model.model import MoneyModel