@@ -903,36 +903,36 @@ def _floyd_warshall_adjacency_list(graph: Graph):
903903_floyd_warshall_adjacency_matrix = _floyd_warshall_adjacency_list
904904
905905def _johnson_adjacency_list (graph : Graph ):
906- new_vertex = AdjacencyListGraphNode ('__q__' )
906+ new_vertex = AdjacencyListGraphNode ('__q__' )
907907 graph .add_vertex (new_vertex )
908908
909909 for vertex in graph .vertices :
910910 if vertex != '__q__' :
911- graph .add_edge ('__q__' ,vertex ,0 )
911+ graph .add_edge ('__q__' , vertex , 0 )
912912
913- distances , predecessors = shortest_paths (graph ,'bellman_ford' ,'__q__' )
913+ distances , predecessors = shortest_paths (graph , 'bellman_ford' , '__q__' )
914914
915915 edges_to_remove = []
916916 for edge in graph .edge_weights :
917917 edge_node = graph .edge_weights [edge ]
918918 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 ))
920920
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 )
923923 graph .remove_vertex ('__q__' )
924924
925925 for edge in graph .edge_weights :
926926 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 ])
929929
930930 all_distances = {}
931931 all_next_vertex = {}
932932
933933 for vertex in graph .vertices :
934934 u = vertex
935- dijkstra_dist ,dijkstra_pred = shortest_paths (graph , 'dijkstra' , u )
935+ dijkstra_dist , dijkstra_pred = shortest_paths (graph , 'dijkstra' , u )
936936 all_distances [u ] = {}
937937 all_next_vertex [u ] = {}
938938 for v in graph .vertices :
@@ -941,7 +941,7 @@ def _johnson_adjacency_list(graph: Graph):
941941 else :
942942 all_next_vertex [u ][v ] = None
943943 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 ]
945945 else :
946946 all_distances [u ][v ] = float ('inf' )
947947
0 commit comments