parouby/Pamhyr2
1
0 Fork 0
mirror of https://gitlab.com/pamhyr/pamhyr2.git synced 2026-10-30 03:20:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Network: Fix edge delete whene there are multiple edge between two node.

Browse Source
This commit is contained in:
Pierre-Antoine Rouby committed 2024-04-16 15:15:30 +02:00
1 parent 9c5ea0bdd9
commit 0c0d7f3481
5 files changed
+22 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Model/Network/Graph.py
+9 -19
View File
@@ -142,26 +142,21 @@ class Graph(object):
def insert_node(self, node):
return self._add_node(node)
def remove_node(self, node_name: str):
self._nodes = list(
filter(
lambda n: n.name != node_name,
self._nodes
)
)
self._remove_associated_edge(node_name)
def remove_node(self, node):
self._nodes.remove(node)
self._remove_associated_edge(node)
self._status.modified()
def _remove_associated_edge(self, node_name: str):
def _remove_associated_edge(self, node: str):
edges = list(
filter(
lambda e: (e.node1.name == node_name or
e.node2.name == node_name),
lambda e: (e.node1 == node or
e.node2 == node),
self._edges,
)
)
for edge in edges:
self.remove_edge(edge.name)
self.remove_edge(edge)
def create_node(self, x: float = 0.0, y: float = 0.0):
node = self._create_node(x, y)
@@ -197,13 +192,8 @@ class Graph(object):
def create_edge(self, n1: Node, n2: Node):
return self._create_edge(n1, n2)
def remove_edge(self, edge_name: str):
self._edges = list(
filter(
lambda e: e.name != edge_name,
self._edges
)
)
def remove_edge(self, edge):
self._edges.remove(edge)
self._status.modified()
def is_upstream_node(self, node):
src/Model/Network/test_network.py
+3 -3
View File
@@ -60,7 +60,7 @@ class GraphTestCase(unittest.TestCase):
e0 = g.add_edge(n0, n1)
g.remove_edge(e0.name)
g.remove_edge(e0)
self.assertEqual(g.nodes_counts(), 2)
self.assertEqual(g.edges_counts(), 0)
@@ -73,7 +73,7 @@ class GraphTestCase(unittest.TestCase):
e0 = g.add_edge(n0, n1)
g.remove_node(n0.name)
g.remove_node(n0)
self.assertEqual(g.nodes_counts(), 1)
self.assertEqual(g.edges_counts(), 0)
@@ -88,7 +88,7 @@ class GraphTestCase(unittest.TestCase):
e0 = g.add_edge(n0, n1)
e1 = g.add_edge(n1, n2)
g.remove_node(n1.name)
g.remove_node(n1)
self.assertEqual(g.nodes_counts(), 2)
self.assertEqual(g.edges_counts(), 0)