Lint

Author: arneboockmeyer

test/split_test.py

@@ -1,6 +1,7 @@
 import pytest
 
 from yaramo.model import (
+    DbrefGeoNode,
     Edge,
     Node,
     Route,
@@ -10,7 +11,6 @@
     SignalKind,
     Topology,
     Wgs84GeoNode,
-    DbrefGeoNode
 )
 from yaramo.operations import Label, Split
 
@@ -499,6 +499,7 @@ def test_route_split():
     assert route_2 in topology_b
     assert len(topology_b.signals) == 3
 
+
 def test_route_split_three_parts():
     topology = Topology()
     node_1 = Node(geo_node=Wgs84GeoNode(0, 0))
@@ -539,13 +540,16 @@ def test_route_split_three_parts():
     topology.add_routes([route_1])
 
     topology_a, topology_b, _ = Split.split(
-        topology, split_edges={edge_3: 5.0, edge_5: 5.0}, node_label_assignments={node_1: Label.A_Topology}
+        topology,
+        split_edges={edge_3: 5.0, edge_5: 5.0},
+        node_label_assignments={node_1: Label.A_Topology},
     )
 
     # Note: route 1 goes over split area, so it gets removed
     assert len(topology_a.routes) == 0
     assert len(topology_b.routes) == 0
 
+
 def test_route_ends_on_split_edge():
     topology = Topology()
     node_1 = Node(geo_node=Wgs84GeoNode(0, 0))
@@ -767,6 +771,7 @@ def test_split_without_split_edges_connected_topology():
             node_label_assignments={node_a1: Label.A_Topology, node_a4: Label.B_Topology},
         )
 
+
 def test_topology_with_two_color_problem():
     topology = Topology()
     node_1 = Node(geo_node=DbrefGeoNode(x=0, y=0))
@@ -788,10 +793,10 @@ def test_topology_with_two_color_problem():
 
     with pytest.raises(ValueError):
         topology_a, topology_b, _ = Split.split(
-            topology,
-            split_edges={edge_3: 5.0, edge_4: 5.0, edge_6: 5.0}
+            topology, split_edges={edge_3: 5.0, edge_4: 5.0, edge_6: 5.0}
         )
 
+
 def test_topology_with_two_color_problem_but_solvable():
     topology = Topology()
 
@@ -828,20 +833,19 @@ def test_topology_with_two_color_problem_but_solvable():
         [edge_1, edge_2, edge_3, edge_4, edge_5, edge_6, edge_7, edge_9, edge_10, edge_11]
     )
 
-    topology_a, topology_b, _ = Split.split(topology,
-                                            split_edges={edge_2: 5.0, edge_3: 5.0, edge_10: 2.795},
-                                            node_label_assignments={node_4: Label.A_Topology}
-                                            )
+    topology_a, topology_b, _ = Split.split(
+        topology,
+        split_edges={edge_2: 5.0, edge_3: 5.0, edge_10: 2.795},
+        node_label_assignments={node_4: Label.A_Topology},
+    )
     assert [node_4, node_1] in topology_a
     assert [node_3] in topology_b
 
+
 def test_validate_input():
     topology = Topology()
     with pytest.raises(ValueError):
-        topology_a, topology_b, _ = Split.split(
-            topology,
-            split_edges={Edge(Node(), Node()): 5.0}
-        )
+        topology_a, topology_b, _ = Split.split(topology, split_edges={Edge(Node(), Node()): 5.0})
 
     node_1 = Node(geo_node=DbrefGeoNode(x=0, y=0))
     node_3 = Node(geo_node=DbrefGeoNode(x=10, y=0))
@@ -861,13 +865,9 @@ def test_validate_input():
     topology.add_edges([edge_1, edge_3, edge_4, edge_5, edge_6, edge_7])
 
     with pytest.raises(ValueError):
-        topology_a, topology_b, _ = Split.split(
-            topology,
-            split_edges={Edge(Node(), Node()): 5.0}
-        )
+        topology_a, topology_b, _ = Split.split(topology, split_edges={Edge(Node(), Node()): 5.0})
 
     with pytest.raises(ValueError):
         topology_a, topology_b, _ = Split.split(
-            topology,
-            node_label_assignments={Node(): Label.A_Topology}
-        )
+            topology, node_label_assignments={Node(): Label.A_Topology}
+        )

yaramo/operations/split.py

