Mesa 3.2.0__py3-none-any.whl → 3.3.0__py3-none-any.whl

mesa/visualization/space_renderer.py

@@ -0,0 +1,399 @@
+"""Space rendering module for Mesa visualizations.
+
+This module provides functionality to render Mesa model spaces with different
+backends, supporting various space types and visualization components.
+"""
+
+import contextlib
+import warnings
+from collections.abc import Callable
+from typing import Literal
+
+import altair as alt
+import numpy as np
+import pandas as pd
+
+import mesa
+from mesa.discrete_space import (
+    OrthogonalMooreGrid,
+    OrthogonalVonNeumannGrid,
+    VoronoiGrid,
+)
+from mesa.space import (
+    ContinuousSpace,
+    HexMultiGrid,
+    HexSingleGrid,
+    MultiGrid,
+    NetworkGrid,
+    SingleGrid,
+    _HexGrid,
+)
+from mesa.visualization.backends import AltairBackend, MatplotlibBackend
+from mesa.visualization.space_drawers import (
+    ContinuousSpaceDrawer,
+    HexSpaceDrawer,
+    NetworkSpaceDrawer,
+    OrthogonalSpaceDrawer,
+    VoronoiSpaceDrawer,
+)
+
+OrthogonalGrid = SingleGrid | MultiGrid | OrthogonalMooreGrid | OrthogonalVonNeumannGrid
+HexGrid = HexSingleGrid | HexMultiGrid | mesa.discrete_space.HexGrid
+Network = NetworkGrid | mesa.discrete_space.Network
+
+
+class SpaceRenderer:
+    """Renders Mesa spaces using different visualization backends.
+
+    Supports multiple space types and backends for flexible visualization
+    of agent-based models.
+    """
+
+    def __init__(
+        self,
+        model: mesa.Model,
+        backend: Literal["matplotlib", "altair"] | None = "matplotlib",
+    ):
+        """Initialize the space renderer.
+
+        Args:
+            model (mesa.Model): The Mesa model to render.
+            backend (Literal["matplotlib", "altair"] | None): The visualization backend to use.
+        """
+        self.space = getattr(model, "grid", getattr(model, "space", None))
+
+        self.space_drawer = self._get_space_drawer()
+        self.space_mesh = None
+        self.agent_mesh = None
+        self.propertylayer_mesh = None
+
+        self.post_process_func = None
+        # Keep track of whether post-processing has been applied
+        # to avoid multiple applications on the same axis.
+        self._post_process_applied = False
+
+        self.backend = backend
+
+        if backend == "matplotlib":
+            self.backend_renderer = MatplotlibBackend(
+                self.space_drawer,
+            )
+        elif backend == "altair":
+            self.backend_renderer = AltairBackend(
+                self.space_drawer,
+            )
+        else:
+            raise ValueError(f"Unsupported backend: {backend}")
+
+        self.backend_renderer.initialize_canvas()
+
+    def _get_space_drawer(self):
+        """Get appropriate space drawer based on space type.
+
+        Returns:
+            Space drawer instance for the model's space type.
+
+        Raises:
+            ValueError: If the space type is not supported.
+        """
+        if isinstance(self.space, HexGrid | _HexGrid):
+            return HexSpaceDrawer(self.space)
+        elif isinstance(self.space, OrthogonalGrid):
+            return OrthogonalSpaceDrawer(self.space)
+        elif isinstance(
+            self.space,
+            ContinuousSpace | mesa.experimental.continuous_space.ContinuousSpace,
+        ):
+            return ContinuousSpaceDrawer(self.space)
+        elif isinstance(self.space, VoronoiGrid):
+            return VoronoiSpaceDrawer(self.space)
+        elif isinstance(self.space, Network):
+            return NetworkSpaceDrawer(self.space)
+        raise ValueError(
+            f"Unsupported space type: {type(self.space).__name__}. "
+            "Supported types are OrthogonalGrid, HexGrid, ContinuousSpace, VoronoiGrid, and Network."
+        )
+
+    def _map_coordinates(self, arguments):
+        """Map agent coordinates to appropriate space coordinates.
+
+        Args:
+            arguments (dict): Dictionary containing agent data with coordinates.
+
+        Returns:
+            dict: Dictionary with mapped coordinates appropriate for the space type.
+        """
+        mapped_arguments = arguments.copy()
+
+        if isinstance(self.space, OrthogonalGrid | VoronoiGrid | ContinuousSpace):
+            # Use the coordinates directly for Orthogonal grids, Voronoi grids and Continuous spaces
+            mapped_arguments["loc"] = arguments["loc"].astype(float)
+
+        elif isinstance(self.space, HexGrid):
+            # Map rectangular coordinates to hexagonal grid coordinates
+            loc = arguments["loc"].astype(float)
+            if loc.size > 0:
+                # Calculate hexagon centers
+                loc[:, 0] = loc[:, 0] * self.space_drawer.x_spacing + (
+                    (loc[:, 1] - 1) % 2
+                ) * (self.space_drawer.x_spacing / 2)
+                loc[:, 1] = loc[:, 1] * self.space_drawer.y_spacing
+            mapped_arguments["loc"] = loc
+
+        elif isinstance(self.space, Network):
+            # Map coordinates for Network spaces
+            loc = arguments["loc"].astype(float)
+            pos = np.asarray(list(self.space_drawer.pos.values()))
+            # For network only both x and y contains the correct coordinates
+            # use one of them
+            x = loc[:, 0]
+            if x is None:
+                x = loc[:, 1]
+
+            # Ensure x is an integer index for the position mapping
+            x = x.astype(int)
+
+            # FIXME: Find better way to handle this case
+            # x updates before pos can, therefore gives us index error that
+            # needs to be ignored.
+            with contextlib.suppress(IndexError):
+                mapped_arguments["loc"] = pos[x]
+
+        return mapped_arguments
+
+    def draw_structure(self, **kwargs):
+        """Draw the space structure.
+
+        Args:
+            **kwargs: Additional keyword arguments for the drawing function.
+            Checkout respective `SpaceDrawer` class on details how to pass **kwargs.
+
+        Returns:
+            The visual representation of the space structure.
+        """
+        # Store space_kwargs for internal use
+        self.space_kwargs = kwargs
+
+        self.space_mesh = self.backend_renderer.draw_structure(**self.space_kwargs)
+        return self.space_mesh
+
+    def draw_agents(self, agent_portrayal: Callable, **kwargs):
+        """Draw agents on the space.
+
+        Args:
+            agent_portrayal (Callable): Function that takes an agent and returns AgentPortrayalStyle.
+            **kwargs: Additional keyword arguments for the drawing function.
+            Checkout respective `SpaceDrawer` class on details how to pass **kwargs.
+
+        Returns:
+            The visual representation of the agents.
+        """
+        # Store data for internal use
+        self.agent_portrayal = agent_portrayal
+        self.agent_kwargs = kwargs
+
+        # Prepare data for agent plotting
+        arguments = self.backend_renderer.collect_agent_data(
+            self.space, agent_portrayal, default_size=self.space_drawer.s_default
+        )
+        arguments = self._map_coordinates(arguments)
+
+        self.agent_mesh = self.backend_renderer.draw_agents(
+            arguments, **self.agent_kwargs
+        )
+        return self.agent_mesh
+
+    def draw_propertylayer(self, propertylayer_portrayal: Callable | dict):
+        """Draw property layers on the space.
+
+        Args:
+            propertylayer_portrayal (Callable | dict): Function that returns PropertyLayerStyle
+                or dict with portrayal parameters.
+
+        Returns:
+            The visual representation of the property layers.
+
+        Raises:
+            Exception: If no property layers are found on the space.
+        """
+        # Import here to avoid circular imports
+        from mesa.visualization.components import PropertyLayerStyle  # noqa: PLC0415
+
+        def _dict_to_callable(portrayal_dict):
+            """Convert legacy dict portrayal to callable.
+
+            Args:
+                portrayal_dict (dict): Dictionary with portrayal parameters.
+
+            Returns:
+                Callable: Function that returns PropertyLayerStyle.
+            """
+
+            def style_callable(layer_object):
+                layer_name = layer_object.name
+                params = portrayal_dict.get(layer_name)
+
+                warnings.warn(
+                    "Dict propertylayer_portrayal is deprecated. "
+                    "Use a callable returning PropertyLayerStyle instead.",
+                    PendingDeprecationWarning,
+                    stacklevel=2,
+                )
+
+                if params is None:
+                    return None
+
+                return PropertyLayerStyle(
+                    color=params.get("color"),
+                    colormap=params.get("colormap"),
+                    alpha=params.get("alpha", PropertyLayerStyle.alpha),
+                    vmin=params.get("vmin"),
+                    vmax=params.get("vmax"),
+                    colorbar=params.get("colorbar", PropertyLayerStyle.colorbar),
+                )
+
+            return style_callable
+
+        # Get property layers
+        try:
+            # old style spaces
+            property_layers = self.space.properties
+        except AttributeError:
+            # new style spaces
+            property_layers = self.space._mesa_property_layers
+
+        # Convert portrayal to callable if needed
+        if isinstance(propertylayer_portrayal, dict):
+            self.propertylayer_portrayal = _dict_to_callable(propertylayer_portrayal)
+        else:
+            self.propertylayer_portrayal = propertylayer_portrayal
+
+        number_of_propertylayers = sum(
+            [1 for layer in property_layers if layer != "empty"]
+        )
+        if number_of_propertylayers < 1:
+            raise Exception("No property layers were found on the space.")
+
+        self.propertylayer_mesh = self.backend_renderer.draw_propertylayer(
+            self.space, property_layers, self.propertylayer_portrayal
+        )
+        return self.propertylayer_mesh
+
+    def render(
+        self,
+        agent_portrayal: Callable | None = None,
+        propertylayer_portrayal: Callable | dict | None = None,
+        post_process: Callable | None = None,
+        **kwargs,
+    ):
+        """Render the complete space with structure, agents, and property layers.
+
+        It is an all-in-one method that draws everything required therefore eliminates
+        the need of calling each method separately, but has a drawback, if want to pass
+        kwargs to customize the drawing, they have to be broken into
+        space_kwargs and agent_kwargs.
+
+        Args:
+            agent_portrayal (Callable | None): Function that returns AgentPortrayalStyle.
+                If None, agents won't be drawn.
+            propertylayer_portrayal (Callable | dict | None): Function that returns
+                PropertyLayerStyle or dict with portrayal parameters. If None,
+                property layers won't be drawn.
+            post_process (Callable | None): Function to apply post-processing to the canvas.
+            **kwargs: Additional keyword arguments for drawing functions.
+                * ``space_kwargs`` (dict): Arguments for ``draw_structure()``.
+                * ``agent_kwargs`` (dict): Arguments for ``draw_agents()``.
+        """
+        space_kwargs = kwargs.pop("space_kwargs", {})
+        agent_kwargs = kwargs.pop("agent_kwargs", {})
+        if self.space_mesh is None:
+            self.draw_structure(**space_kwargs)
+        if self.agent_mesh is None and agent_portrayal is not None:
+            self.draw_agents(agent_portrayal, **agent_kwargs)
+        if self.propertylayer_mesh is None and propertylayer_portrayal is not None:
+            self.draw_propertylayer(propertylayer_portrayal)
+
+        self.post_process_func = post_process
+        return self
+
+    @property
+    def canvas(self):
+        """Get the current canvas object.
+
+        Returns:
+            The backend-specific canvas object.
+        """
+        if self.backend == "matplotlib":
+            ax = self.backend_renderer.ax
+            if ax is None:
+                self.backend_renderer.initialize_canvas()
+            return ax
+
+        elif self.backend == "altair":
+            structure = self.space_mesh if self.space_mesh else None
+            agents = self.agent_mesh if self.agent_mesh else None
+            prop_base, prop_cbar = self.propertylayer_mesh or (None, None)
+
+            if self.space_mesh:
+                structure = self.draw_structure(**self.space_kwargs)
+            if self.agent_mesh:
+                agents = self.draw_agents(self.agent_portrayal, **self.agent_kwargs)
+            if self.propertylayer_mesh:
+                prop_base, prop_cbar = self.draw_propertylayer(
+                    self.propertylayer_portrayal
+                )
+
+            spatial_charts_list = [
+                chart for chart in [structure, prop_base, agents] if chart
+            ]
+
+            main_spatial = None
+            if spatial_charts_list:
+                main_spatial = (
+                    spatial_charts_list[0]
+                    if len(spatial_charts_list) == 1
+                    else alt.layer(*spatial_charts_list)
+                )
+
+            # Determine final chart by combining with color bar if present
+            final_chart = None
+            if main_spatial and prop_cbar:
+                final_chart = alt.vconcat(main_spatial, prop_cbar).configure_view(
+                    stroke=None
+                )
+            elif main_spatial:  # Only main_spatial, no prop_cbar
+                final_chart = main_spatial
+            elif prop_cbar:  # Only prop_cbar, no main_spatial
+                final_chart = prop_cbar
+                final_chart = final_chart.configure_view(grid=False)
+
+            if final_chart is None:
+                # If no charts are available, return an empty chart
+                final_chart = (
+                    alt.Chart(pd.DataFrame())
+                    .mark_point()
+                    .properties(width=450, height=350)
+                )
+
+            final_chart = final_chart.configure_view(stroke="black", strokeWidth=1.5)
+
+            return final_chart
+
+    @property
+    def post_process(self):
+        """Get the current post-processing function.
+
+        Returns:
+            Callable | None: The post-processing function, or None if not set.
+        """
+        return self.post_process_func
+
+    @post_process.setter
+    def post_process(self, func: Callable | None):
+        """Set the post-processing function.
+
+        Args:
+            func (Callable | None): Function to apply post-processing to the canvas.
+                Should accept the canvas object as its first argument.
+        """
+        self.post_process_func = func

