Merge pull request #72 from Puckoland/gridSetter

Grid setter

generals/core/grid.py

@@ -6,18 +6,23 @@ class Grid:
     def __init__(self, grid: str | np.ndarray):
         self.grid = grid
 
+    def __eq__(self, other):
+        return np.array_equal(self.grid, other.grid)
+
     @property
     def grid(self):
         return self._grid
 
     @grid.setter
     def grid(self, grid: str | np.ndarray):
-        assert isinstance(
-            grid, (str, np.ndarray)
-        ), "Grid must be encoded as a string or a numpy array."
-        if isinstance(grid, str):
-            grid = grid.strip()
-            grid = Grid.numpify_grid(grid)
+        match grid:
+            case str(grid):
+                grid = grid.strip()
+                grid = Grid.numpify_grid(grid)
+            case np.ndarray():
+                pass
+            case _:
+                raise ValueError("Grid must be encoded as a string or a numpy array.")
         if not Grid.verify_grid(grid):
             raise ValueError("Invalid grid layout - generals cannot reach each other.")
         self._grid = grid

tests/test_map.py

@@ -2,6 +2,20 @@
 import numpy as np
 
 
+def test_grid_creation():
+    map = """
+.....
+.A##2
+...2.
+..22.
+...B.
+    """
+    map_nd_array = np.ndarray((5, 5), buffer=np.array(list(map.replace("\n", ""))), dtype="U1")
+    grid_str = Grid(map)
+    grid_nd_array = Grid(map_nd_array)
+    assert grid_str == grid_nd_array
+
+
 def test_verify_grid():
     map = """
 .....