Mesa 2.4.0__py3-none-any.whl → 3.0.0__py3-none-any.whl

mesa/model.py

@@ -1,5 +1,4 @@
-"""
-The model class for Mesa framework.
+"""The model class for Mesa framework.
 
 Core Objects: Model
 """
@@ -9,15 +8,20 @@ Core Objects: Model
 from __future__ import annotations
 
 import random
+import sys
 import warnings
+from collections.abc import Sequence
 
 # mypy
-from typing import Any, Union
+from typing import Any
+
+import numpy as np
 
 from mesa.agent import Agent, AgentSet
 from mesa.datacollection import DataCollector
 
-TimeT = Union[float, int]
+SeedLike = int | np.integer | Sequence[int] | np.random.SeedSequence
+RNGLike = np.random.Generator | np.random.BitGenerator
 
 
 class Model:
@@ -30,23 +34,9 @@ class Model:
     Attributes:
         running: A boolean indicating if the model should continue running.
         schedule: An object to manage the order and execution of agent steps.
-        current_id: A counter for assigning unique IDs to agents.
-
-    Properties:
-        agents: An AgentSet containing all agents in the model
-        agent_types: A list of different agent types present in the model.
-        agents_by_type: A dictionary where the keys are agent types and the values are the corresponding AgentSets.
-
-    Methods:
-        get_agents_of_type: Returns an AgentSet of agents of the specified type.
-            Deprecated: Use agents_by_type[agenttype] instead.
-        run_model: Runs the model's simulation until a defined end condition is reached.
-        step: Executes a single step of the model's simulation process.
-        next_id: Generates and returns the next unique identifier for an agent.
-        reset_randomizer: Resets the model's random number generator with a new or existing seed.
-        initialize_data_collector: Sets up the data collector for the model, requiring an initialized scheduler and agents.
-        register_agent : register an agent with the model
-        deregister_agent : remove an agent from the model
+        steps: the number of times `model.step()` has been called.
+        random: a seeded python.random number generator.
+        rng : a seeded numpy.random.Generator
 
     Notes:
         Model.agents returns the AgentSet containing all agents registered with the model. Changing
@@ -55,35 +45,80 @@ class Model:
 
     """
 
-    def __new__(cls, *args: Any, **kwargs: Any) -> Any:
-        """Create a new model object and instantiate its RNG automatically."""
-        obj = object.__new__(cls)
-        obj._seed = kwargs.get("seed")
-        if obj._seed is None:
-            # We explicitly specify the seed here so that we know its value in
-            # advance.
-            obj._seed = random.random()
-        obj.random = random.Random(obj._seed)
-
-        # TODO: Remove these 2 lines just before Mesa 3.0
-        obj._steps = 0
-        obj._time = 0
-        return obj
-
-    def __init__(self, *args: Any, **kwargs: Any) -> None:
-        """Create a new model. Overload this method with the actual code to
-        start the model. Always start with super().__init__() to initialize the
-        model object properly.
-        """
+    def __init__(
+        self,
+        *args: Any,
+        seed: float | None = None,
+        rng: RNGLike | SeedLike | None = None,
+        **kwargs: Any,
+    ) -> None:
+        """Create a new model.
 
-        self.running = True
-        self.schedule = None
-        self.current_id = 0
+        Overload this method with the actual code to initialize the model. Always start with super().__init__()
+        to initialize the model object properly.
 
+        Args:
+            args: arguments to pass onto super
+            seed: the seed for the random number generator
+            rng : Pseudorandom number generator state. When `rng` is None, a new `numpy.random.Generator` is created
+                  using entropy from the operating system. Types other than `numpy.random.Generator` are passed to
+                  `numpy.random.default_rng` to instantiate a `Generator`.
+            kwargs: keyword arguments to pass onto super
+
+        Notes:
+            you have to pass either seed or rng, but not both.
+
+        """
+        super().__init__(*args, **kwargs)
+        self.running = True
+        self.steps: int = 0
+
+        if (seed is not None) and (rng is not None):
+            raise ValueError("you have to pass either rng or seed, not both")
+        elif seed is None:
+            self.rng: np.random.Generator = np.random.default_rng(rng)
+            self._rng = (
+                self.rng.bit_generator.state
+            )  # this allows for reproducing the rng
+
+            try:
+                self.random = random.Random(rng)
+            except TypeError:
+                seed = int(self.rng.integers(np.iinfo(np.int32).max))
+                self.random = random.Random(seed)
+            self._seed = seed  # this allows for reproducing stdlib.random
+        elif rng is None:
+            self.random = random.Random(seed)
+            self._seed = seed  # this allows for reproducing stdlib.random
+
+            try:
+                self.rng: np.random.Generator = np.random.default_rng(rng)
+            except TypeError:
+                rng = self.random.randint(0, sys.maxsize)
+                self.rng: np.random.Generator = np.random.default_rng(rng)
+            self._rng = self.rng.bit_generator.state
+
+        # Wrap the user-defined step method
+        self._user_step = self.step
+        self.step = self._wrapped_step
+
+        # setup agent registration data structures
         self._setup_agent_registration()
 
