move cell_space out of experimental to spaces folder

move, rename, import changes

Author: quaquel

mesa/__init__.py

@@ -5,7 +5,8 @@
 
 import datetime
 
-import mesa.space as space
+import mesa.space as old_space
+# import mesa.spaces as spaces
 import mesa.time as time
 from mesa.agent import Agent
 from mesa.batchrunner import batch_run
@@ -16,7 +17,8 @@
     "Model",
     "Agent",
     "time",
-    "space",
+    "old_space",
+    "spaces",
     "DataCollector",
     "batch_run",
     "experimental",

mesa/experimental/__init__.py

@@ -1,7 +1,4 @@
 """Experimental init."""
-
-from mesa.experimental import cell_space
-
 from .solara_viz import JupyterViz, Slider, SolaraViz, make_text
 
-__all__ = ["cell_space", "JupyterViz", "SolaraViz", "make_text", "Slider"]
+__all__ = ["JupyterViz", "SolaraViz", "make_text", "Slider"]

mesa/experimental/cell_space/__init__.py

@@ -8,7 +8,7 @@
 from matplotlib.ticker import MaxNLocator
 
 import mesa
-from mesa.experimental.cell_space import VoronoiGrid
+
 
 
 @solara.component
@@ -164,6 +164,7 @@ def portray(space):
 
 
 def _draw_voronoi(space, space_ax, agent_portrayal):
+    from mesa.spaces.voronoi import VoronoiGrid
     def portray(g):
         x = []
         y = []

mesa/experimental/components/matplotlib.py

@@ -0,0 +1,20 @@
+from mesa.spaces.network import Network
+from mesa.spaces.cell import Cell
+from mesa.spaces.cell_agent import CellAgent
+from mesa.spaces.cell_collection import CellCollection
+from mesa.spaces.discrete_space import DiscreteSpace
+from mesa.spaces.grid import Grid, HexGrid, OrthogonalMooreGrid, OrthogonalVonNeumannGrid
+from mesa.spaces.voronoi import VoronoiGrid
+
+__all__ = [
+    "CellCollection",
+    "Cell",
+    "CellAgent",
+    "DiscreteSpace",
+    "Grid",
+    "HexGrid",
+    "OrthogonalMooreGrid",
+    "OrthogonalVonNeumannGrid",
+    "Network",
+    "VoronoiGrid",
+]

mesa/spaces/__init__.py

@@ -6,10 +6,10 @@
 from random import Random
 from typing import TYPE_CHECKING
 
-from mesa.experimental.cell_space.cell_collection import CellCollection
+from mesa.spaces.cell_collection import CellCollection
 
 if TYPE_CHECKING:
-    from mesa.experimental.cell_space.cell_agent import CellAgent
+    from mesa.spaces.cell_agent import CellAgent
 
 
 class Cell:

mesa/experimental/cell_space/cell.py renamed to mesa/spaces/cell.py

@@ -7,7 +7,7 @@
 from mesa import Agent, Model
 
 if TYPE_CHECKING:
-    from mesa.experimental.cell_space.cell import Cell
+    from mesa.spaces.cell import Cell
 
 
 class CellAgent(Agent):

mesa/experimental/cell_space/cell_agent.py renamed to mesa/spaces/cell_agent.py

@@ -9,8 +9,8 @@
 from typing import TYPE_CHECKING, Generic, TypeVar
 
 if TYPE_CHECKING:
-    from mesa.experimental.cell_space.cell import Cell
-    from mesa.experimental.cell_space.cell_agent import CellAgent
+    from mesa.spaces.cell import Cell
+    from mesa.spaces.cell_agent import CellAgent
 
 T = TypeVar("T", bound="Cell")
 

mesa/experimental/cell_space/cell_collection.py renamed to mesa/spaces/cell_collection.py

@@ -6,8 +6,8 @@
 from random import Random
 from typing import Generic, TypeVar
 
-from mesa.experimental.cell_space.cell import Cell
-from mesa.experimental.cell_space.cell_collection import CellCollection
+from mesa.spaces.cell import Cell
+from mesa.spaces.cell_collection import CellCollection
 
 T = TypeVar("T", bound=Cell)
 

mesa/experimental/cell_space/discrete_space.py renamed to mesa/spaces/discrete_space.py

@@ -7,7 +7,7 @@
 from random import Random
 from typing import Generic, TypeVar
 
-from mesa.experimental.cell_space import Cell, DiscreteSpace
+from mesa.spaces import Cell, DiscreteSpace
 
 T = TypeVar("T", bound=Cell)