Skip to content

Commit a0104e3

Browse files
authored
Fix: update confusing private name (#101)
* Fix a confusing name (_add_branch_array -> _delete_branch_array) Signed-off-by: Thijs Baaijen <[email protected]> * update uv lock Signed-off-by: Thijs Baaijen <[email protected]> * Update docstring Signed-off-by: Thijs Baaijen <[email protected]> * Add tests Signed-off-by: Thijs Baaijen <[email protected]> --------- Signed-off-by: Thijs Baaijen <[email protected]>
1 parent 06618b7 commit a0104e3

File tree

3 files changed

+43
-5
lines changed

3 files changed

+43
-5
lines changed

src/power_grid_model_ds/_core/model/grids/base.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ def delete_branch(self, branch: BranchArray) -> None:
221221
Args:
222222
branch (BranchArray): The branch to remove
223223
"""
224-
_add_branch_array(branch=branch, grid=self)
224+
_delete_branch_array(branch=branch, grid=self)
225225
self.graphs.delete_branch(branch=branch)
226226
logging.debug(
227227
f"""deleted branch {branch.id.item()} from {branch.from_node.item()} to {branch.to_node.item()}"""
@@ -233,7 +233,7 @@ def delete_branch3(self, branch: Branch3Array) -> None:
233233
Args:
234234
branch (Branch3Array): The branch3 to remove
235235
"""
236-
_add_branch_array(branch=branch, grid=self)
236+
_delete_branch_array(branch=branch, grid=self)
237237
self.graphs.delete_branch3(branch=branch)
238238

239239
def add_node(self, node: NodeArray) -> None:
@@ -459,8 +459,8 @@ def from_extended(cls, extended: "Grid") -> "Grid":
459459
return new_grid
460460

461461

462-
def _add_branch_array(branch: BranchArray | Branch3Array, grid: Grid):
463-
"""Add a branch array to the grid"""
462+
def _delete_branch_array(branch: BranchArray | Branch3Array, grid: Grid):
463+
"""Delete a branch array from the grid"""
464464
array_field = grid.find_array_field(branch.__class__)
465465
array_attr = getattr(grid, array_field.name)
466466
setattr(grid, array_field.name, array_attr.exclude(id=branch.id))

tests/unit/model/grids/test_grid_base.py

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
LineArray,
1616
LinkArray,
1717
NodeArray,
18+
ThreeWindingTransformerArray,
1819
TransformerArray,
1920
TransformerTapRegulatorArray,
2021
)
@@ -227,6 +228,42 @@ def test_grid_delete_tranformer(basic_grid: Grid):
227228
assert not grid.graphs.complete_graph.has_branch(transformer.from_node.item(), transformer.to_node.item())
228229

229230

231+
def test_grid_add_three_winding_transformer():
232+
grid = Grid.empty()
233+
nodes = NodeArray.zeros(3)
234+
nodes.id = [102, 103, 104]
235+
grid.append(nodes)
236+
237+
three_winding_transformer = ThreeWindingTransformerArray.zeros(1)
238+
three_winding_transformer.node_1 = 102
239+
three_winding_transformer.node_2 = 103
240+
three_winding_transformer.node_3 = 104
241+
three_winding_transformer.status_1 = 1
242+
three_winding_transformer.status_2 = 1
243+
three_winding_transformer.status_3 = 1
244+
grid.append(three_winding_transformer)
245+
246+
assert 1 == len(grid.three_winding_transformer)
247+
assert grid.graphs.active_graph.has_branch(102, 103)
248+
assert grid.graphs.active_graph.has_branch(102, 104)
249+
assert grid.graphs.active_graph.has_branch(103, 104)
250+
251+
252+
def test_grid_delete_three_winding_transformer(grid_with_3wt: Grid):
253+
grid = grid_with_3wt
254+
assert grid.graphs.active_graph.has_branch(101, 102)
255+
assert grid.graphs.active_graph.has_branch(101, 103)
256+
assert grid.graphs.active_graph.has_branch(102, 103)
257+
258+
grid.delete_branch3(branch=grid.three_winding_transformer[0])
259+
260+
assert 0 == len(grid.three_winding_transformer)
261+
262+
assert not grid.graphs.active_graph.has_branch(101, 102)
263+
assert not grid.graphs.active_graph.has_branch(101, 103)
264+
assert not grid.graphs.active_graph.has_branch(102, 103)
265+
266+
230267
def test_grid_activate_branch(basic_grid: Grid):
231268
grid = basic_grid
232269

uv.lock

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)