Mesa 1.1.0__py3-none-any.whl → 1.2.0__py3-none-any.whl

{Mesa-1.1.0.dist-info → Mesa-1.2.0.dist-info}/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2021 Core Mesa Team and contributors
+Copyright 2022 Core Mesa Team and contributors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

{Mesa-1.1.0.dist-info → Mesa-1.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Mesa
-Version: 1.1.0
+Version: 1.2.0
 Summary: Agent-based modeling (ABM) in Python 3+
 Home-page: https://github.com/projectmesa/mesa
 Author: Project Mesa Team
@@ -12,7 +12,6 @@ Classifier: Topic :: Scientific/Engineering :: Artificial Life
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Intended Audience :: Science/Research
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
@@ -20,7 +19,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Development Status :: 3 - Alpha
 Classifier: Natural Language :: English
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 License-File: LICENSE
 Requires-Dist: click
 Requires-Dist: cookiecutter
@@ -31,8 +30,8 @@ Requires-Dist: tornado
 Requires-Dist: tqdm
 Provides-Extra: dev
 Requires-Dist: black ; extra == 'dev'
+Requires-Dist: ruff ; extra == 'dev'
 Requires-Dist: coverage ; extra == 'dev'
-Requires-Dist: flake8 ; extra == 'dev'
 Requires-Dist: pytest (>=4.6) ; extra == 'dev'
 Requires-Dist: pytest-cov ; extra == 'dev'
 Requires-Dist: sphinx ; extra == 'dev'
@@ -55,7 +54,7 @@ Mesa: Agent-based modeling in Python 3+
 .. image:: https://img.shields.io/matrix/project-mesa:matrix.org?label=chat&logo=Matrix
         :target: https://matrix.to/#/#project-mesa:matrix.org
 
-It allows users to quickly create agent-based models using built-in core components (such as spatial grids and agent schedulers) or customized implementations; visualize them using a browser-based interface; and analyze their results using Python's data analysis tools. Its goal is to be the Python 3-based alternative to NetLogo, Repast, or MASON.
+Mesa allows users to quickly create agent-based models using built-in core components (such as spatial grids and agent schedulers) or customized implementations; visualize them using a browser-based interface; and analyze their results using Python's data analysis tools. Its goal is to be the Python 3-based alternative to NetLogo, Repast, or MASON.
 
 
 .. image:: https://raw.githubusercontent.com/projectmesa/mesa/main/docs/images/Mesa_Screenshot.png
@@ -99,19 +98,21 @@ Or any other (development) branch on this repo or your own fork:
 
     $ pip install -U -e git+https://github.com/YOUR_FORK/mesa@YOUR_BRANCH#egg=mesa
 
-Take a look at the `examples <https://github.com/projectmesa/mesa/tree/main/examples>`_ folder for sample models demonstrating Mesa features.
+For resources or help on using Mesa, check out the following:
 
-For more help on using Mesa, check out the following resources:
-
-* `Intro to Mesa Tutorial`_
-* `Docs`_
-* `Email list for users`_
-* `PyPI`_
+* `Intro to Mesa Tutorial`_ (An introductory model, the Boltzmann Wealth Model, for beginners or those new to Mesa.)
+* `Complexity Explorer Tutorial`_ (An advanced-beginner model, SugarScape with Traders, with instructional videos)
+* `Mesa Examples`_ (A repository of seminal ABMs using Mesa and examples of employing specific Mesa Features)
+* `Docs`_ (Mesa's documentation, API and useful snippets)
+* `Discussions`_ (GitHub threaded discussions about Mesa)
+* `Matrix Chat`_ (Chat Forum via Matrix to talk about Mesa)
 
 .. _`Intro to Mesa Tutorial` : http://mesa.readthedocs.org/en/main/tutorials/intro_tutorial.html
+.. _`Complexity Explorer Tutorial` : https://www.complexityexplorer.org/courses/172-agent-based-models-with-python-an-introduction-to-mesa
+.. _`Mesa Examples` : https://github.com/projectmesa/mesa-examples/tree/main/examples
 .. _`Docs` : http://mesa.readthedocs.org/en/main/
-.. _`Email list for users` : https://groups.google.com/d/forum/projectmesa
-.. _`PyPI` : https://pypi.python.org/pypi/Mesa/
+.. _`Discussions` : https://github.com/projectmesa/mesa/discussions
+.. _`Matrix Chat` : https://matrix.to/#/#project-mesa:matrix.org
 
 Running Mesa in Docker
 ------------------------

{Mesa-1.1.0.dist-info → Mesa-1.2.0.dist-info}/RECORD

@@ -1,24 +1,24 @@
-mesa/__init__.py,sha256=ZBvL991ijKa2akO3puatGlNuh0zR2OWWuqLFFz_DqUk,617
-mesa/agent.py,sha256=aFlHd1o5_qXWnRGB2P0MHNN91kV4HMCm7hsd1LBnBpU,1094
-mesa/batchrunner.py,sha256=ipWDhncb8fEmoXFrq2JNdYgxgl-IgfLA2x2ugiwyhy0,28077
-mesa/datacollection.py,sha256=W6iJbcgunaqSXQZLSmc4bHOckRCikW1yr1DXOivBrg4,10111
-mesa/main.py,sha256=cDuhAJowWiS2xA-mLIMKLoDH7F5BeNRqGo4iUDYArpA,1141
-mesa/model.py,sha256=_ApMoFhyuWbG3bCPHPzR-G08fU_Fr5B29Bd7Bo3hVww,2611
-mesa/space.py,sha256=XCWtB-ROC7lghHXw_QpDo4WjAPQbH0fLjKXoUr-Pw4c,35277
-mesa/time.py,sha256=dT_tDPlnAqNRPhSd1-yh1w3n2LRktm2jiWOcxb8_U0E,10095
+mesa/__init__.py,sha256=14vZcuboYtBmYU8mAk01zDJs7PzTvzX7McgKwHRniyY,664
+mesa/agent.py,sha256=EtfTa33MMSkiZ66hXl0LBVSyFpbb1paf0CUUBQS7yao,1081
+mesa/batchrunner.py,sha256=8a1Vw9Kz7VIPv6LCTOd02UZkY8TQSWTXhTMJB4bEbBE,27850
+mesa/datacollection.py,sha256=jgwmvhH_1c8R0FX43DqOUrNLQ6KqTYWEjwb1G4V6Do4,10129
+mesa/main.py,sha256=hy73jEXQSvq8z-0IIvC0lYGqQNLIrwZsWkvMP35KdLc,1147
+mesa/model.py,sha256=lww4nK_A0K_zc5e_JL_dwDae1_2juvF3lZJ61yB7jeA,2595
+mesa/space.py,sha256=dw4n5RNro2oA_yI6K0ZOmLTsRfXAyi0RsFyQq3340Y8,39673
+mesa/time.py,sha256=ZTk9qkvPhgGfaKtX7DaOeeK8eabVutTKS9-iThNUEf4,10665
 mesa/cookiecutter-mesa/cookiecutter.json,sha256=tBSWli39fOWUXGfiDCTKd92M7uKaBIswXbkOdbUufYY,337
 mesa/flat/__init__.py,sha256=hSqQDjkfIgDu7B3aYtjPeNEUXdlKPHQuNN8HEV0XR6s,218
 mesa/flat/visualization.py,sha256=WC01m3B6dduwV7-85rP9BdH2cxiCv6RJrsltv_oEtb0,298
-mesa/visualization/ModularVisualization.py,sha256=YrwkaVF_UKkK6X_fdig4GyU1OtsUyI7qG9gs_M3ihJw,14483
-mesa/visualization/TextVisualization.py,sha256=-hfnEA1GyAmcrWFr-Vdpp8kD5JbwpbWcmU7kFAJrvhM,3795
-mesa/visualization/UserParam.py,sha256=_tncRcH5hQyW6fU2QYjNew4oElqWAs6_52dS8Zl_JxI,8722
-mesa/visualization/__init__.py,sha256=5D7_zDik-F85CiEVZuq02FG9jKwFA5iz7QvrxwJAvgg,269
-mesa/visualization/modules/BarChartVisualization.py,sha256=eUA4WAndtNd-yelqwstmnQx8biZJU1pBC4JNrctY0cM,3694
-mesa/visualization/modules/CanvasGridVisualization.py,sha256=WvcIIqlUJWY8eU2463mg3LU_KdgG8mmERaUncLeiUxE,4744
-mesa/visualization/modules/ChartVisualization.py,sha256=dcNvo7nryqsujOax6BBNAvs2_YluXpKM8itCjMo-xN0,3145
-mesa/visualization/modules/HexGridVisualization.py,sha256=az2SwypvG5s4r3T90kQNdGKWaaCOsrnHTgFHeX2lyw0,3543
-mesa/visualization/modules/NetworkVisualization.py,sha256=eUGY8QLbsII3r0tgT1B5U25BSqE1pdrxKQb6o2nkDPA,839
-mesa/visualization/modules/PieChartVisualization.py,sha256=35TvAAB86ua53Jd8rdEuqTe0FJIQ6PD7v-ykk6bBtFs,2454
+mesa/visualization/ModularVisualization.py,sha256=0rcfkvtmEd7RXOW0H09Wea3fhZY0nepI1nPExd_po8A,14637
+mesa/visualization/TextVisualization.py,sha256=qGlX6aROX9vyeygOwuGphK8ae0WfSF51qrgJ7YkHOnA,3792
+mesa/visualization/UserParam.py,sha256=6eWCGJNhbS3avoOGc7n2h9QYRgwY1-_u2HOaZq64VyY,8688
+mesa/visualization/__init__.py,sha256=E67QA_Aw2Prrr-uwKqWWtcl_7pNSLfpfJmt1dH6RlS8,268
+mesa/visualization/modules/BarChartVisualization.py,sha256=0iFUT7itUWb6g_Op9DXbkPrW9LXViFr1Bxr3dGmYHuA,3698
+mesa/visualization/modules/CanvasGridVisualization.py,sha256=O8m7OuvL8FvesLa2OOZwgS06NOpnQX4HilZlLZSykJc,4742
+mesa/visualization/modules/ChartVisualization.py,sha256=qql1EzfaRaIx30GlHB9i_LRBIUzula4yqHXsqI3Lv2k,3144
+mesa/visualization/modules/HexGridVisualization.py,sha256=e0gaxkwolnMb97PUFCidNRGgaix2K1URS1jpAouzay8,3541
+mesa/visualization/modules/NetworkVisualization.py,sha256=HQeBsWwmxL1zNsWRYI_im88doa7sjaxWpvNXN4WIr78,838
+mesa/visualization/modules/PieChartVisualization.py,sha256=v3tBnxdxVBXMp9P9nNRGzp_SR7w0FrMJgm6s3z1ynMg,2450
 mesa/visualization/modules/__init__.py,sha256=GfB3QILVF6FmEY1Kdz6uZ8AToRAUfv_URR_3jALyNsc,726
 mesa/visualization/templates/modular_template.html,sha256=0ZBBTVGI5jbBlT7hBJhMum8qI7cXvpdvBfnzPDrtg18,4546
 mesa/visualization/templates/css/visualization.css,sha256=vOjdwmVKb7PTbqljH7dvosbnk3ycoOvVxZ_PgSu2HmI,377
@@ -136,9 +136,9 @@ mesa/visualization/templates/js/BarChartModule.js,sha256=kmR2dgssnXLyE7WOFqoyGGA
 mesa/visualization/templates/js/CanvasHexModule.js,sha256=XzUf5zPPl3xjVqi1Dw3aNgJn_1kiTQ6CNZicV4k9QqY,1610
 mesa/visualization/templates/js/CanvasModule.js,sha256=BxPirbRJPH41m5tqOklNf8BKlzzgh93AmzDD3D7LeL4,1689
 mesa/visualization/templates/js/ChartModule.js,sha256=wAFHZlTfqtYv_S6Ajx0gswK4F-l2fxPAa59QrgZOydI,2175
-mesa/visualization/templates/js/GridDraw.js,sha256=uaZN7339kqGYlsQX3e9qD1xUxPUkrfJLsYCO0ylEFsA,12964
-mesa/visualization/templates/js/HexDraw.js,sha256=W9Los9LGbqMWMSRfrkJn-sUJqRPMguO7OX1504mnFWs,8647
-mesa/visualization/templates/js/InteractionHandler.js,sha256=XmUMssDwNrYOaoIDMF7RTsaPxVUwxetZvypf7Bn84k8,5422
+mesa/visualization/templates/js/GridDraw.js,sha256=sm2_WFfqaG5jVSQtOLVvoPnROipO1G8w-i9DTa_DfLI,12943
+mesa/visualization/templates/js/HexDraw.js,sha256=gfaqLDLdpe7-eV_qbBNwYACC4uC1Q63gHQe179WEb6o,8609
+mesa/visualization/templates/js/InteractionHandler.js,sha256=89JxZtBeROT0y78guQmrTrmXdmelvpbAz1dwqkgOf-g,5295
 mesa/visualization/templates/js/NetworkModule_d3.js,sha256=E7_qrYufXKMHPtgO-Ezqxxyo3UQGYCoWJNoWxZLAgR4,3002
 mesa/visualization/templates/js/PieChartModule.js,sha256=WZFevQ3DPmOYNm48TjF03XtxvKvAlke9VRhXrGckNN4,2826
 mesa/visualization/templates/js/TextModule.js,sha256=bCTQkGrJiQ64EwzaxlkHciyk8ekUomWUgnGKUjvxm3o,327
@@ -147,24 +147,24 @@ mesa/visualization/templates/js/external/chart-3.6.1.min.js,sha256=bj8JMRF_ShthP
 mesa/visualization/templates/js/external/d3-7.4.3.min.js,sha256=-MpQAOeqA18DtHk7JETZadE17KoMl0jCS89tlo6OWGM,277072
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_batch_run.py,sha256=WyfwEPKG-E4E6mH6ASjKSNXTRVog3UfB-vNRnZUcPx8,5052
-tests/test_batchrunner.py,sha256=WDBOAkhjvXmW8B_wQceJYVhZ54FI9ipSaOzsfj3DOe8,11435
-tests/test_batchrunnerMP.py,sha256=OhQR0u_SCU__eAw2qOF9le3QRMBNjAYSR_J4B9Vv1fM,9107
-tests/test_datacollector.py,sha256=h3Y4MEcSIWCqkPyGhfvipG1mzSJNByULALMISkvVzXo,6615
-tests/test_examples.py,sha256=WaJzl2r0O6UrkTVHokmdYOowdGPIsAbnUtdyO4g9OwY,2388
-tests/test_grid.py,sha256=L-8v-uGU_BV1lmBLZkpkA2Bvjy2Bpgq3gGCMoOo_SSU,14159
-tests/test_import_namespace.py,sha256=KeRyDxJGaTdj0-LEz8xkrNJWkedW03HMZK6DFAzqUX4,725
-tests/test_lifespan.py,sha256=M0HSz1U_S02bF8_3OeHDAsc1eqX15blMXPoJ6MON44c,2833
-tests/test_main.py,sha256=fa96N40soKTpI-RCT0qka0qwU-jTOezrIEj0Pyg_ROA,855
+tests/test_batchrunner.py,sha256=3G--CpUmBA7dr1fKCbzOhocufaUM2QeoQ_mkftMe4x0,11434
+tests/test_batchrunnerMP.py,sha256=G2rXmD2HG9gfgY6GzJEshDFqh-uFPCpP8XtjMUo3UyU,9107
+tests/test_datacollector.py,sha256=-SDMwmEzXRzL1a7I5X7WFWHk_BVJiW98Qsi2W0K5rjU,6616
+tests/test_examples.py,sha256=kiNZfkXjJnrEV4Z5m78itnxv-N3TLII_O52-KzlU_eo,2506
+tests/test_grid.py,sha256=ZOk_bJKrpZ-Ug_mYUDjaSdzwCraQ6U_iYYz8YziIeSI,16738
+tests/test_import_namespace.py,sha256=OZ94QiaCKVsl64-rjWLfh1QYMpYokfpeRcfK_OwvI8w,724
+tests/test_lifespan.py,sha256=5x4sNx19hEKVd4HHMEjIn5Jrk7rvMufKfp0iVA1MCfI,2834
+tests/test_main.py,sha256=bAKTUPj4MWd7oDr6pNEyQoJrvJfeGEeCd6Jkl2GXT8U,984
 tests/test_model.py,sha256=IyVs2IL1F_Pn54oEfSIDcU5b7kbi2AOSwFs8c4vpmg8,970
-tests/test_scaffold.py,sha256=WTRn6NkkRyDiOJOUqgVQjQm6AujrDPkjkt6ZJvf3IJs,538
-tests/test_space.py,sha256=LUH12D2rKEtCSLYqUCpIa3l9LXg3arvXopqp2x-Ithg,15947
-tests/test_time.py,sha256=B99onwbZD-0LBbeCmYwgkFLEyZS9VSkZ2ArHA-BYMb4,7444
-tests/test_tornado.py,sha256=Lb9ps4T3oEkTIM1e96hItfk8HAXkz7-eWEkFxav_FTw,1268
-tests/test_usersettableparam.py,sha256=hvRw-fb-5Fp4lGsLg_jeXsfNfZnrI87NOobgxbzsPHg,2563
-tests/test_visualization.py,sha256=SuPZUg9vIj4lec5Ly7XUKvqd6Qp_D6NdOaxshXcU85o,2778
-Mesa-1.1.0.dist-info/LICENSE,sha256=rxtnAxuPsHGYe6lyt17l216OSHFUrjcINiqzhSOyhsE,572
-Mesa-1.1.0.dist-info/METADATA,sha256=De21atDXlykwYVkf9SUDKQMcSCUG0ocTwCfa4idc7ww,6672
-Mesa-1.1.0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-Mesa-1.1.0.dist-info/entry_points.txt,sha256=IOcQtetGF8l4wHpOs_hGb19Rz-FS__BMXOJR10IBPsA,39
-Mesa-1.1.0.dist-info/top_level.txt,sha256=VYd8OkxFUc18-7nokv6pPVD0L_gwvqHDbacL8peWqXM,11
-Mesa-1.1.0.dist-info/RECORD,,
+tests/test_scaffold.py,sha256=kZa0PGlCaZCxEYdFurcWEudSG3IaQdZnrHvcukmiBm0,539
+tests/test_space.py,sha256=ZHMbzNAHtmp5j69wOiSA6KLUE137r4N1xZ02pEwW3FY,15928
+tests/test_time.py,sha256=r25vm0ATW3YfQreBP8avkENJrBI56yBwHgWe3Y7RNyo,8561
+tests/test_tornado.py,sha256=DInrFEL2n7k9x5S-ZClEFno4OlitjzyDk45lZ9Lgs5g,1270
+tests/test_usersettableparam.py,sha256=NdEFjSrNvXuvkWvWInRtZ4u0aLO3DDxURHjW2ePJeRw,2564
+tests/test_visualization.py,sha256=yMwzx2GrNpdqpGT3k6dh9DmBHrnrvTrIZh8-lViTe50,2783
+Mesa-1.2.0.dist-info/LICENSE,sha256=rgf5rJXcrpdESYDM17Gew0097eH4JdWjqQ2EnLHnFHE,572
+Mesa-1.2.0.dist-info/METADATA,sha256=c0AUmaRqoLepPzRed99vb62IwswvKUtxUF6gbDQbsdU,7156
+Mesa-1.2.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+Mesa-1.2.0.dist-info/entry_points.txt,sha256=IOcQtetGF8l4wHpOs_hGb19Rz-FS__BMXOJR10IBPsA,39
+Mesa-1.2.0.dist-info/top_level.txt,sha256=VYd8OkxFUc18-7nokv6pPVD0L_gwvqHDbacL8peWqXM,11
+Mesa-1.2.0.dist-info/RECORD,,

{Mesa-1.1.0.dist-info → Mesa-1.2.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.37.1)
+Generator: bdist_wheel (0.38.4)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

mesa/__init__.py

@@ -2,18 +2,16 @@
 Mesa Agent-Based Modeling Framework
 
 Core Objects: Model, and Agent.
-
 """
 import datetime
 
-from mesa.model import Model
-from mesa.agent import Agent
-
-import mesa.time as time
-import mesa.space as space
 import mesa.flat.visualization as visualization
+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
-from mesa.batchrunner import batch_run  # noqa
+from mesa.model import Model
 
 __all__ = [
     "Model",
@@ -26,6 +24,7 @@ __all__ = [
 ]
 
 __title__ = "mesa"
-__version__ = "1.1.0"
+__version__ = "1.2.0"
 __license__ = "Apache 2.0"
-__copyright__ = f"Copyright {datetime.date.today().year} Project Mesa Team"
+_this_year = datetime.datetime.now(tz=datetime.timezone.utc).date().year
+__copyright__ = f"Copyright {_this_year} Project Mesa Team"

mesa/agent.py

@@ -2,15 +2,15 @@
 The agent class for Mesa framework.
 
 Core Objects: Agent
-
 """
 # Mypy; for the `|` operator purpose
 # Remove this __future__ import once the oldest supported Python is 3.10
 from __future__ import annotations
 
+from random import Random
+
 # mypy
 from typing import TYPE_CHECKING
-from random import Random
 
 if TYPE_CHECKING:
     # We ensure that these are not imported during runtime to prevent cyclic
@@ -35,7 +35,6 @@ class Agent:
 
     def step(self) -> None:
         """A single step of the agent."""
-        pass
 
     def advance(self) -> None:
         pass

mesa/batchrunner.py

@@ -3,16 +3,13 @@ Batchrunner
 ===========
 
 A single class to manage a batch run or parameter sweep of a given model.
-
 """
 import copy
 import itertools
 import random
-from collections import OrderedDict
 from functools import partial
 from itertools import count, product
 from multiprocessing import Pool, cpu_count
-from warnings import warn
 from typing import (
     Any,
     Dict,
@@ -24,6 +21,7 @@ from typing import (
     Type,
     Union,
 )
+from warnings import warn
 
 import pandas as pd
 from tqdm import tqdm
@@ -285,14 +283,13 @@ class FixedBatchRunner:
                 collected at the level of each agent present in the model at
                 the end of the run.
             display_progress: Display progress bar with time estimation?
-
         """
         self.model_cls = model_cls
         if parameters_list is None:
             parameters_list = []
         self.parameters_list = list(parameters_list)
         self.fixed_parameters = fixed_parameters or {}
-        self._include_fixed = len(self.fixed_parameters.keys()) > 0
+        self._include_fixed = len(self.fixed_parameters) > 0
         self.iterations = iterations
         self.max_steps = max_steps
 
@@ -310,9 +307,8 @@ class FixedBatchRunner:
         if self.agent_reporters:
             self.agent_vars = {}
 
-        # Make Compatible with Python 3.5
-        self.datacollector_model_reporters = OrderedDict()
-        self.datacollector_agent_reporters = OrderedDict()
+        self.datacollector_model_reporters = {}
+        self.datacollector_agent_reporters = {}
 
         self.display_progress = display_progress
 
@@ -361,7 +357,7 @@ class FixedBatchRunner:
         model = self.model_cls(**kwargs)
         results = self.run_model(model)
         if param_values is not None:
-            model_key = tuple(param_values) + (run_count,)
+            model_key = (*tuple(param_values), run_count)
         else:
             model_key = (run_count,)
 
@@ -370,7 +366,7 @@ class FixedBatchRunner:
         if self.agent_reporters:
             agent_vars = self.collect_agent_vars(model)
             for agent_id, reports in agent_vars.items():
-                agent_key = model_key + (agent_id,)
+                agent_key = (*model_key, agent_id)
                 self.agent_vars[agent_key] = reports
         # Collects data from datacollector object in model
         if results is not None:
@@ -395,7 +391,6 @@ class FixedBatchRunner:
 
         If your model runs in a non-standard way, this is the method to modify
         in your subclass.
-
         """
         while model.running and model.schedule.steps < self.max_steps:
             model.step()
@@ -407,19 +402,19 @@ class FixedBatchRunner:
 
     def collect_model_vars(self, model):
         """Run reporters and collect model-level variables."""
-        model_vars = OrderedDict()
-        for var, reporter in self.model_reporters.items():
-            model_vars[var] = reporter(model)
-
+        model_vars = {
+            var: reporter(model) for var, reporter in self.model_reporters.items()
+        }
         return model_vars
 
     def collect_agent_vars(self, model):
         """Run reporters and collect agent-level variables."""
-        agent_vars = OrderedDict()
+        agent_vars = {}
         for agent in model.schedule._agents.values():
-            agent_record = OrderedDict()
-            for var, reporter in self.agent_reporters.items():
-                agent_record[var] = getattr(agent, reporter)
+            agent_record = {
+                var: getattr(agent, reporter)
+                for var, reporter in self.agent_reporters.items()
+            }
             agent_vars[agent.unique_id] = agent_record
         return agent_vars
 
@@ -471,12 +466,10 @@ class FixedBatchRunner:
 
         df = pd.DataFrame(records)
         rest_cols = set(df.columns) - set(index_cols)
-        ordered = df[index_cols + list(sorted(rest_cols))]
+        ordered = df[index_cols + sorted(rest_cols)]
         ordered.sort_values(by="Run", inplace=True)
         if self._include_fixed:
-            for param in self.fixed_parameters.keys():
-                val = self.fixed_parameters[param]
-
+            for param, val in self.fixed_parameters.items():
                 # avoid error when val is an iterable
                 vallist = [val for i in range(ordered.shape[0])]
                 ordered[param] = vallist
@@ -539,7 +532,6 @@ class BatchRunner(FixedBatchRunner):
     Note that by default, the reporters only collect data at the *end* of the
     run. To get step by step data, simply have a reporter store the model's
     entire DataCollector object.
-
     """
 
     def __init__(
@@ -582,7 +574,6 @@ class BatchRunner(FixedBatchRunner):
                 collected at the level of each agent present in the model at
                 the end of the run.
             display_progress: Display progress bar with time estimation?
-
         """
         warn(
             "BatchRunner class has been replaced by batch_run function. Please see documentation.",
@@ -722,7 +713,7 @@ class BatchRunnerMP(BatchRunner):  # pragma: no cover
             if self.agent_reporters:
                 agent_vars = self.collect_agent_vars(model)
                 for agent_id, reports in agent_vars.items():
-                    agent_key = model_key + (agent_id,)
+                    agent_key = (*model_key, agent_id)
                     self.agent_vars[agent_key] = reports
             if hasattr(model, "datacollector"):
                 if model.datacollector.model_reporters is not None:
@@ -735,9 +726,9 @@ class BatchRunnerMP(BatchRunner):  # pragma: no cover
                     ] = model.datacollector.get_agent_vars_dataframe()
 
         # Make results consistent
-        if len(self.datacollector_model_reporters.keys()) == 0:
+        if len(self.datacollector_model_reporters) == 0:
             self.datacollector_model_reporters = None
-        if len(self.datacollector_agent_reporters.keys()) == 0:
+        if len(self.datacollector_agent_reporters) == 0:
             self.datacollector_agent_reporters = None
 
     def run_all(self):

mesa/datacollection.py

@@ -33,13 +33,13 @@ The default DataCollector here makes several assumptions:
     * The model has a schedule object called 'schedule'
     * The schedule has an agent list called agents
     * For collecting agent-level variables, agents must have a unique_id
-
 """
-from functools import partial
 import itertools
+import types
+from functools import partial
 from operator import attrgetter
+
 import pandas as pd
-import types
 
 
 class DataCollector:
@@ -50,11 +50,8 @@ class DataCollector:
     functions which actually collect them. When the collect(...) method is
     called, it collects these attributes and executes these functions one by
     one and stores the results.
-
     """
 
-    model = None
-
     def __init__(self, model_reporters=None, agent_reporters=None, tables=None):
         """Instantiate a DataCollector with lists of model and agent reporters.
         Both model_reporters and agent_reporters accept a dictionary mapping a
@@ -87,13 +84,13 @@ class DataCollector:
             Model reporters can take four types of arguments:
             lambda like above:
             {"agent_count": lambda m: m.schedule.get_agent_count() }
-            method with @property decorators
-            {"agent_count": schedule.get_agent_count()
-            class attributes of model
+            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
+            class attributes of a model
             {"model_attribute": "model_attribute"}
             functions with parameters that have placed in a list
             {"Model_Function":[function, [param_1, param_2]]}
-
         """
         self.model_reporters = {}
         self.agent_reporters = {}
@@ -122,8 +119,6 @@ class DataCollector:
             reporter: Attribute string, or function object that returns the
                       variable when given a model instance.
         """
-        if type(reporter) is str:
-            reporter = partial(self._getattr, reporter)
         self.model_reporters[name] = reporter
         self.model_vars[name] = []
 
@@ -134,7 +129,6 @@ class DataCollector:
             name: Name of the agent-level variable to collect.
             reporter: Attribute string, or function object that returns the
                       variable when given a model instance.
-
         """
         if type(reporter) is str:
             attribute_name = reporter
@@ -148,7 +142,6 @@ class DataCollector:
         Args:
             table_name: Name of the new table.
             table_columns: List of columns to add to the table.
-
         """
         new_table = {column: [] for column in table_columns}
         self.tables[table_name] = new_table
@@ -156,7 +149,7 @@ class DataCollector:
     def _record_agents(self, model):
         """Record agents data in a mapping of functions and agents."""
         rep_funcs = self.agent_reporters.values()
-        if all([hasattr(rep, "attribute_name") for rep in rep_funcs]):
+        if all(hasattr(rep, "attribute_name") for rep in rep_funcs):
             prefix = ["model.schedule.steps", "unique_id"]
             attributes = [func.attribute_name for func in rep_funcs]
             get_reports = attrgetter(*prefix + attributes)
@@ -170,25 +163,23 @@ class DataCollector:
         agent_records = map(get_reports, model.schedule.agents)
         return agent_records
 
-    def _reporter_decorator(self, reporter):
-        return reporter()
-
     def collect(self, model):
         """Collect all the data for the given model object."""
         if self.model_reporters:
-
             for var, reporter in self.model_reporters.items():
                 # Check if Lambda operator
                 if isinstance(reporter, types.LambdaType):
                     self.model_vars[var].append(reporter(model))
                 # Check if model attribute
-                elif isinstance(reporter, partial):
-                    self.model_vars[var].append(reporter(model))
+                elif isinstance(reporter, str):
+                    self.model_vars[var].append(getattr(model, reporter, None))
                 # Check if function with arguments
                 elif isinstance(reporter, list):
                     self.model_vars[var].append(reporter[0](*reporter[1]))
+                # TODO: Check if method of a class, as of now it is assumed
+                # implicitly if the other checks fail.
                 else:
-                    self.model_vars[var].append(self._reporter_decorator(reporter))
+                    self.model_vars[var].append(reporter())
 
         if self.agent_reporters:
             agent_records = self._record_agents(model)
@@ -202,7 +193,6 @@ class DataCollector:
             row: A dictionary of the form {column_name: value...}
             ignore_missing: If True, fill any missing columns with Nones;
                             if False, throw an error if any columns are missing
-
         """
         if table_name not in self.tables:
             raise Exception("Table does not exist.")
@@ -225,7 +215,6 @@ class DataCollector:
 
         The DataFrame has one column for each model variable, and the index is
         (implicitly) the model tick.
-
         """
         return pd.DataFrame(self.model_vars)
 
@@ -234,16 +223,15 @@ class DataCollector:
 
         The DataFrame has one column for each variable, with two additional
         columns for tick and agent_id.
-
         """
         all_records = itertools.chain.from_iterable(self._agent_records.values())
         rep_names = list(self.agent_reporters)
 
         df = pd.DataFrame.from_records(
             data=all_records,
-            columns=["Step", "AgentID"] + rep_names,
+            columns=["Step", "AgentID", *rep_names],
+            index=["Step", "AgentID"],
         )
-        df = df.set_index(["Step", "AgentID"])
         return df
 
     def get_table_dataframe(self, table_name):
@@ -251,7 +239,6 @@ class DataCollector:
 
         Args:
             table_name: The name of the table to convert.
-
         """
         if table_name not in self.tables:
             raise Exception("No such table.")

mesa/main.py

@@ -1,8 +1,9 @@
-import sys
 import os
-import click
+import sys
 from subprocess import call
 
+import click
+
 PROJECT_PATH = click.Path(
     exists=True, file_okay=False, dir_okay=True, resolve_path=True
 )
@@ -14,7 +15,6 @@ COOKIECUTTER_PATH = os.path.join(os.path.dirname(SCRIPTS_DIR), COOKIECUTTER_DIR)
 @click.group()
 def cli():
     "Manage Mesa projects"
-    pass
 
 
 @cli.command()
@@ -30,7 +30,7 @@ def runserver(project):
 
     with open("run.py") as f:
         code = compile(f.read(), "run.py", "exec")
-        exec(code, {}, {})
+        exec(code, {}, {})  # noqa: S102
 
 
 @click.command()

mesa/model.py

@@ -2,7 +2,6 @@
 The model class for Mesa framework.
 
 Core Objects: Model
-
 """
 # Mypy; for the `|` operator purpose
 # Remove this __future__ import once the oldest supported Python is 3.10
@@ -10,11 +9,11 @@ from __future__ import annotations
 
 import random
 
-from mesa.datacollection import DataCollector
-
 # mypy
 from typing import Any
 
+from mesa.datacollection import DataCollector
+
 
 class Model:
     """Base class for models."""
@@ -33,7 +32,6 @@ class Model:
         Attributes:
             schedule: schedule object
             running: a bool indicating if the model should continue running
-
         """
 
         self.running = True
@@ -43,14 +41,12 @@ class Model:
     def run_model(self) -> None:
         """Run the model until the end condition is reached. Overload as
         needed.
-
         """
         while self.running:
             self.step()
 
     def step(self) -> None:
         """A single step. Fill in here."""
-        pass
 
     def next_id(self) -> int:
         """Return the next unique ID for agents, increment current_id"""