Skip to content

Commit 9e76880

Browse files
committed
rename method to .in_branches
Signed-off-by: Thijs Baaijen <13253091+Thijss@users.noreply.github.com>
1 parent 369498b commit 9e76880

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

src/power_grid_model_ds/_core/model/graphs/models/base.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ def has_node(self, node_id: int) -> bool:
7373

7474
return self._has_node(node_id=internal_node_id)
7575

76-
def in_edges(self, node_id: int) -> Generator[tuple[int, int], None, None]:
76+
def in_branches(self, node_id: int) -> Generator[tuple[int, int], None, None]:
7777
"""Return all edges a node occurs in."""
7878
int_node_id = self.external_to_internal(node_id)
79-
internal_edges = self._in_edges(int_node_id=int_node_id)
79+
internal_edges = self._in_branches(int_node_id=int_node_id)
8080
return (
8181
(self.internal_to_external(source), self.internal_to_external(target)) for source, target in internal_edges
8282
)
@@ -194,9 +194,8 @@ def tmp_remove_nodes(self, nodes: list[int]) -> Generator:
194194
"""
195195
edge_list = []
196196
for node in nodes:
197-
internal_node = self.external_to_internal(node)
198-
edge_list += list(self.in_edges(node))
199-
self._delete_node(internal_node)
197+
edge_list += list(self.in_branches(node))
198+
self.delete_node(node)
200199
yield
201200

202201
for node in nodes:
@@ -311,7 +310,7 @@ def _branch_is_relevant(self, branch: BranchArray) -> bool:
311310
return True
312311

313312
@abstractmethod
314-
def _in_edges(self, int_node_id: int) -> Generator[tuple[int, int], None, None]:
313+
def _in_branches(self, int_node_id: int) -> Generator[tuple[int, int], None, None]:
315314
"""Return all edges a node occurs in.
316315
Return a list of tuples with the source and target node id.
317316
These are internal node ids.

src/power_grid_model_ds/_core/model/graphs/models/rustworkx.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def _get_connected(self, node_id: int, nodes_to_ignore: list[int], inclusive: bo
100100

101101
return connected_nodes
102102

103-
def _in_edges(self, int_node_id: int) -> Generator[tuple[int, int], None, None]:
103+
def _in_branches(self, int_node_id: int) -> Generator[tuple[int, int], None, None]:
104104
return ((source, target) for source, target, _ in self._graph.in_edges(int_node_id))
105105

106106
def _find_fundamental_cycles(self) -> list[list[int]]:

tests/unit/model/graphs/test_graph_model.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ def test_graph_all_branches_parallel(graph):
5757
assert [(1, 2), (1, 2), (2, 1)] == list(graph.all_branches)
5858

5959

60-
def test_graph_in_edges(graph):
60+
def test_graph_in_branches(graph):
6161
graph.add_node(1)
6262
graph.add_node(2)
6363
graph.add_branch(1, 2)
6464
graph.add_branch(1, 2)
6565
graph.add_branch(2, 1)
6666

67-
assert [(2, 1), (2, 1), (2, 1)] == list(graph.in_edges(1))
68-
assert [(1, 2), (1, 2), (1, 2)] == list(graph.in_edges(2))
67+
assert [(2, 1), (2, 1), (2, 1)] == list(graph.in_branches(1))
68+
assert [(1, 2), (1, 2), (1, 2)] == list(graph.in_branches(2))
6969

7070

7171
def test_graph_delete_branch(graph):

0 commit comments

Comments
 (0)