From d2e9e18c2a52ad08db0214cd8c0db6c40724d5d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Sun, 18 Dec 2016 13:21:02 +0100 Subject: [PATCH] remove transpose() from graph and level router building as it makes no sense and breaks oneway connections --- src/c3nav/routing/graph.py | 4 ++-- src/c3nav/routing/level.py | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/c3nav/routing/graph.py b/src/c3nav/routing/graph.py index daa8178e..95a4eb66 100644 --- a/src/c3nav/routing/graph.py +++ b/src/c3nav/routing/graph.py @@ -229,8 +229,8 @@ class Graph: level_distances[in_graph_i[:, None], in_graph_i] = router.shortest_paths[in_level_i[:, None], in_level_i] better = level_distances < sparse_distances - sparse_distances[better.transpose()] = level_distances[better.transpose()] - level_transfers[better.transpose()] = i + sparse_distances[better] = level_distances[better] + level_transfers[better] = i g_sparse = csgraph_from_dense(sparse_distances, null_value=np.inf) shortest_paths, predecessors = shortest_path(g_sparse, return_predecessors=True) diff --git a/src/c3nav/routing/level.py b/src/c3nav/routing/level.py index d72ed11c..4175658e 100644 --- a/src/c3nav/routing/level.py +++ b/src/c3nav/routing/level.py @@ -248,10 +248,9 @@ class GraphLevel(): for point in room.room_transfer_points)) room_distances[in_level_i[:, None], in_level_i] = router.shortest_paths[in_room_i[:, None], in_room_i] - better = room_distances < sparse_distances - sparse_distances[better.transpose()] = room_distances[better.transpose()] - room_transfers[better.transpose()] = i + sparse_distances[better] = room_distances[better] + room_transfers[better] = i g_sparse = csgraph_from_dense(sparse_distances, null_value=np.inf) shortest_paths, predecessors = shortest_path(g_sparse, return_predecessors=True)