first set of tests

Author: quaquel

mesa/experimental/cell_space/__init__.py

@@ -21,6 +21,7 @@
 )
 from mesa.experimental.cell_space.network import Network
 from mesa.experimental.cell_space.voronoi import VoronoiGrid
+from mesa.experimental.cell_space.property_layer import PropertyLayer
 
 __all__ = [
     "CellCollection",
@@ -35,4 +36,5 @@
     "OrthogonalVonNeumannGrid",
     "Network",
     "VoronoiGrid",
+    "PropertyLayer"
 ]

mesa/experimental/cell_space/cell.py

@@ -9,7 +9,6 @@
 
 from mesa.experimental.cell_space.cell_agent import CellAgent
 from mesa.experimental.cell_space.cell_collection import CellCollection
-from mesa.space import PropertyLayer
 
 if TYPE_CHECKING:
     from mesa.agent import Agent
@@ -24,7 +23,6 @@ class Cell:
         coordinate (Tuple[int, int]) : the position of the cell in the discrete space
         agents (List[Agent]): the agents occupying the cell
         capacity (int): the maximum number of agents that can simultaneously occupy the cell
-        properties (dict[str, Any]): the properties of the cell
         random (Random): the random number generator
 
     """
@@ -34,21 +32,10 @@ class Cell:
         "connections",
         "agents",
         "capacity",
-        "properties",
         "random",
-        "_mesa_property_layers",
         "__dict__",
     ]
 
-    # def __new__(cls,
-    #     coordinate: tuple[int, ...],
-    #     capacity: float | None = None,
-    #     random: Random | None = None,):
-    #     if capacity != 1:
-    #         return object.__new__(cls)
-    #     else:
-    #         return object.__new__(SingleAgentCell)
-
     def __init__(
         self,
         coordinate: Coordinate,
@@ -69,10 +56,9 @@ def __init__(
         self.agents: list[
             Agent
         ] = []  # TODO:: change to AgentSet or weakrefs? (neither is very performant, )
+        self.properties = {}  # fixme still used by voronoi mesh
         self.capacity: int | None = capacity
-        self.properties: dict[Coordinate, object] = {}
         self.random = random
-        self._mesa_property_layers: dict[str, PropertyLayer] = {}
 
     def connect(self, other: Cell, key: Coordinate | None = None) -> None:
         """Connects this cell to another cell.

mesa/experimental/cell_space/discrete_space.py

@@ -3,15 +3,13 @@
 from __future__ import annotations
 
 import warnings
-from collections.abc import Callable
 from functools import cached_property
 from random import Random
-from typing import Any, Generic, TypeVar
+from typing import Generic, TypeVar
 
 from mesa.agent import AgentSet
 from mesa.experimental.cell_space.cell import Cell
 from mesa.experimental.cell_space.cell_collection import CellCollection
-from mesa.space import PropertyLayer
 
 T = TypeVar("T", bound=Cell)
 

mesa/experimental/cell_space/grid.py

@@ -8,11 +8,12 @@
 from typing import Generic, TypeVar
 
 from mesa.experimental.cell_space import Cell, DiscreteSpace
+from mesa.experimental.cell_space.property_layer import HasPropertyLayers
 
 T = TypeVar("T", bound=Cell)
 
 
-class Grid(DiscreteSpace[T], Generic[T]):
+class Grid(DiscreteSpace[T], Generic[T], HasPropertyLayers):
     """Base class for all grid classes.
 
     Attributes: