Sync Mesa and Mesa-examples repos

Author: EwoutH

codecov.yaml

@@ -6,7 +6,8 @@ coverage:
         threshold: 1%
 
 ignore:
-  - "**experimental/"
   - "benchmarks/**"
+  - "mesa/experimental/**"
+  - "mesa/visualization/**"
 
 comment: off

docs/tutorials/MoneyModel.py

@@ -49,15 +49,15 @@ def step(self):
 class MoneyModel(mesa.Model):
     """A model with some number of agents."""
 
-    def __init__(self, N, width, height):
+    def __init__(self, N, width, height, seed=None):
         """Initialize a MoneyModel instance.
 
         Args:
             N: The number of agents.
             width: width of the grid.
             height: Height of the grid.
         """
-        super().__init__()
+        super().__init__(seed=seed)
         self.num_agents = N
         self.grid = mesa.space.MultiGrid(width, height, True)
         self.schedule = mesa.time.RandomActivation(self)

mesa/time.py

@@ -77,7 +77,7 @@ def __init__(self, model: Model, agents: Iterable[Agent] | None = None) -> None:
         if agents is None:
             agents = []
 
-        self._agents: AgentSet = AgentSet(agents, model)
+        self._agents: AgentSet = AgentSet(agents, model.random)
 
         self._remove_warning_given = False
         self._agents_key_warning_given = False
@@ -312,7 +312,9 @@ def __init__(self, model: Model, agents: Iterable[Agent] | None = None) -> None:
                 try:
                     self._agents_by_type[type(agent)].add(agent)
                 except KeyError:
-                    self._agents_by_type[type(agent)] = AgentSet([agent], self.model)
+                    self._agents_by_type[type(agent)] = AgentSet(
+                        [agent], self.model.random
+                    )
 
     def add(self, agent: Agent) -> None:
         """Add an Agent object to the schedule.
@@ -325,7 +327,7 @@ def add(self, agent: Agent) -> None:
         try:
             self._agents_by_type[type(agent)].add(agent)
         except KeyError:
-            self._agents_by_type[type(agent)] = AgentSet([agent], self.model)
+            self._agents_by_type[type(agent)] = AgentSet([agent], self.model.random)
 
     def remove(self, agent: Agent) -> None:
         """Remove all instances of a given agent from the schedule.