Replace RandomActivation scheduler with AgentSet

Replace the old RandomActivation scheduler with AgentSet functionality. self.agents.shuffle.do("step") is equivalent and self.schedule.step() with an RandomActivation scheduler, and model behavior should not change.

examples/bank_reserves/bank_reserves/model.py

@@ -116,7 +116,7 @@ def __init__(
         self.height = height
         self.width = width
         self.init_people = init_people
-        self.schedule = mesa.time.RandomActivation(self)
+
         self.grid = mesa.space.MultiGrid(self.width, self.height, torus=True)
         # rich_threshold is the amount of savings a person needs to be considered "rich"
         self.rich_threshold = rich_threshold
@@ -154,7 +154,7 @@ def __init__(
 
     def step(self):
         # tell all the agents in the model to run their step function
-        self.schedule.step()
+        self.agents.shuffle().do("step")
         # collect data
         self.datacollector.collect(self)
 

examples/bank_reserves/batch_run.py

@@ -127,7 +127,7 @@ def __init__(
         self.height = height
         self.width = width
         self.init_people = init_people
-        self.schedule = mesa.time.RandomActivation(self)
+
         self.grid = mesa.space.MultiGrid(self.width, self.height, torus=True)
         # rich_threshold is the amount of savings a person needs to be considered "rich"
         self.rich_threshold = rich_threshold
@@ -169,7 +169,7 @@ def step(self):
         # collect data
         self.datacollector.collect(self)
         # tell all the agents in the model to run their step function
-        self.schedule.step()
+        self.agents.shuffle().do("step")
 
     def run_model(self):
         for i in range(self.run_time):

examples/boid_flockers/boid_flockers/model.py

@@ -120,7 +120,7 @@ def __init__(
         self.vision = vision
         self.speed = speed
         self.separation = separation
-        self.schedule = mesa.time.RandomActivation(self)
+
         self.space = mesa.space.ContinuousSpace(width, height, True)
         self.factors = {"cohere": cohere, "separate": separate, "match": match}
         self.make_agents()
@@ -147,4 +147,4 @@ def make_agents(self):
             self.schedule.add(boid)
 
     def step(self):
-        self.schedule.step()
+        self.agents.shuffle().do("step")

examples/boltzmann_wealth_model/boltzmann_wealth_model/model.py

@@ -21,7 +21,7 @@ def __init__(self, N=100, width=10, height=10):
         super().__init__()
         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"}
         )
@@ -38,7 +38,7 @@ def __init__(self, N=100, width=10, height=10):
         self.datacollector.collect(self)
 
     def step(self):
-        self.schedule.step()
+        self.agents.shuffle().do("step")
         # collect data
         self.datacollector.collect(self)
 

examples/boltzmann_wealth_model_experimental/model.py

@@ -21,7 +21,7 @@ def __init__(self, N=100, width=10, height=10):
         super().__init__()
         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"}
         )
@@ -38,7 +38,7 @@ def __init__(self, N=100, width=10, height=10):
         self.datacollector.collect(self)
 
     def step(self):
-        self.schedule.step()
+        self.agents.shuffle().do("step")
         # collect data
         self.datacollector.collect(self)
 

examples/boltzmann_wealth_model_network/boltzmann_wealth_model_network/model.py

@@ -19,7 +19,7 @@ def __init__(self, num_agents=7, num_nodes=10):
         self.num_nodes = num_nodes if num_nodes >= self.num_agents else self.num_agents
         self.G = nx.erdos_renyi_graph(n=self.num_nodes, p=0.5)
         self.grid = mesa.space.NetworkGrid(self.G)
-        self.schedule = mesa.time.RandomActivation(self)
+
         self.datacollector = mesa.DataCollector(
             model_reporters={"Gini": compute_gini},
             agent_reporters={"Wealth": lambda _: _.wealth},
@@ -38,7 +38,7 @@ def __init__(self, num_agents=7, num_nodes=10):
         self.datacollector.collect(self)
 
     def step(self):
-        self.schedule.step()
+        self.agents.shuffle().do("step")
         # collect data
         self.datacollector.collect(self)
 

examples/caching_and_replay/model.py

@@ -70,7 +70,6 @@ def __init__(
         self.homophily = homophily
         self.radius = radius
 
-        self.schedule = mesa.time.RandomActivation(self)
         self.grid = mesa.space.SingleGrid(width, height, torus=True)
 
         self.happy = 0
@@ -96,7 +95,7 @@ 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")
 
         self.datacollector.collect(self)
 

examples/charts/charts/model.py

@@ -99,7 +99,7 @@ def __init__(
         self.height = height
         self.width = width
         self.init_people = init_people
-        self.schedule = mesa.time.RandomActivation(self)
+
         self.grid = mesa.space.MultiGrid(self.width, self.height, torus=True)
         # rich_threshold is the amount of savings a person needs to be considered "rich"
         self.rich_threshold = rich_threshold
@@ -137,7 +137,7 @@ def __init__(
 
     def step(self):
         # tell all the agents in the model to run their step function
-        self.schedule.step()
+        self.agents.shuffle().do("step")
         # collect data
         self.datacollector.collect(self)
 

examples/el_farol/el_farol/model.py

@@ -15,7 +15,6 @@ def __init__(
         super().__init__()
         self.running = True
         self.num_agents = N
-        self.schedule = mesa.time.RandomActivation(self)
 
         # Initialize the previous attendance randomly so the agents have a history
         # to work with from the start.
@@ -35,7 +34,7 @@ def __init__(
     def step(self):
         self.datacollector.collect(self)
         self.attendance = 0
-        self.schedule.step()
+        self.agents.shuffle.do("step")
         # We ensure that the length of history is constant
         # after each step.
         self.history.pop(0)

examples/epstein_civil_violence/epstein_civil_violence/model.py

@@ -58,7 +58,7 @@ def __init__(
         self.movement = movement
         self.max_iters = max_iters
         self.iteration = 0
-        self.schedule = mesa.time.RandomActivation(self)
+
         self.grid = mesa.space.SingleGrid(width, height, torus=True)
 
         model_reporters = {
@@ -109,7 +109,7 @@ def step(self):
         """
         Advance the model by one step and collect data.
         """
-        self.schedule.step()
+        self.agents.shuffle().do("step")
         # collect data
         self.datacollector.collect(self)
         self.iteration += 1

examples/forest_fire/forest_fire/model.py

@@ -18,7 +18,7 @@ def __init__(self, width=100, height=100, density=0.65):
         """
         super().__init__()
         # Set up model objects
-        self.schedule = mesa.time.RandomActivation(self)
+
         self.grid = mesa.space.SingleGrid(width, height, torus=False)
 
         self.datacollector = mesa.DataCollector(
@@ -47,7 +47,7 @@ def step(self):
         """
         Advance the model by one step.
         """
-        self.schedule.step()
+        self.agents.shuffle().do("step")
         # collect data
         self.datacollector.collect(self)
 

examples/schelling/model.py

@@ -68,7 +68,6 @@ def __init__(
         self.homophily = homophily
         self.radius = radius
 
-        self.schedule = mesa.time.RandomActivation(self)
         self.grid = mesa.space.SingleGrid(width, height, torus=True)
 
         self.happy = 0
@@ -94,7 +93,7 @@ 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")
 
         self.datacollector.collect(self)
 

examples/shape_example/shape_example/model.py

@@ -14,7 +14,7 @@ def __init__(self, N=2, width=20, height=10):
         self.N = N  # num of agents
         self.headings = ((1, 0), (0, 1), (-1, 0), (0, -1))  # tuples are fast
         self.grid = mesa.space.SingleGrid(width, height, torus=False)
-        self.schedule = mesa.time.RandomActivation(self)
+
         self.make_walker_agents()
         self.running = True
 
@@ -36,4 +36,4 @@ def make_walker_agents(self):
                 unique_id += 1
 
     def step(self):
-        self.schedule.step()
+        self.agents.shuffle().do("step")

examples/virus_on_network/virus_on_network/model.py

@@ -47,7 +47,7 @@ def __init__(
         prob = avg_node_degree / self.num_nodes
         self.G = nx.erdos_renyi_graph(n=self.num_nodes, p=prob)
         self.grid = mesa.space.NetworkGrid(self.G)
-        self.schedule = mesa.time.RandomActivation(self)
+
         self.initial_outbreak_size = (
             initial_outbreak_size if initial_outbreak_size <= num_nodes else num_nodes
         )
@@ -96,7 +96,7 @@ def resistant_susceptible_ratio(self):
             return math.inf
 
     def step(self):
-        self.schedule.step()
+        self.agents.shuffle().do("step")
         # collect data
         self.datacollector.collect(self)