Mesa 2.2.3__py3-none-any.whl → 2.2.4__py3-none-any.whl

mesa/__init__.py

@@ -25,7 +25,7 @@ __all__ = [
 ]
 
 __title__ = "mesa"
-__version__ = "2.2.3"
+__version__ = "2.2.4"
 __license__ = "Apache 2.0"
 _this_year = datetime.datetime.now(tz=datetime.timezone.utc).date().year
 __copyright__ = f"Copyright {_this_year} Project Mesa Team"

mesa/agent.py

@@ -54,6 +54,7 @@ class Agent:
         except AttributeError:
             # model super has not been called
             self.model.agents_ = defaultdict(dict)
+            self.model.agents_[type(self)][self] = None
             self.model.agentset_experimental_warning_given = False
 
             warnings.warn(

mesa/datacollection.py

@@ -14,8 +14,7 @@ name.
 
 When the collect() method is called, each model-level function is called, with
 the model as the argument, and the results associated with the relevant
-variable. Then the agent-level functions are called on each agent in the model
-scheduler.
+variable. Then the agent-level functions are called on each agent.
 
 Additionally, other objects can write directly to tables by passing in an
 appropriate dictionary object for a table row.
@@ -30,8 +29,7 @@ The DataCollector then stores the data it collects in dictionaries:
 Finally, DataCollector can create a pandas DataFrame from each collection.
 
 The default DataCollector here makes several assumptions:
-    * The model has a schedule object called 'schedule'
-    * The schedule has an agent list called agents
+    * The model has an agent list called agents
     * For collecting agent-level variables, agents must have a unique_id
 """
 import contextlib
@@ -67,7 +65,7 @@ class DataCollector:
 
         Model reporters can take four types of arguments:
         1. Lambda function:
-           {"agent_count": lambda m: m.schedule.get_agent_count()}
+           {"agent_count": lambda m: len(m.agents)}
         2. Method of a class/instance:
            {"agent_count": self.get_agent_count} # self here is a class instance
            {"agent_count": Model.get_agent_count} # Model here is a class
@@ -180,11 +178,14 @@ class DataCollector:
         rep_funcs = self.agent_reporters.values()
 
         def get_reports(agent):
-            _prefix = (agent.model.schedule.steps, agent.unique_id)
+            _prefix = (agent.model._steps, agent.unique_id)
             reports = tuple(rep(agent) for rep in rep_funcs)
             return _prefix + reports
 
-        agent_records = map(get_reports, model.schedule.agents)
+        agent_records = map(
+            get_reports,
+            model.schedule.agents if hasattr(model, "schedule") else model.agents,
+        )
         return agent_records
 
     def collect(self, model):
@@ -207,7 +208,7 @@ class DataCollector:
 
         if self.agent_reporters:
             agent_records = self._record_agents(model)
-            self._agent_records[model.schedule.steps] = list(agent_records)
+            self._agent_records[model._steps] = list(agent_records)
 
     def add_table_row(self, table_name, row, ignore_missing=False):
         """Add a row dictionary to a specific table.

mesa/experimental/jupyter_viz.py

@@ -178,7 +178,7 @@ def ModelController(model, play_interval, current_step, reset_counter):
     def do_step():
         model.step()
         previous_step.value = current_step.value
-        current_step.value += 1
+        current_step.value = model._steps
 
     def do_play():
         model.running = True

mesa/model.py

@@ -13,11 +13,13 @@ import warnings
 from collections import defaultdict
 
 # mypy
-from typing import Any
+from typing import Any, Union
 
 from mesa.agent import Agent, AgentSet
 from mesa.datacollection import DataCollector
 
+TimeT = Union[float, int]
+
 
 class Model:
     """Base class for models in the Mesa ABM library.
@@ -68,6 +70,9 @@ class Model:
         self.current_id = 0
         self.agents_: defaultdict[type, dict] = defaultdict(dict)
 
+        self._steps: int = 0
+        self._time: TimeT = 0  # the model's clock
+
         # Warning flags for current experimental features. These make sure a warning is only printed once per model.
         self.agentset_experimental_warning_given = False
 
@@ -112,6 +117,11 @@ 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

mesa/time.py

@@ -73,6 +73,8 @@ class BaseScheduler:
         self.model = model
         self.steps = 0
         self.time: TimeT = 0
+        self._original_step = self.step
+        self.step = self._wrapped_step
 
         if agents is None:
             agents = []
@@ -115,6 +117,11 @@ class BaseScheduler:
         self.steps += 1
         self.time += 1
 
+    def _wrapped_step(self):
+        """Wrapper for the step method to include time and step updating."""
+        self._original_step()
+        self.model._advance_time()
+
     def get_agent_count(self) -> int:
         """Returns the current number of agents in the queue."""
         return len(self._agents)
@@ -143,8 +150,8 @@ class BaseScheduler:
 
     def do_each(self, method, shuffle=False):
         if shuffle:
-            self.agents.shuffle(inplace=True)
-        self.agents.do(method)
+            self._agents.shuffle(inplace=True)
+        self._agents.do(method)
 
 
 class RandomActivation(BaseScheduler):
@@ -299,7 +306,7 @@ class RandomActivationByType(BaseScheduler):
 
         agentsbytype = defaultdict(dict)
         for k, v in self._agents_by_type.items():
-            agentsbytype[k] = {agent: agent.unique_id for agent in v}
+            agentsbytype[k] = {agent.unique_id: agent for agent in v}
 
         return agentsbytype
 

{mesa-2.2.3.dist-info → mesa-2.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Mesa
-Version: 2.2.3
+Version: 2.2.4
 Summary: Agent-based modeling (ABM) in Python
 Project-URL: homepage, https://github.com/projectmesa/mesa
 Project-URL: repository, https://github.com/projectmesa/mesa

{mesa-2.2.3.dist-info → mesa-2.2.4.dist-info}/RECORD

@@ -1,11 +1,11 @@
-mesa/__init__.py,sha256=Yc2zjRJrWikG5FSdvxPgv_Zw-yZarIuveZ8NUNy_N0w,679
-mesa/agent.py,sha256=tyRUsZTRGEiv8GLEZJ77eH75N0OYyy8DQ3eBFqgRyK8,13047
+mesa/__init__.py,sha256=1rj0Zvd80Sk-TWYndb9bpGNn5ZuBQqGa2SQ46mDiw0A,679
+mesa/agent.py,sha256=Dh7FikTOr36fjQJ3w59h5reEIJWevhtZvCSW-adk8qk,13103
 mesa/batchrunner.py,sha256=2A1_FbFlSCkDm8xfv1ZamFiBE4VYce8sKP5SR_CledE,6087
-mesa/datacollection.py,sha256=uyPLY5LYNH2lfDvPsar3-WtsgoIMYdaqB9k_889PhAQ,11169
+mesa/datacollection.py,sha256=4WGJYc2jAvdiBi-e-uEPp5G100KlVambym9a4ZAxsuU,11139
 mesa/main.py,sha256=_7y918D0EEHJBLgiV7rqVNWvCyzjamHUSQ873OeEGf8,1468
-mesa/model.py,sha256=sH0rJEe5x0bLanbyeNCsqQDD7bU-xtxTs3B4qUqwvsg,5629
+mesa/model.py,sha256=6OPZ717idd3O7AyA-Y5f0rjuwPoRzBLOqk0BCUs6sXM,5908
 mesa/space.py,sha256=9cN0fW0E850oBFp1lBVvr9_JWKN8wEbUrWuG05QHTE8,61870
-mesa/time.py,sha256=ldt5TbXQ3vVuwMECafcHiMDBEe2VFvYfEVsNFR9kWKk,19955
+mesa/time.py,sha256=BAchKHNFh0ggQqaIMvojHhAF6I3zSQRlDXhQCyKq0NU,20208
 mesa/cookiecutter-mesa/cookiecutter.json,sha256=tBSWli39fOWUXGfiDCTKd92M7uKaBIswXbkOdbUufYY,337
 mesa/cookiecutter-mesa/hooks/post_gen_project.py,sha256=8JoXZKIioRYEWJURC0udj8WS3rg0c4So62sOZSGbrMY,294
 mesa/cookiecutter-mesa/{{cookiecutter.snake}}/README.md,sha256=Yji4lGY-NtQSnW-oBj0_Jhs-XhCfZA8R1mBBM_IllGs,80
@@ -15,7 +15,7 @@ mesa/cookiecutter-mesa/{{cookiecutter.snake}}/{{cookiecutter.snake}}/__init__.py
 mesa/cookiecutter-mesa/{{cookiecutter.snake}}/{{cookiecutter.snake}}/model.pytemplate,sha256=gTxSZ9t8My_Qiwuusqaf8DmspncrLKptxbg9cvfbloc,1842
 mesa/cookiecutter-mesa/{{cookiecutter.snake}}/{{cookiecutter.snake}}/server.pytemplate,sha256=nqi6cPjhiyrYw82_Y9hLSrfZtSVCGIhMLOXRB7kKTlQ,823
 mesa/experimental/__init__.py,sha256=lHhvI2jfsLHfICO7q-LRA6UK4Pyxr7edkBDbjTqPGVo,55
-mesa/experimental/jupyter_viz.py,sha256=-E8Ie4J3N0894Wr8kmsSGabELbh34GG_elOxUjEutOw,11712
+mesa/experimental/jupyter_viz.py,sha256=snVzObTPw-ekZyp6wmaCQdmQ2444gmvY443asNqKM98,11722
 mesa/experimental/components/matplotlib.py,sha256=5xqlSc8wwYxVc_M0GNt0NC0BRS8cdEp6TvBqHoRMhvY,4065
 mesa/flat/__init__.py,sha256=hSqQDjkfIgDu7B3aYtjPeNEUXdlKPHQuNN8HEV0XR6s,218
 mesa/flat/visualization.py,sha256=5aCm8xDCmZij3hoJZvOVmmpzU9ACXSSSvmQr51buLVg,290
@@ -24,8 +24,8 @@ mesa/visualization/TextVisualization.py,sha256=BIP0XcmIdYhz0igqe8yRZXlXeOOqJZeu8
 mesa/visualization/UserParam.py,sha256=D3qxoX-Cpqhyn06IdIO_C5s0u8nlhv3988lVwkBlcGo,49
 mesa/visualization/__init__.py,sha256=5fwVAzgVsmxAzgoLxdC26l2ZE-m2bWj963xPNSDaQEQ,287
 mesa/visualization/modules.py,sha256=pf6K3KECX51VNNqpFCm2EE5KV0A22UYmfXzTVXPnF_o,47
-mesa-2.2.3.dist-info/METADATA,sha256=URL5-0xna14R6lkaZhfzf1sbYnevYauiq9R3K1rLY0E,7148
-mesa-2.2.3.dist-info/WHEEL,sha256=mRYSEL3Ih6g5a_CVMIcwiF__0Ae4_gLYh01YFNwiq1k,87
-mesa-2.2.3.dist-info/entry_points.txt,sha256=IOcQtetGF8l4wHpOs_hGb19Rz-FS__BMXOJR10IBPsA,39
-mesa-2.2.3.dist-info/licenses/LICENSE,sha256=OGUgret9fRrm8J3pdsPXETIjf0H8puK_Nmy970ZzT78,572
-mesa-2.2.3.dist-info/RECORD,,
+mesa-2.2.4.dist-info/METADATA,sha256=Ay9vvBwnAMzLgDbbKho9IALEkIal7VAZopk5Ehh_MxE,7148
+mesa-2.2.4.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
+mesa-2.2.4.dist-info/entry_points.txt,sha256=IOcQtetGF8l4wHpOs_hGb19Rz-FS__BMXOJR10IBPsA,39
+mesa-2.2.4.dist-info/licenses/LICENSE,sha256=OGUgret9fRrm8J3pdsPXETIjf0H8puK_Nmy970ZzT78,572
+mesa-2.2.4.dist-info/RECORD,,

{mesa-2.2.3.dist-info → mesa-2.2.4.dist-info}/WHEEL

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