fix: points_to_numpy_array now filters out outofbounds

eladyaniv01 · Aug 13, 2020 · aedf9d2 · aedf9d2
1 parent 486f0f9
commit aedf9d2
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 7 deletions.
diff --git a/MapAnalyzer/MapData.py b/MapAnalyzer/MapData.py
@@ -169,8 +169,27 @@ def points_to_numpy_array(
         """
         rows, cols = self.path_arr.shape
         arr = np.zeros((rows, cols), dtype=np.uint8)
+        if isinstance(points, set):
+            points = list(points)
+
+        def in_bounds_x(x):
+            width = arr.shape[0] - 1
+            if 0 < x < width:
+                return x
+            return 0
+
+        def in_bounds_y(y):
+            height = arr.shape[1] - 1
+            if 0 < y < height:
+                return y
+            return 0
+
+        x_vec = np.vectorize(in_bounds_x)
+        y_vec = np.vectorize(in_bounds_y)
         indices = self.points_to_indices(points)
-        arr[indices] = 1
+        x = x_vec(indices[0])
+        y = y_vec(indices[1])
+        arr[x, y] = 1
         return arr
 
     @staticmethod

diff --git a/MapAnalyzer/Pather.py b/MapAnalyzer/Pather.py
@@ -95,7 +95,7 @@ def pathfind(self, start: Tuple[int, int], goal: Tuple[int, int], grid: Optional
             start = int(start[0]), int(start[1])
             goal = int(goal[0]), int(goal[1])
         else:
-            self.map_data.logger.error(PatherNoPointsException(start=start, goal=goal))
+            self.map_data.logger.warning(PatherNoPointsException(start=start, goal=goal))
             return None
         if grid is None:
             grid = self.get_pyastar_grid()

diff --git a/MapAnalyzer/constants.py b/MapAnalyzer/constants.py
@@ -26,8 +26,8 @@
         19: "azure",
         20: "azure"
 }
-LOG_FORMAT = "<w><bold>{time:YY:MM:DD:HH:mm:ss} |" \
-             " <level>{level: <8} </level>| <green>{name: ^15}</green> |" \
-             " {function: ^15} |" \
-             " {line: >4} |" \
-             " <level>{level.icon} {message}</level></bold></w>"
+LOG_FORMAT = "<w><bold>{time:YY:MM:DD:HH:mm:ss}|" \
+             "<level>{level: <8}</level>|<green>{name: ^15}</green>|" \
+             "{function: ^15}|" \
+             "{line: >4}|" \
+             "<level>{level.icon}{message}</level></bold></w>"