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

avoid numpy don't use lists as indices warning

Browse source
This commit is contained in:
Laura Klünder 2022-04-03 18:28:53 +02:00
parent e95e28599e
commit cde394e16e
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/c3nav/routing/router.py
View file

@ -419,7 +419,7 @@ class Router:
speed_up *= options.walk_factor
for indices, dir_speed in ((waytype.nonupwards_indices, speed), (waytype.upwards_indices, speed_up)):
indices = indices.transpose().tolist()
indices = tuple(indices.transpose().tolist())
values = graph[indices]
values /= dir_speed
if waytype.extra_seconds:
@ -430,9 +430,9 @@ class Router:
for waytype in self.waytypes[1:]:
value = options.get('waytype_%s' % waytype.pk, 'allow')
if value in ('avoid', 'avoid_up'):
graph[waytype.upwards_indices.transpose().tolist()] *= 100000
graph[tuple(waytype.upwards_indices.transpose().tolist())] *= 100000
if value in ('avoid', 'avoid_down'):
graph[waytype.nonupwards_indices.transpose().tolist()] *= 100000
graph[tuple(waytype.nonupwards_indices.transpose().tolist())] *= 100000
# exclude spaces and edges
space_nodes = tuple(reduce(operator.or_, (self.spaces[space].nodes for space in restrictions.spaces), set()))
@ -441,7 +441,7 @@ class Router:
if restrictions.additional_nodes:
graph[tuple(restrictions.additional_nodes), :] = np.inf
graph[:, tuple(restrictions.additional_nodes)] = np.inf
graph[restrictions.edges.transpose().tolist()] = np.inf
graph[tuple(restrictions.edges.transpose().tolist())] = np.inf
distances, predecessors = shortest_path(graph, directed=True, return_predecessors=True)
cache.set(cache_key, (distances.astype(np.float64).tobytes(),