diff --git a/graphs/johnson_graph.py b/graphs/johnson_graph.py index 0f5441a15..99f187376 100644 --- a/graphs/johnson_graph.py +++ b/graphs/johnson_graph.py @@ -60,7 +60,10 @@ class JohnsonGraph: for vertex_a in self.graph: for vertex_a, vertex_b, weight in self.edges: - if distances[vertex_a] != sys.maxsize - 1 and distances[vertex_a] + weight < distances[vertex_b]: + if ( + distances[vertex_a] != sys.maxsize - 1 + and distances[vertex_a] + weight < distances[vertex_b] + ): distances[vertex_b] = distances[vertex_a] + weight return distances @@ -82,13 +85,25 @@ class JohnsonGraph: for i in range(len(self.edges)): vertex_a, vertex_b, weight = self.edges[i] - self.edges[i] = (vertex_a, vertex_b, weight + hash_path[vertex_a] - hash_path[vertex_b]) + self.edges[i] = ( + vertex_a, + vertex_b, + weight + hash_path[vertex_a] - hash_path[vertex_b], + ) self.graph.pop("#") - self.edges = [(vertex1, vertex2, node_weight) for vertex1, vertex2, node_weight in self.edges if vertex1 != "#"] + self.edges = [ + (vertex1, vertex2, node_weight) + for vertex1, vertex2, node_weight in self.edges + if vertex1 != "#" + ] for vertex in self.graph: - self.graph[vertex] = [(vertex2, node_weight) for vertex1, vertex2, node_weight in self.edges if vertex1 == vertex] + self.graph[vertex] = [ + (vertex2, node_weight) + for vertex1, vertex2, node_weight in self.edges + if vertex1 == vertex + ] distances = [] for vertex1 in self.graph: