@@ -903,36 +903,36 @@ def _floyd_warshall_adjacency_list(graph: Graph):
903
903
_floyd_warshall_adjacency_matrix = _floyd_warshall_adjacency_list
904
904
905
905
def _johnson_adjacency_list (graph : Graph ):
906
- new_vertex = AdjacencyListGraphNode ('__q__' )
906
+ new_vertex = AdjacencyListGraphNode ('__q__' )
907
907
graph .add_vertex (new_vertex )
908
908
909
909
for vertex in graph .vertices :
910
910
if vertex != '__q__' :
911
- graph .add_edge ('__q__' ,vertex ,0 )
911
+ graph .add_edge ('__q__' , vertex , 0 )
912
912
913
- distances , predecessors = shortest_paths (graph ,'bellman_ford' ,'__q__' )
913
+ distances , predecessors = shortest_paths (graph , 'bellman_ford' , '__q__' )
914
914
915
915
edges_to_remove = []
916
916
for edge in graph .edge_weights :
917
917
edge_node = graph .edge_weights [edge ]
918
918
if edge_node .source .name == '__q__' :
919
- edges_to_remove .append ((edge_node .source .name ,edge_node .target .name ))
919
+ edges_to_remove .append ((edge_node .source .name , edge_node .target .name ))
920
920
921
- for u ,v in edges_to_remove :
922
- graph .remove_edge (u ,v )
921
+ for u , v in edges_to_remove :
922
+ graph .remove_edge (u , v )
923
923
graph .remove_vertex ('__q__' )
924
924
925
925
for edge in graph .edge_weights :
926
926
edge_node = graph .edge_weights [edge ]
927
- u ,v = edge_node .source .name ,edge_node .target .name
928
- graph .edge_weights [edge ].value += distances [u ]- distances [v ]
927
+ u , v = edge_node .source .name , edge_node .target .name
928
+ graph .edge_weights [edge ].value += ( distances [u ] - distances [v ])
929
929
930
930
all_distances = {}
931
931
all_next_vertex = {}
932
932
933
933
for vertex in graph .vertices :
934
934
u = vertex
935
- dijkstra_dist ,dijkstra_pred = shortest_paths (graph , 'dijkstra' , u )
935
+ dijkstra_dist , dijkstra_pred = shortest_paths (graph , 'dijkstra' , u )
936
936
all_distances [u ] = {}
937
937
all_next_vertex [u ] = {}
938
938
for v in graph .vertices :
@@ -941,7 +941,7 @@ def _johnson_adjacency_list(graph: Graph):
941
941
else :
942
942
all_next_vertex [u ][v ] = None
943
943
if v in dijkstra_dist :
944
- all_distances [u ][v ] = dijkstra_dist [v ]- distances [u ]+ distances [v ]
944
+ all_distances [u ][v ] = dijkstra_dist [v ] - distances [u ] + distances [v ]
945
945
else :
946
946
all_distances [u ][v ] = float ('inf' )
947
947
0 commit comments