Remove schedulers from benchmark models. (#2308)

it also removes a bug in Boltzman wealth model related to having a schedule but not adding agents to it and then using this schedule in data collection (thus not collecting data at all).
projectmesa · Sep 21, 2024 · 48c27e3 · 48c27e3
1 parent 56117dc
commit 48c27e3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/benchmarks/BoltzmannWealth/boltzmann_wealth.py b/benchmarks/BoltzmannWealth/boltzmann_wealth.py
@@ -43,7 +43,6 @@ def __init__(self, seed=None, n=100, width=10, height=10):
         super().__init__(seed)
         self.num_agents = n
         self.grid = mesa.space.MultiGrid(width, height, True)
-        self.schedule = mesa.time.RandomActivation(self)
         self.datacollector = mesa.DataCollector(
             model_reporters={"Gini": compute_gini}, agent_reporters={"Wealth": "wealth"}
         )

diff --git a/benchmarks/Flocking/flocking.py b/benchmarks/Flocking/flocking.py
@@ -116,7 +116,6 @@ def __init__(
         self.height = height
         self.simulator = simulator
 
-        self.schedule = mesa.time.RandomActivation(self)
         self.space = mesa.space.ContinuousSpace(self.width, self.height, True)
         self.factors = {
             "cohere": cohere,
@@ -138,11 +137,10 @@ def __init__(
                 **self.factors,
             )
             self.space.place_agent(boid, pos)
-            self.schedule.add(boid)
 
     def step(self):
         """Run the model for one step."""
-        self.schedule.step()
+        self.agents.shuffle_do("step")
 
 
 if __name__ == "__main__":

diff --git a/benchmarks/Schelling/schelling.py b/benchmarks/Schelling/schelling.py
@@ -2,7 +2,6 @@
 
 from mesa import Model
 from mesa.experimental.cell_space import CellAgent, OrthogonalMooreGrid
-from mesa.time import RandomActivation
 
 
 class SchellingAgent(CellAgent):
@@ -67,7 +66,6 @@ def __init__(
         self.minority_pc = minority_pc
         self.simulator = simulator
 
-        self.schedule = RandomActivation(self)
         self.grid = OrthogonalMooreGrid(
             [height, width],
             torus=True,
@@ -84,12 +82,11 @@ def __init__(
                 agent_type = 1 if self.random.random() < self.minority_pc else 0
                 agent = SchellingAgent(self, agent_type, radius, homophily)
                 agent.move_to(cell)
-                self.schedule.add(agent)
 
     def step(self):
         """Run one step of the model."""
         self.happy = 0  # Reset counter of happy agents
-        self.schedule.step()
+        self.agents.shuffle_do("step")
 
 
 if __name__ == "__main__":