Mesa 3.0.3__py3-none-any.whl → 3.1.0.dev0__py3-none-any.whl

mesa/__init__.py

@@ -7,7 +7,6 @@ import datetime
 
 import mesa.experimental as experimental
 import mesa.space as space
-import mesa.time as time
 from mesa.agent import Agent
 from mesa.batchrunner import batch_run
 from mesa.datacollection import DataCollector
@@ -16,7 +15,6 @@ from mesa.model import Model
 __all__ = [
     "Model",
     "Agent",
-    "time",
     "space",
     "DataCollector",
     "batch_run",
@@ -24,7 +22,7 @@ __all__ = [
 ]
 
 __title__ = "mesa"
-__version__ = "3.0.3"
+__version__ = "3.1.0.dev"
 __license__ = "Apache 2.0"
-_this_year = datetime.datetime.now(tz=datetime.timezone.utc).date().year
+_this_year = datetime.datetime.now(tz=datetime.UTC).date().year
 __copyright__ = f"Copyright {_this_year} Project Mesa Team"

mesa/agent.py

@@ -155,7 +155,6 @@ class AgentSet(MutableSet, Sequence):
         at_most: int | float = float("inf"),
         inplace: bool = False,
         agent_type: type[Agent] | None = None,
-        n: int | None = None,
     ) -> AgentSet:
         """Select a subset of agents from the AgentSet based on a filter function and/or quantity limit.
 
@@ -167,7 +166,6 @@ class AgentSet(MutableSet, Sequence):
               - If a float between 0 and 1, at most that fraction of original the agents are selected.
             inplace (bool, optional): If True, modifies the current AgentSet; otherwise, returns a new AgentSet. Defaults to False.
             agent_type (type[Agent], optional): The class type of the agents to select. Defaults to None, meaning no type filtering is applied.
-            n (int): deprecated, use at_most instead
 
         Returns:
             AgentSet: A new AgentSet containing the selected agents, unless inplace is True, in which case the current AgentSet is updated.
@@ -176,14 +174,6 @@ class AgentSet(MutableSet, Sequence):
             - at_most just return the first n or fraction of agents. To take a random sample, shuffle() beforehand.
             - at_most is an upper limit. When specifying other criteria, the number of agents returned can be smaller.
         """
-        if n is not None:
-            warnings.warn(
-                "The parameter 'n' is deprecated and will be removed in Mesa 3.1. Use 'at_most' instead.",
-                DeprecationWarning,
-                stacklevel=2,
-            )
-            at_most = n
-
         inf = float("inf")
         if filter_func is None and agent_type is None and at_most == inf:
             return self if inplace else copy.copy(self)
