Merge pull request #37 from mariuzka/dev

Dev

Author: mariuzka

examples/schelling.py

@@ -12,7 +12,9 @@
 space = mesar.GridSpacePlot(artists=agents)
 
 # line plot
-happy_plot = mesar.ModelHistoryPlot(model_attributes=["happy"], labels=["Happy agents"], ylim=[0, None])
+happy_plot = mesar.ModelHistoryPlot(
+    model_attributes=["happy"], labels=["Happy agents"], ylim=[0, None]
+)
 
 # value display
 happy_value = mesar.ValueDisplay(model_attribute="happy", label="Happy agents")

src/mesarcade/history_plot.py

@@ -66,9 +66,9 @@ def __init__(
         self.title = title
         self.from_datacollector = from_datacollector
         self.colors = None
-        
+
         self.padding = 10
-        
+
         self.validate_input()
 
         if colors is not None:
@@ -153,7 +153,9 @@ def create_plot_area(self):
 
     def create_axis_ticks(self):
         min_y_tick_y_pos = self.plot_area_y + self.padding
-        mid_y_tick_y_pos = self.plot_area_y + self.padding + (self.plot_area_height - self.padding * 2) / 2
+        mid_y_tick_y_pos = (
+            self.plot_area_y + self.padding + (self.plot_area_height - self.padding * 2) / 2
+        )
         max_y_tick_y_pos = self.plot_area_y + self.plot_area_height - self.padding
 
         self.min_y_label = arcade.Text(
@@ -191,10 +193,8 @@ def create_axis_ticks(self):
                     width=3,
                     height=3,
                     color=arcade.color.BLACK,
-                ))
-
-
-
+                )
+            )
 
     def create_legend(self):
         label_x = self.figure.x + self.width * 0.1
@@ -306,7 +306,7 @@ def update(self):
                 self.min_y_label.x = (
                     self.plot_area_x - (len(str_min_y_label) + 2) * self.font_size / 1.5
                 )
-            
+
             # update medium y_label
             str_mid_y_label = str(round((self.min_y + self.max_y) / 2, 3))
             if self.mid_y_label.text != str_mid_y_label:

src/mesarcade/renderer.py

@@ -187,7 +187,8 @@ def setup_value_displays(self) -> None:
             value_display.setup(i=i + 3, renderer=self)
 
     def add_default_buttons(self):
-        DefaultButtons(renderer=self).add_to_anchor()
+        self.default_buttons = DefaultButtons(renderer=self)
+        self.default_buttons.add_to_anchor()
 
     def add_rendering_step_buttons(self):
         self.rendering_step_buttons = NumController(

tests/test_gui.py …ts/test_gui/test_complete_simulations.pytests/test_gui.py renamed to tests/test_gui/test_complete_simulations.py tests/test_gui.py renamed to tests/test_gui/test_complete_simulations.py

@@ -0,0 +1,70 @@
+from mesa.examples.basic.schelling.model import Schelling
+import mesarcade as mesar
+
+
+def test_play_button():
+    canvas = mesar.Canvas(
+        model_class=Schelling,
+        _visible=False,
+    )
+    canvas._setup()
+
+    for _ in range(10):
+        canvas.renderer.on_update(None)
+
+    assert canvas.renderer.play == False
+    assert canvas.renderer.tick == 0
+
+    canvas.renderer.default_buttons.play_button.on_click(None)
+
+    for _ in range(10):
+        canvas.renderer.on_update(None)
+
+    assert canvas.renderer.play == True
+    assert canvas.renderer.tick == 10
+
+    canvas.renderer.default_buttons.play_button.on_click(None)
+
+    assert canvas.renderer.play == False
+    assert canvas.renderer.tick == 10
+
+    canvas.window.close()
+
+
+def test_reset_button():
+    canvas = mesar.Canvas(
+        model_class=Schelling,
+        _visible=False,
+    )
+    canvas._setup()
+    canvas.renderer.play = True
+
+    assert canvas.renderer.tick == 0
+
+    for _ in range(10):
+        canvas.renderer.on_update(None)
+
+    assert canvas.renderer.tick == 10
+
+    canvas.renderer.default_buttons.reset_button.on_click(None)
+
+    assert canvas.renderer.tick == 0
+
+    canvas.window.close()
+
+
+def test_step_button():
+    canvas = mesar.Canvas(
+        model_class=Schelling,
+        _visible=False,
+    )
+    canvas._setup()
+
+    assert canvas.renderer.tick == 0
+
+    for _ in range(15):
+        canvas.renderer.default_buttons.step_button.on_click(None)
+
+    assert canvas.renderer.tick == 15
+
+    canvas.window.close()

tests/test_gui/test_default_buttons.py

@@ -0,0 +1,95 @@
+from mesa.examples.basic.boid_flockers.model import BoidFlockers
+import mesarcade as mesar
+from dataclasses import dataclass
+
+
+@dataclass
+class Event:
+    new_value: float
+
+
+def create_canvas():
+    population_size_controller = mesar.NumController(
+        "population_size",
+        100,
+        25,
+        1000,
+        25,
+        "n birds",
+    )
+    canvas = mesar.Canvas(
+        model_class=BoidFlockers,
+        controllers=[population_size_controller],
+        _visible=False,
+    )
+    canvas._setup()
+    return canvas
+
+
+def test_num_controller_buttons():
+    canvas = create_canvas()
+
+    controller = canvas.renderer.controllers[0]
+
+    # test basic setup
+    assert controller.parameter_name == "population_size"
+    assert controller.label == "n birds"
+    assert controller.parameter_value == 100
+
+    # test increase
+    controller.buttons.increase_button.on_click(None)
+    assert controller.parameter_value == 125
+    assert canvas.renderer.parameter_dict["population_size"] == 125
+
+    # test decrease
+    controller.buttons.decrease_button.on_click(None)
+    assert controller.parameter_value == 100
+    assert canvas.renderer.parameter_dict["population_size"] == 100
+
+    # test maximum
+    for _ in range(500):
+        controller.buttons.increase_button.on_click(None)
+
+    assert controller.parameter_value == 1000
+    assert canvas.renderer.parameter_dict["population_size"] == 1000
+
+    # test minimum
+    for _ in range(500):
+        controller.buttons.decrease_button.on_click(None)
+
+    assert controller.parameter_value == 25
+    assert canvas.renderer.parameter_dict["population_size"] == 25
+
+    canvas.window.close()
+
+
+def test_num_controller_slider():
+    canvas = create_canvas()
+
+    controller = canvas.renderer.controllers[0]
+
+    assert controller.parameter_value == 100
+
+    controller.buttons.slider.on_change(Event(new_value=200))
+
+    assert controller.parameter_value == 200
+
+    canvas.window.close()
+
+
+def test_increase_and_reset():
+    canvas = create_canvas()
+
+    controller = canvas.renderer.controllers[0]
+
+    assert len(canvas.renderer.model.agents) == 100
+
+    # increase by 25
+    controller.buttons.increase_button.on_click(None)
+
+    # restart model
+    canvas.renderer.default_buttons.reset_button.on_click(None)
+
+    assert len(canvas.renderer.model.agents) == 125
+
+    canvas.window.close()