examples: Convert boid_flockers to simple namespace

arbehr · May 17, 2022 · 47ee1d8 · 47ee1d8
1 parent c82b347
commit 47ee1d8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/examples/boid_flockers/boid_flockers/SimpleContinuousModule.py b/examples/boid_flockers/boid_flockers/SimpleContinuousModule.py
@@ -1,7 +1,7 @@
-from mesa.visualization.ModularVisualization import VisualizationElement
+import mesa
 
 
-class SimpleCanvas(VisualizationElement):
+class SimpleCanvas(mesa.visualization.VisualizationElement):
     local_includes = ["boid_flockers/simple_continuous_canvas.js"]
     portrayal_method = None
     canvas_height = 500

diff --git a/examples/boid_flockers/boid_flockers/boid.py b/examples/boid_flockers/boid_flockers/boid.py
@@ -1,9 +1,8 @@
+import mesa
 import numpy as np
 
-from mesa import Agent
 
-
-class Boid(Agent):
+class Boid(mesa.Agent):
     """
     A Boid-style flocker agent.
 

diff --git a/examples/boid_flockers/boid_flockers/model.py b/examples/boid_flockers/boid_flockers/model.py
@@ -5,16 +5,13 @@
 Uses numpy arrays to represent vectors.
 """
 
+import mesa
 import numpy as np
 
-from mesa import Model
-from mesa.space import ContinuousSpace
-from mesa.time import RandomActivation
-
 from .boid import Boid
 
 
-class BoidFlockers(Model):
+class BoidFlockers(mesa.Model):
     """
     Flocker model class. Handles agent creation, placement and scheduling.
     """
@@ -47,8 +44,8 @@ def __init__(
         self.vision = vision
         self.speed = speed
         self.separation = separation
-        self.schedule = RandomActivation(self)
-        self.space = ContinuousSpace(width, height, True)
+        self.schedule = mesa.time.RandomActivation(self)
+        self.space = mesa.space.ContinuousSpace(width, height, True)
         self.factors = dict(cohere=cohere, separate=separate, match=match)
         self.make_agents()
         self.running = True

diff --git a/examples/boid_flockers/boid_flockers/server.py b/examples/boid_flockers/boid_flockers/server.py
@@ -1,4 +1,4 @@
-from mesa.visualization.ModularVisualization import ModularServer
+import mesa
 
 from .model import BoidFlockers
 from .SimpleContinuousModule import SimpleCanvas
@@ -18,4 +18,6 @@ def boid_draw(agent):
     "separation": 2,
 }
 
-server = ModularServer(BoidFlockers, [boid_canvas], "Boids", model_params)
+server = mesa.visualization.ModularServer(
+    BoidFlockers, [boid_canvas], "Boids", model_params
+)