remove height property of Matrixes

synergine2_xyz/physics.py

@@ -37,23 +37,22 @@ class MoveCostComputer(object):
 
 
 class VisibilityMatrix(object):
-    _matrixes = shared.create('matrixes', value=lambda: {})  # type: typing.Dict[str, typing.Dict[float, typing.List[typing.List[float]]]]  # nopep8
+    _matrixes = shared.create('matrixes', value=lambda: {})  # type: typing.Dict[str, typing.List[typing.List[tuple]]]
 
-    def initialize_empty_matrix(self, name: str, height: float, matrix_width: int, matrix_height: int) -> None:
-        self._matrixes[name] = {}
-        self._matrixes[name][height] = []
+    def initialize_empty_matrix(self, name: str, matrix_width: int, matrix_height: int) -> None:
+        self._matrixes[name] = []
 
         for y in range(matrix_height):
             x_list = []
             for x in range(matrix_width):
-                x_list.append(0.0)
-            self._matrixes[name][height].append(x_list)
+                x_list.append((0.0,))
+            self._matrixes[name].append(x_list)
 
-    def get_matrix(self, name: str, height: float) -> typing.List[typing.List[float]]:
-        return self._matrixes[name][height]
+    def get_matrix(self, name: str) -> typing.List[typing.List[tuple]]:
+        return self._matrixes[name]
 
-    def update_matrix(self, name: str, height: float, x: int, y: int, value: float) -> None:
-        matrix = self.get_matrix(name, height)
+    def update_matrix(self, name: str, x: int, y: int, value: tuple) -> None:
+        matrix = self.get_matrix(name)
         matrix[y][x] = value
         # TODO: Test if working and needed ? This is not perf friendly ...
         # Force shared data update
@@ -66,9 +65,9 @@ class VisibilityMatrix(object):
     ) -> typing.List[typing.Tuple[int, int]]:
         return get_line_xy_path(from_, to)
 
-    def get_values_for_path(self, name: str, height: float, path_positions: typing.List[typing.Tuple[int, int]]):
+    def get_values_for_path(self, name: str, path_positions: typing.List[typing.Tuple[int, int]]):
         values = []
-        matrix = self.get_matrix(name, height)
+        matrix = self.get_matrix(name)
         for path_position in path_positions:
             x, y = path_position
             values.append(matrix[y][x])

tests/test_physics.py

@@ -8,39 +8,39 @@ from tests import BaseTest
 class TestVisibilityMatrix(BaseTest):
     def test_initialize_empty_matrix(self):
         visibility = VisibilityMatrix()
-        visibility.initialize_empty_matrix('testing', height=0.5, matrix_width=3, matrix_height=2)
-        matrix = visibility.get_matrix('testing', height=0.5)
+        visibility.initialize_empty_matrix('testing', matrix_width=3, matrix_height=2)
+        matrix = visibility.get_matrix('testing')
 
         assert isinstance(matrix, list)
 
-        assert [0.0, 0.0, 0.0] == matrix[0]
-        assert [0.0, 0.0, 0.0] == matrix[1]
+        assert [(0.0,), (0.0,), (0.0,)] == matrix[0]
+        assert [(0.0,), (0.0,), (0.0,)] == matrix[1]
 
     def test_update_matrix(self):
         visibility = VisibilityMatrix()
-        visibility.initialize_empty_matrix('testing', height=0.5, matrix_width=3, matrix_height=2)
-        visibility.update_matrix('testing', height=0.5, x=2, y=1, value=0.5)
-        visibility.update_matrix('testing', height=0.5, x=0, y=0, value=0.7)
-        matrix = visibility.get_matrix('testing', height=0.5)
+        visibility.initialize_empty_matrix('testing', matrix_width=3, matrix_height=2)
+        visibility.update_matrix('testing', x=2, y=1, value=(0.5,))
+        visibility.update_matrix('testing', x=0, y=0, value=(0.7,))
+        matrix = visibility.get_matrix('testing')
 
-        assert [0.7, 0.0, 0.0] == matrix[0]
-        assert [0.0, 0.0, 0.5] == matrix[1]
+        assert [(0.7,), (0.0,), (0.0,)] == matrix[0]
+        assert [(0.0,), (0.0,), (0.5,)] == matrix[1]
 
     def test_get_path_positions(self):
         visibility = VisibilityMatrix()
-        visibility.initialize_empty_matrix('testing', height=0.5, matrix_width=3, matrix_height=2)
-        visibility.update_matrix('testing', height=0.5, x=2, y=1, value=0.5)
-        visibility.update_matrix('testing', height=0.5, x=0, y=0, value=0.7)
+        visibility.initialize_empty_matrix('testing', matrix_width=3, matrix_height=2)
+        visibility.update_matrix('testing', x=2, y=1, value=(0.5,))
+        visibility.update_matrix('testing', x=0, y=0, value=(0.7,))
 
         path_positions = visibility.get_path_positions(from_=(0, 0), to=(2, 1))
         assert [(0, 0), (1, 0), (2, 1)] == path_positions
 
     def test_get_path_values(self):
         visibility = VisibilityMatrix()
-        visibility.initialize_empty_matrix('testing', height=0.5, matrix_width=3, matrix_height=2)
-        visibility.update_matrix('testing', height=0.5, x=2, y=1, value=0.5)
-        visibility.update_matrix('testing', height=0.5, x=0, y=0, value=0.7)
+        visibility.initialize_empty_matrix('testing', matrix_width=3, matrix_height=2)
+        visibility.update_matrix('testing', x=2, y=1, value=(0.5,))
+        visibility.update_matrix('testing', x=0, y=0, value=(0.7,))
 
         path_positions = visibility.get_path_positions(from_=(0, 0), to=(2, 1))
-        path_values = visibility.get_values_for_path('testing', height=0.5, path_positions=path_positions)
-        assert [0.7, 0.0, 0.5] == path_values
+        path_values = visibility.get_values_for_path('testing', path_positions=path_positions)
+        assert [(0.7,), (0.0,), (0.5,)] == path_values