examples: Convert color_patches to simple namespace

arbehr · May 19, 2022 · d4bf534 · d4bf534
1 parent 59b58bc
commit d4bf534
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/examples/color_patches/color_patches/model.py b/examples/color_patches/color_patches/model.py
@@ -4,12 +4,10 @@
 
 from collections import Counter
 
-from mesa import Model, Agent
-from mesa.time import SimultaneousActivation
-from mesa.space import Grid
+import mesa
 
 
-class ColorCell(Agent):
+class ColorCell(mesa.Agent):
     """
     Represents a cell's opinion (visualized by a color)
     """
@@ -63,7 +61,7 @@ def advance(self):
         self._state = self._next_state
 
 
-class ColorPatches(Model):
+class ColorPatches(mesa.Model):
     """
     represents a 2D lattice where agents live
     """
@@ -74,8 +72,8 @@ def __init__(self, width=20, height=20):
         The agents next state is first determined before updating the grid
         """
 
-        self._grid = Grid(width, height, torus=False)
-        self._schedule = SimultaneousActivation(self)
+        self._grid = mesa.space.Grid(width, height, torus=False)
+        self._schedule = mesa.time.SimultaneousActivation(self)
 
         # self._grid.coord_iter()
         #  --> should really not return content + col + row

diff --git a/examples/color_patches/color_patches/server.py b/examples/color_patches/color_patches/server.py
@@ -4,8 +4,7 @@
 """
 # import webbrowser
 
-from mesa.visualization.modules import CanvasGrid
-from mesa.visualization.ModularVisualization import ModularServer
+import mesa
 
 from .model import ColorPatches
 
@@ -55,11 +54,11 @@ def color_patch_draw(cell):
     return portrayal
 
 
-canvas_element = CanvasGrid(
+canvas_element = mesa.visualization.CanvasGrid(
     color_patch_draw, grid_rows, grid_cols, canvas_width, canvas_height
 )
 
-server = ModularServer(
+server = mesa.visualization.ModularServer(
     ColorPatches,
     [canvas_element],
     "Color Patches",