@@ -69,8 +69,9 @@ def _add_elements_to_topology(
         _add_elements_to_topology(node_labels, topology_a.add_node, topology_b.add_node)
         _add_elements_to_topology(edge_labels, topology_a.add_edge, topology_b.add_edge)
         _add_elements_to_topology(signal_labels, topology_a.add_signal, topology_b.add_signal)
-        Split._assign_routes_to_topologies(topology, topology_a, topology_b, edge_labels, signal_labels)
-
+        Split._assign_routes_to_topologies(
+            topology, topology_a, topology_b, edge_labels, signal_labels
+        )
 
         Split._validate_for_data_loss(topology, topology_a, topology_b, split_edges)
 
@@ -96,7 +97,9 @@ def _validate_split_edges(topology: Topology, split_edges: Dict[Edge, float]):
                     )
 
     @staticmethod
-    def _validate_node_label_assignment(topology: Topology, node_label_assignment: Dict[Node, Label]):
+    def _validate_node_label_assignment(
+        topology: Topology, node_label_assignment: Dict[Node, Label]
+    ):
         for node in node_label_assignment:
             if node not in topology:
                 raise ValueError("Node of node label assignment not in topology.")
@@ -171,7 +174,10 @@ def _get_new_geo_node_same_type(_old_geo_node: GeoNode, x: float, y: float) -> G
             for route in topology.routes.values():
                 if edge in route.edges:
                     route.edges.remove(edge)
-                    if route.start_signal.edge not in route.edges or route.end_signal.edge not in route.edges:
+                    if (
+                        route.start_signal.edge not in route.edges
+                        or route.end_signal.edge not in route.edges
+                    ):
                         if route.start_signal.edge not in route.edges:
                             route.edges.add(route.start_signal.edge)
                         if route.end_signal.edge not in route.edges:
@@ -236,7 +242,9 @@ def _get_next_end_node_pair():
             for pair in new_end_nodes.values():
                 _node_a = pair[0]
                 _node_b = pair[1]
-                if (_node_a in node_labels and _node_b not in node_labels) or (_node_a not in node_labels and _node_b in node_labels):
+                if (_node_a in node_labels and _node_b not in node_labels) or (
+                    _node_a not in node_labels and _node_b in node_labels
+                ):
                     return pair
             return _get_any_unlabeled_end_node_pair()
 
@@ -249,7 +257,9 @@ def _get_next_end_node_pair():
                 _dfs(node_b, Label.B_Topology)
             elif node_a in node_labels and node_b in node_labels:
                 if node_labels[node_a] == node_labels[node_b]:
-                    raise ValueError("Split edges do not fully split or is not colorable with two colors. Split not possible.")
+                    raise ValueError(
+                        "Split edges do not fully split or is not colorable with two colors. Split not possible."
+                    )
             elif node_a in node_labels:
                 _dfs(node_b, Label.get_opposite_label(node_labels[node_a]))
             elif node_b in node_labels:
@@ -268,7 +278,13 @@ def _get_next_end_node_pair():
         return node_labels, edge_labels, signal_labels
 
     @staticmethod
-    def _assign_routes_to_topologies(topology: Topology, topology_a: Topology, topology_b: Topology, edge_labels: Dict[Edge, Label], signal_labels: Dict[Signal, Label]):
+    def _assign_routes_to_topologies(
+        topology: Topology,
+        topology_a: Topology,
+        topology_b: Topology,
+        edge_labels: Dict[Edge, Label],
+        signal_labels: Dict[Signal, Label],
+    ):
         for route in topology.routes.values():
             start_signal_label = signal_labels[route.start_signal]
             end_signal_label = signal_labels[route.end_signal]
@@ -286,8 +302,7 @@ def _assign_routes_to_topologies(topology: Topology, topology_a: Topology, topol
                 topology_a.add_route(route)
             else:
                 topology_b.add_route(route)
-            
-            
+
     @staticmethod
     def _assign_missing_elements_to_label(
         topology: Topology,
@@ -315,20 +330,14 @@ def _validate_for_data_loss(
     ):
         for node in topology.nodes.values():
             if node not in topology_a and node not in topology_b:
-                raise ValueError(
-                    "Unexpected data loss (lost node)."
-                )
+                raise ValueError("Unexpected data loss (lost node).")
 
         for edge in topology.edges.values():
             if edge in split_edges:
                 continue
             if edge not in topology_a and edge not in topology_b:
-                raise ValueError(
-                    "Unexpected data loss (lost edge)."
-                )
+                raise ValueError("Unexpected data loss (lost edge).")
 
         for signal in topology.signals.values():
             if signal not in topology_a and signal not in topology_b:
-                raise ValueError(
-                    "Unexpected data loss (lost signal)."
-                )
+                raise ValueError("Unexpected data loss (lost signal).")