@@ -281,21 +271,6 @@ class AgentSet(MutableSet, Sequence):
         Returns:
             AgentSet | list[Any]: The results of the callable calls if return_results is True, otherwise the AgentSet itself.
         """
-        try:
-            return_results = kwargs.pop("return_results")
-        except KeyError:
-            return_results = False
-        else:
-            warnings.warn(
-                "Using return_results is deprecated and will be removed in Mesa 3.1."
-                "Use AgenSet.do in case of return_results=False, and AgentSet.map in case of return_results=True",
-                DeprecationWarning,
-                stacklevel=2,
-            )
-
-        if return_results:
-            return self.map(method, *args, **kwargs)
-
         # we iterate over the actual weakref keys and check if weakref is alive before calling the method
         if isinstance(method, str):
             for agentref in self._agents.keyrefs():

mesa/experimental/cell_space/cell_collection.py

@@ -48,10 +48,8 @@ class CellCollection(Generic[T]):
         else:
             self._cells = {cell: cell.agents for cell in cells}
 
-        # Get capacity from first cell if collection is not empty
-        self._capacity: int | None = (
-            next(iter(self._cells.keys())).capacity if self._cells else None
-        )
+        #
+        self._capacity: int = next(iter(self._cells.keys())).capacity
 
         if random is None:
             warnings.warn(

mesa/model.py

@@ -18,7 +18,6 @@ from typing import Any
 import numpy as np
 
 from mesa.agent import Agent, AgentSet
-from mesa.datacollection import DataCollector
 
 SeedLike = int | np.integer | Sequence[int] | np.random.SeedSequence
 RNGLike = np.random.Generator | np.random.BitGenerator
@@ -112,14 +111,6 @@ class Model:
         # 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 and will be removed in Mesa 3.1. Agents track their unique ID automatically",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return 0
-
     @property
     def agents(self) -> AgentSet:
         """Provides an AgentSet of all agents in the model, combining agents from all types."""
@@ -143,16 +134,6 @@ class Model:
         """A dictionary where the keys are agent types and the values are the corresponding AgentSets."""
         return self._agents_by_type
 
-    def get_agents_of_type(self, agenttype: type[Agent]) -> AgentSet:
-        """Deprecated: Retrieves an AgentSet containing all agents of the specified type."""
-        warnings.warn(
-            f"Model.get_agents_of_type() is deprecated and will be removed in Mesa 3.1."
-            f"Please replace get_agents_of_type({agenttype}) with the property agents_by_type[{agenttype}].",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return self.agents_by_type[agenttype]
-
     def _setup_agent_registration(self):
         """Helper method to initialize the agent registration datastructures."""
         self._agents = {}  # the hard references to all agents in the model
@@ -245,38 +226,6 @@ class Model:
         self.rng = np.random.default_rng(rng)
         self._rng = self.rng.bit_generator.state
 
-    def initialize_data_collector(
-        self,
-        model_reporters=None,
-        agent_reporters=None,
-        agenttype_reporters=None,
-        tables=None,
-    ) -> None:
-        """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 and will be removed in Mesa 3.1. 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,
-            agenttype_reporters=agenttype_reporters,
-            tables=tables,
-        )
-        # Collect data for the first time during initialization.
-        self.datacollector.collect(self)
-
     def remove_all_agents(self):
         """Remove all agents from the model.
 

mesa/visualization/solara_viz.py

@@ -382,17 +382,11 @@ def ModelCreator(
     )
     user_params, fixed_params = split_model_params(user_params)
 
-    # Use solara.use_effect to run the initialization code only once
-    solara.use_effect(
-        # set model_parameters to the default values for all parameters
-        lambda: model_parameters.set(
-            {
-                **fixed_params,
-                **{k: v.get("value") for k, v in user_params.items()},
-            }
-        ),
-        [],
-    )
+    # set model_parameters to the default values for all parameters
+    model_parameters.value = {
+        **fixed_params,
+        **{k: v.get("value") for k, v in user_params.items()},
+    }
 
     def on_change(name, value):
         model_parameters.value = {**model_parameters.value, name: value}

{mesa-3.0.3.dist-info → mesa-3.1.0.dev0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: Mesa
-Version: 3.0.3
+Version: 3.1.0.dev0
 Summary: Agent-based modeling (ABM) in Python
 Project-URL: homepage, https://github.com/projectmesa/mesa
 Project-URL: repository, https://github.com/projectmesa/mesa
@@ -13,14 +13,13 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Topic :: Scientific/Engineering :: Artificial Life
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: tqdm
@@ -81,7 +80,7 @@ Description-Content-Type: text/markdown
 | --- | --- |
 | CI/CD | [![GitHub Actions build status](https://github.com/projectmesa/mesa/workflows/build/badge.svg)](https://github.com/projectmesa/mesa/actions) [![Coverage status](https://codecov.io/gh/projectmesa/mesa/branch/main/graph/badge.svg)](https://codecov.io/gh/projectmesa/mesa) |
 | Package | [![PyPI - Version](https://img.shields.io/pypi/v/mesa.svg?logo=pypi&label=PyPI&logoColor=gold)](https://pypi.org/project/Mesa/) [![PyPI - Downloads](https://img.shields.io/pypi/dm/mesa.svg?color=blue&label=Downloads&logo=pypi&logoColor=gold)](https://pypi.org/project/Mesa/) [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/mesa.svg?logo=python&label=Python&logoColor=gold)](https://pypi.org/project/Mesa/) |
-| Meta | [![linting - Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff) [![code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) [![Hatch project](https://img.shields.io/badge/%F0%9F%A5%9A-Hatch-4051b5.svg)](https://github.com/pypa/hatch) |
+| Meta | [![linting - Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff) [![code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) [![Hatch project](https://img.shields.io/badge/%F0%9F%A5%9A-Hatch-4051b5.svg)](https://github.com/pypa/hatch) [![SPEC 0 — Minimum Supported Dependencies](https://img.shields.io/badge/SPEC-0-green?labelColor=%23004811&color=%235CA038)](https://scientific-python.org/specs/spec-0000/) |
 | Chat | [![chat](https://img.shields.io/matrix/project-mesa:matrix.org?label=chat&logo=Matrix)](https://matrix.to/#/#project-mesa:matrix.org) |
 
 Mesa allows users to quickly create agent-based models using built-in

{mesa-3.0.3.dist-info → mesa-3.1.0.dev0.dist-info}/RECORD

@@ -1,10 +1,9 @@
-mesa/__init__.py,sha256=B-mERjSf7OMn3SyxAszE2eRL-UaEmQyhOwntfnXlack,657
-mesa/agent.py,sha256=k85bw5iVX0MmaVlJg3mG_liobN_sIVsrZf76YZ_hMyA,25289
+mesa/__init__.py,sha256=yfsF1GQ64lI5t02W_YGXJWnGEiiyGvxJeIKP8Gkc43I,615
+mesa/agent.py,sha256=_ZI_cR9ZR_mzEBrOXorFe3UlmeJM7e1-ODV8MoW6tRk,24406
 mesa/batchrunner.py,sha256=sMFLTxj5avP_-HGO0leLVuxXK2dH0xdPopvhAmawwRQ,7213
 mesa/datacollection.py,sha256=xyb07aBpd-HSDh5bk-XcVqGiDu5bfaLlxj5eDlGIwqY,16138
-mesa/model.py,sha256=Eb7wksREf882HGY-t7IwHVRIYDLzNaYOSmOLIdbaykA,10502
+mesa/model.py,sha256=EzDYnwkt9Bm5fEah8JztzjghFBzUmnIr4WknbaR7zzk,8573
 mesa/space.py,sha256=cfzlRfy9chegp8d89k2aqI29jo9cb18USlz2G2iOZU4,64082
-mesa/time.py,sha256=KXwDqZHHvYbuqzB8zRbHglN23qVMfj8RXD-T_kJ3DfY,15022
 mesa/examples/README.md,sha256=dNn8kv0BNQem3NNhO5mbOANQoK8UUYOo7rnkCFV9tnE,2882
 mesa/examples/__init__.py,sha256=fP1vcexySnKowS2CKhfeyYLt058VpIkK26EOo3btyO0,825
 mesa/examples/advanced/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -67,7 +66,7 @@ mesa/experimental/solara_viz.py,sha256=uWrNQAX3oEWSftmyjNorN839dBCUp86hnhpL704dy
 mesa/experimental/cell_space/__init__.py,sha256=-NtSCT7mA-aszLSAdqbICGqeFe2vBdb-GrcW562legY,999
 mesa/experimental/cell_space/cell.py,sha256=lDm7NQhPDFf3-SZu5W594lDNGtzcdSPUSSsELFRg0bs,7166
 mesa/experimental/cell_space/cell_agent.py,sha256=jvYOV9OIaBaqAsAG0YLV64X_f3BJe_wP7qfos_RXi0Y,3759
-mesa/experimental/cell_space/cell_collection.py,sha256=MQNHj7n3b7wWLAZtTVQ9GeWjWcptwmROhQDckQr5TpM,4119
+mesa/experimental/cell_space/cell_collection.py,sha256=ADK_42ykyWQpVGVSFE8GG_djqTgL8wfWwu2YTwXUPcs,4007
 mesa/experimental/cell_space/discrete_space.py,sha256=A54lHbTo4udcU4zkJEnsWuWKOBrELg-1eU8-dPoLMPk,5826
 mesa/experimental/cell_space/grid.py,sha256=oWTy6kaaHXLPneA-w5XdqzwA0YItMWYgCq_UjNH9iA8,7711
 mesa/experimental/cell_space/network.py,sha256=_x0zKlI-odNCSRb_Zqh4nBPjqnW5iVj8sVheKPCLzmU,1321
@@ -81,15 +80,15 @@ mesa/experimental/devs/examples/epstein_civil_violence.py,sha256=E8YSV3O5ihKsntG
 mesa/experimental/devs/examples/wolf_sheep.py,sha256=1eb1CfYNQoprqSJat-LPYPvwWH1ENQdj39viEqwSk0s,8103
 mesa/visualization/__init__.py,sha256=o30F2VApnDJ6Zq0_U5_wBnj-6-Bu7FGPsOq3A6p2EqA,743
 mesa/visualization/mpl_space_drawing.py,sha256=yf3Sc7pm5EJLxfWQdtR-9PcUtZveEEjar1WUr7qwI4o,20057
-mesa/visualization/solara_viz.py,sha256=M58P1U_x1IfV3Ha4E2ZVo3mocux3wWnEJqPKwNPBgZE,18117
+mesa/visualization/solara_viz.py,sha256=pGtfjFfFMLwF9vmy5btiHRZww6NGoiKu0tzNdhZaYj4,17947
 mesa/visualization/user_param.py,sha256=Dl2WOwLYLf0pfLpabCZtIdFRyKZrK6Qtc3utZx5GPYg,2139
 mesa/visualization/utils.py,sha256=lJHgRKF5BHLf72Tw3YpwyiWuRoIimaTKQ7xBCw_Rx3A,146
 mesa/visualization/components/__init__.py,sha256=Bq3nrPikcaIo9BSs0O3zptWVLlUmAkLo3s0mEmpH1RE,3022
 mesa/visualization/components/altair_components.py,sha256=wotpFFQgMY-ZR3lNVm_fRos-iDg0Wjnj6Tk67_7f1SQ,5847
 mesa/visualization/components/matplotlib_components.py,sha256=xQETaFyHIfmL_9JwrLIgubuIQ7-pp7TMoXT1WMmozus,5441
-mesa-3.0.3.dist-info/METADATA,sha256=B9ZoDWevYunj_DI8ztkK_TYrhWPzfJ7LVVhfgEdpY5s,9782
-mesa-3.0.3.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-mesa-3.0.3.dist-info/entry_points.txt,sha256=IOcQtetGF8l4wHpOs_hGb19Rz-FS__BMXOJR10IBPsA,39
-mesa-3.0.3.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-mesa-3.0.3.dist-info/licenses/NOTICE,sha256=GbsWoK0QWv1JyZ_xer2s-jNilv0RtWl-0UrtlJANHPg,578
-mesa-3.0.3.dist-info/RECORD,,
+mesa-3.1.0.dev0.dist-info/METADATA,sha256=iqUH3bKVcZW0XOY9KzYXKUBg3q3J2TO-EalHU9JIe-Q,9911
+mesa-3.1.0.dev0.dist-info/WHEEL,sha256=3U_NnUcV_1B1kPkYaPzN-irRckL5VW_lytn0ytO_kRY,87
+mesa-3.1.0.dev0.dist-info/entry_points.txt,sha256=IOcQtetGF8l4wHpOs_hGb19Rz-FS__BMXOJR10IBPsA,39
+mesa-3.1.0.dev0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+mesa-3.1.0.dev0.dist-info/licenses/NOTICE,sha256=GbsWoK0QWv1JyZ_xer2s-jNilv0RtWl-0UrtlJANHPg,578
+mesa-3.1.0.dev0.dist-info/RECORD,,

{mesa-3.0.3.dist-info → mesa-3.1.0.dev0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.26.3
+Generator: hatchling 1.26.1
 Root-Is-Purelib: true
 Tag: py3-none-any

mesa/time.py

@@ -1,391 +0,0 @@
-"""Mesa Time Module.
-
-.. warning::
-    The time module and all its Schedulers are deprecated and will be removed in Mesa 3.1.
-    They can be replaced with AgentSet functionality. See the migration guide for details:
-    https://mesa.readthedocs.io/latest/migration_guide.html#time-and-schedulers
-
-Objects for handling the time component of a model. In particular, this module
-contains Schedulers, which handle agent activation. A Scheduler is an object
-which controls when agents are called upon to act, and when.
-
-The activation order can have a serious impact on model behavior, so it's
-important to specify it explicitly. Example simple activation regimes include
-activating all agents in the same order every step, shuffling the activation
-order every time, activating each agent *on average* once per step, and more.
-
-Key concepts:
-    Step: Many models advance in 'steps'. A step may involve the activation of
-    all agents, or a random (or selected) subset of them. Each agent in turn
-    may have their own step() method.
-
-    Time: Some models may simulate a continuous 'clock' instead of discrete
-    steps. However, by default, the Time is equal to the number of steps the
-    model has taken.
-"""
-
-# Mypy; for the `|` operator purpose
-# Remove this __future__ import once the oldest supported Python is 3.10
-from __future__ import annotations
-
-import warnings
-from collections import defaultdict
-from collections.abc import Iterable
-
-# mypy
-from mesa.agent import Agent, AgentSet
-from mesa.model import Model
-
-# BaseScheduler has a self.time of int, while
-# StagedActivation has a self.time of float
-TimeT = float | int
-
-
-class BaseScheduler:
-    """A simple scheduler that activates agents one at a time, in the order they were added.
-
-    This scheduler is designed to replicate the behavior of the scheduler in MASON, a multi-agent simulation toolkit.
-    It assumes that each agent added has a `step` method which takes no arguments and executes the agent's actions.
-
-    Attributes:
-        model (Model): The model instance associated with the scheduler.
-        steps (int): The number of steps the scheduler has taken.
-        time (TimeT): The current time in the simulation. Can be an integer or a float.
-
-    """
-
-    def __init__(self, model: Model, agents: Iterable[Agent] | None = None) -> None:
-        """Create a new BaseScheduler.
-
-        Args:
-            model (Model): The model to which the schedule belongs
-            agents (Iterable[Agent], None, optional): An iterable of agents who are controlled by the schedule
-
-        """
-        warnings.warn(
-            "The time module and all its Schedulers are deprecated and will be removed in Mesa 3.1. "
-            "They can be replaced with AgentSet functionality. See the migration guide for details. "
-            "https://mesa.readthedocs.io/latest/migration_guide.html#time-and-schedulers",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-
-        self.model = model
-        self.steps = 0
-        self.time: TimeT = 0
-
-        if agents is None:
-            agents = []
-
-        self._agents: AgentSet = AgentSet(agents, model.random)
-
-        self._remove_warning_given = False
-        self._agents_key_warning_given = False
-
-    def add(self, agent: Agent) -> None:
-        """Add an Agent object to the schedule.
-
-        Args:
-            agent (Agent): An Agent to be added to the schedule.
-        """
-        if agent not in self._agents:
-            self._agents.add(agent)
-        else:
-            raise ValueError("agent already added to scheduler")
-
-    def remove(self, agent: Agent) -> None:
-        """Remove all instances of a given agent from the schedule.
-
-        Args:
-            agent: An `Agent` instance.
-
-        Note:
-            It is only necessary to explicitly remove agents from the schedule if
-            the agent is not removed from the model.
-
-        """
-        self._agents.remove(agent)
-
-    def step(self) -> None:
-        """Execute the step of all the agents, one at a time."""
-        # To be able to remove and/or add agents during stepping
-        # it's necessary for the keys view to be a list.
-        self.do_each("step")
-        self.steps += 1
-        self.time += 1
-
-    def get_agent_count(self) -> int:
-        """Returns the current number of agents in the queue."""
-        return len(self._agents)
-
-    @property
-    def agents(self) -> AgentSet:
-        """Return agents in the scheduler."""
-        # a bit dirty, but returns a copy of the internal agent set
-        return self._agents.select()
-
-    def get_agent_keys(self, shuffle: bool = False) -> list[int]:
-        """Deprecated."""
-        # To be able to remove and/or add agents during stepping
-        # it's necessary to cast the keys view to a list.
-
-        if not self._agents_key_warning_given:
-            self._agents_key_warning_given = True
-            warnings.warn(
-                "Because of the shift to using weakrefs, this method will be removed in a future version",
-                DeprecationWarning,
-                stacklevel=2,
-            )
-
-        agent_keys = [agent.unique_id for agent in self._agents]
-        if shuffle:
-            self.model.random.shuffle(agent_keys)
-        return agent_keys
-
-    def do_each(self, method, shuffle=False):
-        """Perform `method` on each agent.
-
-        Args:
-            method: method to call
-            shuffle: shuffle the agents or not prior to calling method
-
-
-        """
-        if shuffle:
-            self._agents.shuffle(inplace=True)
-        self._agents.do(method)
-
-
-class RandomActivation(BaseScheduler):
-    """A scheduler that activates each agent once per step, in a random order, with the order reshuffled each step.
-
-    This scheduler is equivalent to the NetLogo 'ask agents...' behavior and is a common default for ABMs.
-    It assumes that all agents have a `step` method.
-
-    The random activation ensures that no single agent or sequence of agents consistently influences the model due
-    to ordering effects, which is crucial for certain types of simulations.
-
-    Inherits all attributes and methods from BaseScheduler.
-
-    """
-
-    def step(self) -> None:
-        """Executes the step of all agents, one at a time, in random order."""
-        self.do_each("step", shuffle=True)
-        self.steps += 1
-        self.time += 1
-
-
-class SimultaneousActivation(BaseScheduler):
-    """A scheduler that simulates the simultaneous activation of all agents.
-
-    This scheduler is unique in that it requires agents to have both `step` and `advance` methods.
-    - The `step` method is for activating the agent and staging any changes without applying them immediately.
-    - The `advance` method then applies these changes, simulating simultaneous action.
-
-    This scheduler is useful in scenarios where the interactions between agents are sensitive to the order
-    of execution, and a quasi-simultaneous execution is more realistic.
-
-    Inherits all attributes and methods from BaseScheduler.
-
-    """
-
-    def step(self) -> None:
-        """Step all agents, then advance them."""
-        self.do_each("step")
-        # do_each recomputes the agent_keys from scratch whenever it is called.
-        # It can handle the case when some agents might have been removed in
-        # the previous loop.
-        self.do_each("advance")
-        self.steps += 1
-        self.time += 1
-
-
-class StagedActivation(BaseScheduler):
-    """A scheduler allowing agent activation to be divided into several stages.
-
-    All agents executing one stage before moving on to the next. This class is a generalization of SimultaneousActivation.
-
-    This scheduler is useful for complex models where actions need to be broken down into distinct phases
-    for each agent in each time step. Agents must implement methods for each defined stage.
-
-    The scheduler also tracks steps and time separately, allowing fractional time increments based on the number
-    of stages. Time advances in fractional increments of 1 / (# of stages), meaning that 1 step = 1 unit of time.
-
-    Inherits all attributes and methods from BaseScheduler.
-
-    Attributes:
-        - stage_list (list[str]): A list of stage names that define the order of execution.
-        - shuffle (bool): Determines whether to shuffle the order of agents each step.
-        - shuffle_between_stages (bool): Determines whether to shuffle agents between each stage.
-
-    """
-
-    def __init__(
-        self,
-        model: Model,
-        agents: Iterable[Agent] | None = None,
-        stage_list: list[str] | None = None,
-        shuffle: bool = False,
-        shuffle_between_stages: bool = False,
-    ) -> None:
-        """Create an empty Staged Activation schedule.
-
-        Args:
-            model (Model): The model to which the schedule belongs
-            agents (Iterable[Agent], None, optional): An iterable of agents who are controlled by the schedule
-            stage_list (:obj:`list` of :obj:`str`): List of strings of names of stages to run, in the
-                         order to run them in.
-            shuffle (bool, optional): If True, shuffle the order of agents each step.
-            shuffle_between_stages (bool, optional): If True, shuffle the agents after each
-                                    stage; otherwise, only shuffle at the start
-                                    of each step.
-        """
-        super().__init__(model, agents)
-        self.stage_list = stage_list if stage_list else ["step"]
-        self.shuffle = shuffle
-        self.shuffle_between_stages = shuffle_between_stages
-        self.stage_time = 1 / len(self.stage_list)
-
-    def step(self) -> None:
-        """Executes all the stages for all agents."""
-        shuffle = self.shuffle
-        for stage in self.stage_list:
-            if stage.startswith("model."):
-                getattr(self.model, stage[6:])()
-            else:
-                self.do_each(stage, shuffle=shuffle)
-
-            shuffle = self.shuffle_between_stages
-            self.time += self.stage_time
-
-        self.steps += 1
-
-
-class RandomActivationByType(BaseScheduler):
-    """A scheduler that activates each type of agent once per step, in random order, with the order reshuffled every step.
-
-    This scheduler is useful for models with multiple types of agents, ensuring that each type is treated
-    equitably in terms of activation order. The randomness in activation order helps in reducing biases
-    due to ordering effects.
-
-    Inherits all attributes and methods from BaseScheduler.
-
-    If you want to do some computations / data collections specific to an agent
-    type, you can either:
-    - loop through all agents, and filter by their type
-    - access via `your_model.scheduler.agents_by_type[your_type_class]`
-
-    Attributes:
-        - agents_by_type (defaultdict): A dictionary mapping agent types to dictionaries of agents.
-
-    """
-
-    @property
-    def agents_by_type(self):  # noqa: D102
-        warnings.warn(
-            "Because of the shift to using AgentSet, in the future this attribute will return a dict with"
-            "type as key as AgentSet as value. Future behavior is available via RandomActivationByType._agents_by_type",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-
-        agentsbytype = defaultdict(dict)
-        for k, v in self._agents_by_type.items():
-            agentsbytype[k] = {agent.unique_id: agent for agent in v}
-
-        return agentsbytype
-
-    def __init__(self, model: Model, agents: Iterable[Agent] | None = None) -> None:
-        """Initialize RandomActivationByType instance.
-
-        Args:
-            model (Model): The model to which the schedule belongs
-            agents (Iterable[Agent], None, optional): An iterable of agents who are controlled by the schedule
-        """
-        super().__init__(model, agents)
-        # can't be a defaultdict because we need to pass model to AgentSet
-        self._agents_by_type: [type, AgentSet] = {}
-
-        if agents is not None:
-            for agent in agents:
-                try:
-                    self._agents_by_type[type(agent)].add(agent)
-                except KeyError:
-                    self._agents_by_type[type(agent)] = AgentSet(
-                        [agent], self.model.random
-                    )
-
-    def add(self, agent: Agent) -> None:
-        """Add an Agent object to the schedule.
-
-        Args:
-            agent: An Agent to be added to the schedule.
-        """
-        super().add(agent)
-
-        try:
-            self._agents_by_type[type(agent)].add(agent)
-        except KeyError:
-            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.
-
-        Args:
-            agent: An Agent to be removed from the schedule.
-
-        """
-        super().remove(agent)
-        self._agents_by_type[type(agent)].remove(agent)
-
-    def step(self, shuffle_types: bool = True, shuffle_agents: bool = True) -> None:
-        """Executes the step of each agent type, one at a time, in random order.
-
-        Args:
-            shuffle_types: If True, the order of execution of each types is shuffled.
-            shuffle_agents: If True, the order of execution of each agents in a type group is shuffled.
-        """
-        # To be able to remove and/or add agents during stepping
-        # it's necessary to cast the keys view to a list.
-        type_keys: list[type[Agent]] = list(self._agents_by_type.keys())
-        if shuffle_types:
-            self.model.random.shuffle(type_keys)
-        for agent_class in type_keys:
-            self.step_type(agent_class, shuffle_agents=shuffle_agents)
-        self.steps += 1
-        self.time += 1
-
-    def step_type(self, agenttype: type[Agent], shuffle_agents: bool = True) -> None:
-        """Shuffle order and run all agents of a given type.
-
-        Args:
-            agenttype: Class object of the type to run.
-            shuffle_agents: If True, shuffle agents
-        """
-        agents = self._agents_by_type[agenttype]
-
-        if shuffle_agents:
-            agents.shuffle(inplace=True)
-        agents.do("step")
-
-    def get_type_count(self, agenttype: type[Agent]) -> int:
-        """Returns the current number of agents of certain type in the queue."""
-        return len(self._agents_by_type[agenttype])
-
-
-class DiscreteEventScheduler(BaseScheduler):
-    """This class has been removed and replaced by the functionality provided by experimental.devs."""
-
-    def __init__(self, model: Model, time_step: TimeT = 1) -> None:
-        """Initialize DiscreteEventScheduler.
-
-        Args:
-            model (Model): The model to which the schedule belongs
-            time_step (TimeT): The fixed time step between steps
-
-        """
-        super().__init__(model)
-        raise Exception(
-            "DiscreteEventScheduler is removed in favor of the functionality provided by experimental.devs"
-        )