2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

remove transpose() from graph and level router building as it makes no sense and breaks oneway connections

Browse source
This commit is contained in:
Laura Klünder 2016-12-18 13:21:02 +01:00
parent d03379c0aa
commit d2e9e18c2a
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/c3nav/routing/graph.py
View file

@ -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)

5
src/c3nav/routing/level.py
View file

@ -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)