Fix paths using nyduses having one extra point with wrong data

eladyaniv01 · Mar 17, 2021 · 029033b · 029033b
1 parent 266eea9
commit 029033b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/MapAnalyzer/cext/mapanalyzerext.so b/MapAnalyzer/cext/mapanalyzerext.so
diff --git a/MapAnalyzer/cext/src/ma_ext.c b/MapAnalyzer/cext/src/ma_ext.c
@@ -1335,13 +1335,13 @@ static PyObject* astar_with_nydus(PyObject *self, PyObject *args)
                 }
                 PyList_SetItem(return_val, 0, PyArray_Return(path1));
 
-                npy_intp dims2[2] = {path_length - nydus_index + 1, 2};
+                npy_intp dims2[2] = {path_length - (nydus_index + 1), 2};
                 PyArrayObject *path2 = (PyArrayObject*) PyArray_SimpleNew(2, dims2, NPY_INT32);
                 npy_int32 *path2_data = (npy_int32*)path2->data;
 
                 for (npy_intp i = nydus_index + 1; i < path_length; ++i)
                 {
-                    int index_to_set = i - nydus_index + 1;
+                    int index_to_set = i - (nydus_index + 1);
                     path2_data[2*index_to_set] = complete_path->items[i] / w;
                     path2_data[2*index_to_set + 1] = complete_path->items[i] % w;
                 }

diff --git a/tests/test_c_extension.py b/tests/test_c_extension.py
@@ -55,7 +55,7 @@ def test_c_extension():
     paths_nydus = astar_path_with_nyduses(influenced_grid, (3, 3), (33, 38), nydus_positions, False, False)
 
     assert (paths_nydus is not None and len(paths_nydus) == 2
-            and len(paths_nydus[0]) + len(paths_nydus[1]) == 10)
+            and len(paths_nydus[0]) + len(paths_nydus[1]) == 8)
 
     height_map = np.where(walkable_grid == 0, 24, 8).astype(np.uint8)