{mesa-3.2.0.dist-info → mesa-3.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Mesa
-Version: 3.2.0
+Version: 3.3.0
 Summary: Agent-based modeling (ABM) in Python
 Project-URL: homepage, https://github.com/projectmesa/mesa
 Project-URL: repository, https://github.com/projectmesa/mesa
@@ -24,19 +24,24 @@ Classifier: Topic :: Scientific/Engineering :: Artificial Life
 Requires-Python: >=3.11
 Requires-Dist: numpy
 Requires-Dist: pandas
+Requires-Dist: pythran>=0.17.0; sys_platform == 'darwin'
 Requires-Dist: scipy
 Requires-Dist: tqdm
 Provides-Extra: all
 Requires-Dist: altair; extra == 'all'
 Requires-Dist: ipython; extra == 'all'
+Requires-Dist: ipython>=9.2.0; extra == 'all'
 Requires-Dist: matplotlib; extra == 'all'
 Requires-Dist: myst-nb; extra == 'all'
 Requires-Dist: myst-parser; extra == 'all'
 Requires-Dist: networkx; extra == 'all'
+Requires-Dist: playwright; extra == 'all'
 Requires-Dist: pydata-sphinx-theme; extra == 'all'
 Requires-Dist: pytest; extra == 'all'
 Requires-Dist: pytest-cov; extra == 'all'
+Requires-Dist: pytest-ipywidgets; extra == 'all'
 Requires-Dist: pytest-mock; extra == 'all'
+Requires-Dist: pytest-playwright; extra == 'all'
 Requires-Dist: ruff; extra == 'all'
 Requires-Dist: scipy; extra == 'all'
 Requires-Dist: seaborn; extra == 'all'
@@ -45,11 +50,15 @@ Requires-Dist: sphinx; extra == 'all'
 Requires-Dist: sphinx-copybutton; extra == 'all'
 Provides-Extra: dev
 Requires-Dist: altair; extra == 'dev'
+Requires-Dist: ipython>=9.2.0; extra == 'dev'
 Requires-Dist: matplotlib; extra == 'dev'
 Requires-Dist: networkx; extra == 'dev'
+Requires-Dist: playwright; extra == 'dev'
 Requires-Dist: pytest; extra == 'dev'
 Requires-Dist: pytest-cov; extra == 'dev'
+Requires-Dist: pytest-ipywidgets; extra == 'dev'
 Requires-Dist: pytest-mock; extra == 'dev'
+Requires-Dist: pytest-playwright; extra == 'dev'
 Requires-Dist: ruff; extra == 'dev'
 Requires-Dist: solara; extra == 'dev'
 Requires-Dist: sphinx; extra == 'dev'
@@ -125,13 +134,13 @@ pip install -U mesa
 Starting with Mesa 3.0, we don't install all our dependencies anymore by default.
 ```bash
 # You can customize the additional dependencies you need, if you want. Available are:
-pip install -U mesa[network,viz]
+pip install -U "mesa[network,viz]"
 
 # This is equivalent to our recommended dependencies:
-pip install -U mesa[rec]
+pip install -U "mesa[rec]"
 
 # To install all, including developer, dependencies:
-pip install -U mesa[all]
+pip install -U "mesa[all]"
 ```
 
 You can also use `pip` to install the latest GitHub version:

{mesa-3.2.0.dist-info → mesa-3.3.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
-mesa/__init__.py,sha256=9HiqFLLUwxZzkQCGvh20H3HSVBaJGB8CVC3-SHYMaEA,678
-mesa/agent.py,sha256=7WOqjzlLh_Lkmp_-sFnUGbRD69AZpAharCINfIo66Ow,26684
+mesa/__init__.py,sha256=h25vcSmnMDIvmR2LQL6urke1lrEXpiH-33STC8sXKKY,678
+mesa/agent.py,sha256=OC1OiZoIe4jOyQmx__ijXSr82RmekAkJWihcrv4tEf0,26648
 mesa/batchrunner.py,sha256=ZeBOQw6-SLnECMUyKSRThh7vecP0DV6F6fGGk8UAboA,8041
-mesa/datacollection.py,sha256=vxW0KEmx6BHMM6SnKrRJJr7Eb_siGLyofwuyN8pSWXg,18483
+mesa/datacollection.py,sha256=yZhFeQbwIuncIJ5O3mQB69TS2boqncAM-e0nlUxO2X4,18500
 mesa/mesa_logging.py,sha256=PEDqUaQ2Y4bkYBkrHVkGT0sF86gUdbSH1T3vCg3qQeE,4949
 mesa/model.py,sha256=8QZoE8Dy-S7MGznhoeHHT1S8VeUh-UbzcBroJqlXkRY,8365
-mesa/space.py,sha256=g57TiwmMCRZLwDqgaHzQfSjF1wNE6oNi4rUjzeQ9E6g,63792
+mesa/space.py,sha256=A3MDPhjh-0CUQavFGkspfRGA2QQ_rgTuAPvDvHGSVKs,63939
 mesa/discrete_space/__init__.py,sha256=wXVr3eUpJAK-Y9DRlsQxhnQAxWLsrA7X6X9QhukDyTI,1672
 mesa/discrete_space/cell.py,sha256=lok80RMnby09pxbJA631v14XmrfObwxfpw8EOkcwzao,7222
 mesa/discrete_space/cell_agent.py,sha256=jSGP0xLVgdAx434piwQ9cQqUnPQSlFtJkiDibPWKXe0,4253
@@ -26,59 +26,62 @@ mesa/examples/advanced/epstein_civil_violence/Epstein Civil Violence.ipynb,sha25
 mesa/examples/advanced/epstein_civil_violence/Readme.md,sha256=RXuGIZAibz3KVkP51PGjwzcRx2R9Ettmh3qbDTPqDcg,1735
 mesa/examples/advanced/epstein_civil_violence/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mesa/examples/advanced/epstein_civil_violence/agents.py,sha256=SMYKkKhNlMCXk-gmeakesxstqB-jpY44FtS8CiMl0l8,5854
-mesa/examples/advanced/epstein_civil_violence/app.py,sha256=fFlPijAUDLs_WfROGIlUXRakkkfbWnytcXFTAzdRplU,1890
+mesa/examples/advanced/epstein_civil_violence/app.py,sha256=8uRRzNg7UY0ST1f_K69B9YpLonqmiUG1r6UsK-KHPSM,1991
 mesa/examples/advanced/epstein_civil_violence/model.py,sha256=_ds6Wrq2Zf66VSxamTN5gK8A3itHU5DEVcydA--hlkY,3909
 mesa/examples/advanced/pd_grid/Readme.md,sha256=weEQe1qZBKUYBj3J3WyGbRHa5Ia1zje18SFctZm3esE,2242
 mesa/examples/advanced/pd_grid/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mesa/examples/advanced/pd_grid/agents.py,sha256=giX63EUq3TzJt916dglTSMsdzkIdtyOmwSoj2ynUQ2c,1743
 mesa/examples/advanced/pd_grid/analysis.ipynb,sha256=TTSY7mZlIYPjPjpW7cxr7Gzpo-NKKEBpXX4_f0V6NfI,5432
-mesa/examples/advanced/pd_grid/app.py,sha256=-_fTP7f_oITKHt7dDVJou7Oa7u7v_C4Ml5yw7D1sbx8,1457
+mesa/examples/advanced/pd_grid/app.py,sha256=LQkXW0zsiTuvSQRK0RCABkxfhB04KFV_dYB3gjbbCy4,1556
 mesa/examples/advanced/pd_grid/model.py,sha256=2YrTVNVThIf0FH1vKbYef0IYeJiR8Ws6eepsH6UjMLQ,2282
 mesa/examples/advanced/sugarscape_g1mt/Readme.md,sha256=_q52DMprCQGELsPCJ_jAJ6cFHBc8sE7L8WIa4a3LQPs,3535
 mesa/examples/advanced/sugarscape_g1mt/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mesa/examples/advanced/sugarscape_g1mt/agents.py,sha256=foix7_00fFop6GLl5uEu1_bmeQ5oH04Fcc9-E06WWkk,8457
-mesa/examples/advanced/sugarscape_g1mt/app.py,sha256=fg8ZXBoc4tPI9AfOLF0fgMk3Ey4H8xZu6tUaTwDp3Nk,1952
+mesa/examples/advanced/sugarscape_g1mt/app.py,sha256=CFfM75mcroo16Tt1-tROUOwANNYj9lloLMFLI_B0Pts,2518
 mesa/examples/advanced/sugarscape_g1mt/model.py,sha256=VwHaLuqrX8g6XP3wHw16Opu5vaW-kyL31pe7Mja-HvQ,5745
 mesa/examples/advanced/sugarscape_g1mt/sugar-map.txt,sha256=zZtGYciBPT4miZVnbVuoQ5TugTmGrbDWV9yb5KH6tnU,5000
-mesa/examples/advanced/sugarscape_g1mt/tests.py,sha256=UNahmZTgLquSqmoi_9GcE3JP0qBHjkrHFZ15NMm0ce8,2517
 mesa/examples/advanced/wolf_sheep/Readme.md,sha256=oLJSJ1o7WnExDWts8CRKyxVOMeCcp8rGZzvjufpnKZc,2736
 mesa/examples/advanced/wolf_sheep/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mesa/examples/advanced/wolf_sheep/agents.py,sha256=kqW8ITdFHtkMqF5auHoP0dHUbXk-rSMt4XI340NZ5Qg,5081
-mesa/examples/advanced/wolf_sheep/app.py,sha256=MEoQzjSvXJC0ua_4okUZOucL0UnBfWRZ42ij4iQVMp4,2544
+mesa/examples/advanced/wolf_sheep/app.py,sha256=VCWb9OwZjqHsTOJ6BZxnaxgmbe01yhV6j6BruHtOO98,2584
 mesa/examples/advanced/wolf_sheep/model.py,sha256=mHmn5r9EdRtoOGSbubcKtlSBClKmjDIri8uhcokIeBE,4558
 mesa/examples/basic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mesa/examples/basic/boid_flockers/Readme.md,sha256=z4p0KZmVpH0JK2M-xnAZM7LSoRdjjR7qGe1OPOq2BzQ,873
 mesa/examples/basic/boid_flockers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mesa/examples/basic/boid_flockers/agents.py,sha256=oA0A0NilTHi0XYouYaNcMSmpKDdNYPwfS96FNqRuTUI,3309
-mesa/examples/basic/boid_flockers/app.py,sha256=9Cf6f2Ctjz0yWYQHCKE2owBOmnIuXqkVkLIJz6hqGCc,1861
+mesa/examples/basic/boid_flockers/app.py,sha256=QKmIN0BIr_AzV0EwW-4sBUgJSQvGuXndY7FCJV4wDBU,1964
 mesa/examples/basic/boid_flockers/model.py,sha256=RQh9GfsSPvshUQedlmEEjk1dJHuyL8o4VWiAamgH1EU,3551
 mesa/examples/basic/boltzmann_wealth_model/Readme.md,sha256=tif1-GDqTGkSAYAYgMf3D3nxT3kYeZ3gCLPvuivQxsI,1956
 mesa/examples/basic/boltzmann_wealth_model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mesa/examples/basic/boltzmann_wealth_model/agents.py,sha256=GF4mNEjqLS4Vg4vtdeDAetby_t69J-LcFhtQIMOBDNU,1330
-mesa/examples/basic/boltzmann_wealth_model/app.py,sha256=GwyNQvwu0S5l7ASRTF70xE9ozjhtT1xAetWGlQmNtDk,2231
+mesa/examples/basic/boltzmann_wealth_model/app.py,sha256=ooOyJO27R0ISWWAhUJB98DNbHaE4yY9KncoMVy8FKHg,2442
 mesa/examples/basic/boltzmann_wealth_model/model.py,sha256=9d-x5Y2T49R4Pt1u7lY63Z0y8impZ2f47_ahrxohvaY,2828
 mesa/examples/basic/boltzmann_wealth_model/st_app.py,sha256=PQ65LkYPXn-lx4lCfXuFJmzcmAfVB3oEEdIyuq9a7iU,3454
 mesa/examples/basic/conways_game_of_life/Readme.md,sha256=SylexP0Owrq1n_v5mJJyqs3wFeKtOMB0pLh0oLDOcV8,1256
 mesa/examples/basic/conways_game_of_life/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mesa/examples/basic/conways_game_of_life/agents.py,sha256=pByQeucyW5UDBnl90xbRGJJNJHpM8NLuqSmft5AkVN0,1766
-mesa/examples/basic/conways_game_of_life/app.py,sha256=HPzss2X3ntTOgdmg0C0EWw3lmAF7WiN9MZEgGdLW-xU,1997
+mesa/examples/basic/conways_game_of_life/app.py,sha256=tt1W_RVHu_erojvOSdtyNsVLyW8qXgJFU7F1As3xVwc,1843
 mesa/examples/basic/conways_game_of_life/model.py,sha256=GGHg8Qni1R4RGQrfvJcsqG6btNTuQhCWOwS_9crU6tc,1269
 mesa/examples/basic/conways_game_of_life/st_app.py,sha256=9qz3o0pOuvLZR-_aPPVHN-RIwFSNzvwWWfxCaD2K5cs,2402
-mesa/examples/basic/schelling/Readme.md,sha256=LB1O3unI0a4fr2cOl3umnjeqozMfXQEVBsB45GoK1u8,1877
+mesa/examples/basic/schelling/Readme.md,sha256=7VUHfl58BvE08XkqprNPNwHyOhyturKnt2kquizXFzM,1883
 mesa/examples/basic/schelling/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mesa/examples/basic/schelling/agents.py,sha256=jyMzafsAhOTYOfl3rZgasYLhxW3YEHv3oOIh9Re3LmU,1517
+mesa/examples/basic/schelling/agents.py,sha256=WQbyTT4nlnQvkNHTs4ynlTvSKeQ2EvfW7JcPUf-R5Z0,1669
 mesa/examples/basic/schelling/analysis.ipynb,sha256=UMDoumvBFhZilwJhxl5Mou2bmDDqxguK5RdnoY2gkNc,5910
-mesa/examples/basic/schelling/app.py,sha256=eqgqCu6_6jk1RrmT82e_AoEDMvy8eZ0OJnnlITpiBXQ,1067
-mesa/examples/basic/schelling/model.py,sha256=dUfQ4bG-nqvYPSUcLNSI7LOTfs8IxTbVi_Clj8y2rS8,2712
+mesa/examples/basic/schelling/app.py,sha256=97RpHp2BTdJdJzP-f6WRHo9k7jxBkCBQp5nKC8nNasU,2523
+mesa/examples/basic/schelling/model.py,sha256=NFXvFjAQ-0rEwsMI0UWmL3WgMm071Yg0YOxnNQQA0sc,2790
+mesa/examples/basic/schelling/resources/blue_happy.png,sha256=5x-_Klytq-wui1-xtgWxXTIkJQ0IwZ5pLtiG7g-RSbk,4053
+mesa/examples/basic/schelling/resources/blue_unhappy.png,sha256=cfD4Rmk-B6-4XDJtjo4c1pwEoKmlZ1O95ZdE7TNa9q4,4054
+mesa/examples/basic/schelling/resources/orange_happy.png,sha256=6P-W83hxOxrDfbTzsZUdFrqRQQp9k8qcTCSNJ4XQyFM,3406
+mesa/examples/basic/schelling/resources/orange_unhappy.png,sha256=amITDukQoQIO4vEyEQP96UIGQa_9dYWiraYsz8TWvHY,3409
 mesa/examples/basic/virus_on_network/Readme.md,sha256=h3yGmF9Jl7rCuRGnXJoPqxQPs9Nr-KCMIGs3l8JYQG8,2197
 mesa/examples/basic/virus_on_network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mesa/examples/basic/virus_on_network/agents.py,sha256=yVPZCiKI53qXlsUus3vdNZ39IG0cLoY2wQXeYZHiahs,1814
-mesa/examples/basic/virus_on_network/app.py,sha256=8I8VWQ7pBcOaNGyLDEO4IbNSTRy161-eWg-iEUVQ3-I,2553
+mesa/examples/basic/virus_on_network/app.py,sha256=njeBwy-_2j-tw8Yjfqm5fXyZHDm8HsEY4NlOCLKLk08,3069
 mesa/examples/basic/virus_on_network/model.py,sha256=sljdQlTPeUCbmWSxnCJJv706lN3uVMF8pS1gAMNHreM,2543
 mesa/experimental/__init__.py,sha256=9q6lv_NDYoWuKBzBzMdbisdxvzA-T5L6xT8quSArNT4,945
 mesa/experimental/cell_space/__init__.py,sha256=IOXd0RcJP34kaHvEHv_AeN7PGpvoYPpaZYsx3Mz8dNo,1872
 mesa/experimental/continuous_space/__init__.py,sha256=JkCkL4zZpe8c0GHqw4huM2-uoGOYqrCyt7J1M454kFA,269
-mesa/experimental/continuous_space/continuous_space.py,sha256=UcD-nsi5oEAJzf8ZI7BU26FYn6DdJzsW-dgXqaZIrQk,9530
+mesa/experimental/continuous_space/continuous_space.py,sha256=IFsX3iZ3GTyHmfIqjtEyi7H9oLN7NkX4QaqmNl_JhQc,9531
 mesa/experimental/continuous_space/continuous_space_agents.py,sha256=859ypIiWMgjknTsER0i8Y6aCWjMpw6MC5cfoKa6l_iA,3044
 mesa/experimental/devs/__init__.py,sha256=wkDrpqQ3qHGqrsOSTD-UOj-qOw0oFgnCw_ZXr9xFs90,1200
 mesa/experimental/devs/eventlist.py,sha256=6igPkHJt-syLcdpFV14_n6HGej2F1cM9giDQo85fHPw,7217
@@ -89,17 +92,24 @@ mesa/experimental/mesa_signals/observable_collections.py,sha256=rHEj6BYxLHFFGzSd
 mesa/experimental/mesa_signals/signals_util.py,sha256=fmq_FsIxsIvGjtmc4A9TGdBUtdliMHhEOpjRXivRDjA,1618
 mesa/experimental/meta_agents/__init__.py,sha256=UpX_1WpmXtg4iKdPTcPVViCt1H9fRydA-l3a6i4KR1w,949
 mesa/experimental/meta_agents/meta_agent.py,sha256=v9a09hU3kgKQdgjk5v5DDOaRCqEh_A8Xhzu9V185kZU,14801
-mesa/visualization/__init__.py,sha256=h7YZnBUNrgiK5KbIikPIdQgn6KusmgiDh7tMql8Q39Y,730
+mesa/visualization/__init__.py,sha256=qt05BmHoTWWKdvdSOC7u2JSpJnK0RX9Eq9axO6K2pqU,793
 mesa/visualization/command_console.py,sha256=-sVNYdXxmc5diQyqfFHUByzVSOpP3eoPcdLL2J6gwD4,17086
-mesa/visualization/mpl_space_drawing.py,sha256=axIaq7MTaYIb_-ME2z5TbXufREl9jgFLebZSredyfwA,22956
-mesa/visualization/solara_viz.py,sha256=coG5o0A5iCOBIqzsrlUG_S2rYrTcOYubESzj4zcW-ro,26274
+mesa/visualization/mpl_space_drawing.py,sha256=_s8YW0cQdcH3wt7o8mnmP7g6LizJB02zlveiGv74_UA,30135
+mesa/visualization/solara_viz.py,sha256=X9pL-HxzHj8dd4OnjCQOKO2RtK9LiYLinRKQ--6uEOg,35056
+mesa/visualization/space_drawers.py,sha256=B7LwovR7v6tXDIIasS_rjduvXFUkeMO6ZidunLWmhVs,26755
+mesa/visualization/space_renderer.py,sha256=FDFDfWP-3WuXIbdZ8CNmAIXr9Vd-La8_PBjF3-_YmOY,14602
 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=cSce9_QNaJ5EF6sZ8tu2cZ4NIczocKfjdRCxiC8w0fY,16164
-mesa/visualization/components/matplotlib_components.py,sha256=xQETaFyHIfmL_9JwrLIgubuIQ7-pp7TMoXT1WMmozus,5441
-mesa-3.2.0.dist-info/METADATA,sha256=cpk4OAHWsBqmvJeeHOPy5W1-hy3PqmcE8khaU5af4EA,10700
-mesa-3.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mesa-3.2.0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-mesa-3.2.0.dist-info/licenses/NOTICE,sha256=GbsWoK0QWv1JyZ_xer2s-jNilv0RtWl-0UrtlJANHPg,578
-mesa-3.2.0.dist-info/RECORD,,
+mesa/visualization/backends/__init__.py,sha256=U37F-zfULEQONawWNbsHMozEvWVWSJCJyhXTVRtap6c,590
+mesa/visualization/backends/abstract_renderer.py,sha256=ckNqGiloS0KMrau-a7o0I1FZ1DcCqG1GedJU11lA7Oc,3216
+mesa/visualization/backends/altair_backend.py,sha256=7lyTYR_at-BIIswm8Uqt77O_5DRrq0zV3TNHSEZHMW4,16031
+mesa/visualization/backends/matplotlib_backend.py,sha256=aqh3IWhTEVwz09etu5oYRz6GL1FmZgy6b_hx9J4GWPI,15378
+mesa/visualization/components/__init__.py,sha256=5_nUk0UzuVEYHXJ-kjsIZQLRvef-gbYBoiXCZd81kGQ,3524
+mesa/visualization/components/altair_components.py,sha256=BuEwvWaMs4EMggRWn1upws4uNsVYSrr1k_IYl4UqT2U,18999
+mesa/visualization/components/matplotlib_components.py,sha256=KfzP7eLT0d3Tqb2JatJ8IfpalyX8lveo6U3IC0EvvB8,5567
+mesa/visualization/components/portrayal_components.py,sha256=FlLz_dZFXiaQobvfpfWsFAUgy4cnHs2R0tm6JikM0mU,4870
+mesa-3.3.0.dist-info/METADATA,sha256=082hZvTM8-_aEHvR99yquciB_9aTbOq66Z-7YjGGTGA,11135
+mesa-3.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mesa-3.3.0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+mesa-3.3.0.dist-info/licenses/NOTICE,sha256=GbsWoK0QWv1JyZ_xer2s-jNilv0RtWl-0UrtlJANHPg,578
+mesa-3.3.0.dist-info/RECORD,,

mesa/examples/advanced/sugarscape_g1mt/tests.py

@@ -1,69 +0,0 @@
-import numpy as np
-from scipy import stats
-
-from .agents import Trader
-from .model import SugarscapeG1mt, flatten
-
-
-def check_slope(y, increasing):
-    x = range(len(y))
-    slope, intercept, _, p_value, _ = stats.linregress(x, y)
-    result = (slope > 0) if increasing else (slope < 0)
-    # p_value for significance.
-    assert result and p_value < 0.05, (slope, p_value)
-
-
-def test_decreasing_price_variance():
-    # The variance of the average trade price should decrease over time (figure IV-3)
-    # See Growing Artificial Societies p. 109.
-    model = SugarscapeG1mt(42)
-    model.datacollector._new_model_reporter(
-        "price_variance",
-        lambda m: np.var(
-            flatten([a.prices for a in m.agents_by_type[Trader].values()])
-        ),
-    )
-    model.run_model(step_count=50)
-
-    df_model = model.datacollector.get_model_vars_dataframe()
-
-    check_slope(df_model.price_variance, increasing=False)
-
-
-def test_carrying_capacity():
-    def calculate_carrying_capacities(enable_trade):
-        carrying_capacities = []
-        visions = range(1, 10)
-        for vision_max in visions:
-            model = SugarscapeG1mt(vision_max=vision_max, enable_trade=enable_trade)
-            model.run_model(step_count=50)
-            carrying_capacities.append(len(model.agents_by_type[Trader]))
-        return carrying_capacities
-
-    # Carrying capacity should increase over mean vision (figure IV-6).
-    # See Growing Artificial Societies p. 112.
-    carrying_capacities_with_trade = calculate_carrying_capacities(True)
-    check_slope(
-        carrying_capacities_with_trade,
-        increasing=True,
-    )
-    # Carrying capacity should be higher when trade is enabled (figure IV-6).
-    carrying_capacities_no_trade = calculate_carrying_capacities(False)
-    check_slope(
-        carrying_capacities_no_trade,
-        increasing=True,
-    )
-
-    t_statistic, p_value = stats.ttest_rel(
-        carrying_capacities_with_trade, carrying_capacities_no_trade
-    )
-    # t_statistic > 0 means carrying_capacities_with_trade has larger values
-    # than carrying_capacities_no_trade.
-    # p_value for significance.
-    assert t_statistic > 0 and p_value < 0.05
-
-
-# TODO:
-# 1. Reproduce figure IV-12 that the log of average price should decrease over average agent age
-# 2. Reproduce figure IV-13 that the gini coefficient on trade should decrease over mean vision, and should be higher with trade
-# 3. a stricter test would be to ensure the amount of variance of the trade price matches figure IV-3