-        self._steps: int = 0
-        self._time: TimeT = 0  # the model's clock
+    def _wrapped_step(self, *args: Any, **kwargs: Any) -> None:
+        """Automatically increments time and steps after calling the user's step method."""
+        # Automatically increment time and step counters
+        self.steps += 1
+        # Call the original user-defined step method
+        self._user_step(*args, **kwargs)
+
+    def next_id(self) -> int:  # noqa: D102
+        warnings.warn(
+            "using model.next_id() is deprecated. Agents track their unique ID automatically",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return 0
 
     @property
     def agents(self) -> AgentSet:
@@ -92,12 +127,10 @@ class Model:
 
     @agents.setter
     def agents(self, agents: Any) -> None:
-        warnings.warn(
+        raise AttributeError(
             "You are trying to set model.agents. In Mesa 3.0 and higher, this attribute is "
             "used by Mesa itself, so you cannot use it directly anymore."
-            "Please adjust your code to use a different attribute name for custom agent storage.",
-            UserWarning,
-            stacklevel=2,
+            "Please adjust your code to use a different attribute name for custom agent storage."
         )
 
     @property
@@ -121,15 +154,17 @@ class Model:
         return self.agents_by_type[agenttype]
 
     def _setup_agent_registration(self):
-        """helper method to initialize the agent registration datastructures"""
+        """Helper method to initialize the agent registration datastructures."""
         self._agents = {}  # the hard references to all agents in the model
         self._agents_by_type: dict[
             type[Agent], AgentSet
         ] = {}  # a dict with an agentset for each class of agents
-        self._all_agents = AgentSet([], self)  # an agenset with all agents
+        self._all_agents = AgentSet(
+            [], random=self.random
+        )  # an agenset with all agents
 
     def register_agent(self, agent):
-        """Register the agent with the model
+        """Register the agent with the model.
 
         Args:
             agent: The agent to register.
@@ -160,16 +195,19 @@ class Model:
                 [
                     agent,
                 ],
-                self,
+                random=self.random,
             )
 
         self._all_agents.add(agent)
 
     def deregister_agent(self, agent):
-        """Deregister the agent with the model
+        """Deregister the agent with the model.
+
+        Args:
+            agent: The agent to deregister.
 
-        Notes::
-        This method is called automatically by ``Agent.remove``
+        Notes:
+            This method is called automatically by ``Agent.remove``
 
         """
         del self._agents[agent]
@@ -177,8 +215,9 @@ class Model:
         self._all_agents.remove(agent)
 
     def run_model(self) -> None:
-        """Run the model until the end condition is reached. Overload as
-        needed.
+        """Run the model until the end condition is reached.
+
+        Overload as needed.
         """
         while self.running:
             self.step()
@@ -186,28 +225,26 @@ class Model:
     def step(self) -> None:
         """A single step. Fill in here."""
 
-    def _advance_time(self, deltat: TimeT = 1):
-        """Increment the model's steps counter and clock."""
-        self._steps += 1
-        self._time += deltat
-
-    def next_id(self) -> int:
-        """Return the next unique ID for agents, increment current_id"""
-        self.current_id += 1
-        return self.current_id
-
     def reset_randomizer(self, seed: int | None = None) -> None:
         """Reset the model random number generator.
 
         Args:
             seed: A new seed for the RNG; if None, reset using the current seed
         """
-
         if seed is None:
             seed = self._seed
         self.random.seed(seed)
         self._seed = seed
 
+    def reset_rng(self, rng: RNGLike | SeedLike | None = None) -> None:
+        """Reset the model random number generator.
+
+        Args:
+            rng: A new seed for the RNG; if None, reset using the current seed
+        """
+        self.rng = np.random.default_rng(rng)
+        self._rng = self.rng.bit_generator.state
+
     def initialize_data_collector(
         self,
         model_reporters=None,
@@ -215,14 +252,22 @@ class Model:
         agenttype_reporters=None,
         tables=None,
     ) -> None:
-        if not hasattr(self, "schedule") or self.schedule is None:
-            raise RuntimeError(
-                "You must initialize the scheduler (self.schedule) before initializing the data collector."
-            )
-        if self.schedule.get_agent_count() == 0:
-            raise RuntimeError(
-                "You must add agents to the scheduler before initializing the data collector."
-            )
+        """Initialize the data collector for the model.
+
+        Args:
+            model_reporters: model reporters to collect
+            agent_reporters: agent reporters to collect
+            agenttype_reporters: agent type reporters to collect
+            tables: tables to collect
+
+        """
+        warnings.warn(
+            "initialize_data_collector() is deprecated. Please use the DataCollector class directly. "
+            "by using `self.datacollector = DataCollector(...)`.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+
         self.datacollector = DataCollector(
             model_reporters=model_reporters,
             agent_reporters=agent_reporters,
@@ -231,3 +276,16 @@ class Model:
         )
         # Collect data for the first time during initialization.
         self.datacollector.collect(self)
+
+    def remove_all_agents(self):
+        """Remove all agents from the model.
+
+        Notes:
+            This method calls agent.remove for all agents in the model. If you need to remove agents from
+            e.g., a SingleGrid, you can either explicitly implement your own agent.remove method or clean this up
+            near where you are calling this method.
+
+        """
+        # we need to wrap keys in a list to avoid a RunTimeError: dictionary changed size during iteration
+        for agent in list(self._agents.keys()):
+            agent.remove()