more files

Signed-off-by: Thijs Baaijen <[email protected]>

Author: Thijss

tests/unit/model/graphs/test_graph_model.py

@@ -209,7 +209,7 @@ def test_get_components_with_tmp_removed_substation_nodes(graph_with_2_routes):
 
 def test_from_arrays(basic_grid: Grid):
     new_graph = basic_grid.graphs.complete_graph.__class__.from_arrays(basic_grid)
-    assert_array_equal(new_graph.external_ids, basic_grid.node.id)
+    assert_array_equal(new_graph.external_ids, basic_grid.node["id"])
 
 
 class TestPathMethods:

tests/unit/model/grids/test_grid_base.py

@@ -77,7 +77,7 @@ def test_grid_build(basic_grid: Grid):
     # 4 of these have a load attaches
     assert 4 == len(grid.sym_load)
 
-    inactive_mask = np.logical_or(grid.line.from_status == 0, grid.line.to_status == 0)
+    inactive_mask = np.logical_or(grid.line["from_status"] == 0, grid.line["to_status"] == 0)
     inactive_lines = grid.line[inactive_mask]
     # we have placed 1 normally open point
     assert 1 == len(inactive_lines)
@@ -90,7 +90,7 @@ def test_grid_build(basic_grid: Grid):
     assert nr_branches == grid.graphs.complete_graph.nr_branches
     assert nr_branches - 1 == grid.graphs.active_graph.nr_branches
 
-    inactive_mask = np.logical_or(grid.line.from_status == 0, grid.line.to_status == 0)
+    inactive_mask = np.logical_or(grid.line["from_status"] == 0, grid.line["to_status"] == 0)
     inactive_lines = grid.line[inactive_mask]
     # we have placed 1 normally open point
     assert 1 == len(inactive_lines)
@@ -106,8 +106,8 @@ def test_grid_add_node(basic_grid: Grid):
     grid.add_node(node=new_node)
 
     assert 7 == len(grid.node)
-    assert EMPTY_ID not in grid.node.id
-    assert grid.node[-1].id.item() in grid.graphs.complete_graph.external_ids
+    assert EMPTY_ID not in grid.node["id"]
+    assert grid.node[-1]["id"].item() in grid.graphs.complete_graph.external_ids
     assert EMPTY_ID not in grid.graphs.complete_graph.external_ids
 
 
@@ -118,23 +118,23 @@ def test_grid_delete_node(basic_grid: Grid):
     grid.delete_node(node=target_node)
 
     assert 5 == len(grid.node)
-    assert target_node.id not in grid.node.id
+    assert target_node["id"] not in grid.node["id"]
 
 
 # pylint: disable=no-member
 def test_grid_add_line(basic_grid: Grid):
     grid = basic_grid
 
     line = LineArray.zeros(1)
-    line.from_node = 102
-    line.to_node = 105
+    line["from_node"] = 102
+    line["to_node"] = 105
 
     assert not grid.graphs.complete_graph.has_branch(102, 105)
 
     grid.add_branch(branch=line)
 
     assert 5 == len(grid.line)
-    assert EMPTY_ID not in grid.line.id
+    assert EMPTY_ID not in grid.line["id"]
     assert grid.graphs.complete_graph.has_branch(102, 105)
 
 
@@ -143,36 +143,36 @@ def test_grid_delete_line(basic_grid: Grid):
 
     line = grid.line.get(201)
 
-    assert grid.graphs.complete_graph.has_branch(line.from_node.item(), line.to_node.item())
+    assert grid.graphs.complete_graph.has_branch(line["from_node"].item(), line["to_node"].item())
 
     grid.delete_branch(branch=line)
 
     assert 3 == len(grid.line)
-    assert line.id not in grid.line.id
+    assert line["id"] not in grid.line["id"]
 
-    assert not grid.graphs.complete_graph.has_branch(line.from_node.item(), line.to_node.item())
+    assert not grid.graphs.complete_graph.has_branch(line["from_node"].item(), line["to_node"].item())
 
 
 def test_grid_delete_inactive_line(basic_grid: Grid):
     grid = basic_grid
 
-    inactive_mask = grid.line.from_status == 0
+    inactive_mask = grid.line["from_status"] == 0
     target_line = grid.line[inactive_mask]
 
-    assert grid.graphs.complete_graph.has_branch(target_line.from_node.item(), target_line.to_node.item())
+    assert grid.graphs.complete_graph.has_branch(target_line["from_node"].item(), target_line["to_node"].item())
 
     grid.delete_branch(branch=target_line)
 
     assert 3 == len(grid.line)
-    assert target_line.id not in grid.line.id
+    assert target_line["id"] not in grid.line["id"]
 
-    assert not grid.graphs.complete_graph.has_branch(target_line.from_node.item(), target_line.to_node.item())
+    assert not grid.graphs.complete_graph.has_branch(target_line["from_node"].item(), target_line["to_node"].item())
 
 
 def test_grid_delete_transformer_with_regulator(basic_grid: Grid):
     grid = basic_grid
     transformer_regulator = TransformerTapRegulatorArray.zeros(1)
-    transformer_regulator.regulated_object = 301
+    transformer_regulator["regulated_object"] = 301
     grid.append(transformer_regulator)
 
     assert 1 == len(grid.transformer_tap_regulator)
@@ -181,66 +181,66 @@ def test_grid_delete_transformer_with_regulator(basic_grid: Grid):
     grid.delete_branch(branch=transformer)
 
     assert 0 == len(grid.transformer)
-    assert transformer.id not in grid.transformer.id
+    assert transformer["id"] not in grid.transformer["id"]
 
 
 def test_grid_add_link(basic_grid: Grid):
     grid = basic_grid
 
     new_link_array = LinkArray.zeros(1)
-    new_link_array.from_node = 105
-    new_link_array.to_node = 103
+    new_link_array["from_node"] = 105
+    new_link_array["to_node"] = 103
 
     assert 1 == len(grid.link)
     assert not grid.graphs.complete_graph.has_branch(105, 103)
     grid.add_branch(new_link_array)
     assert 2 == len(grid.link)
-    assert EMPTY_ID not in grid.link.id
+    assert EMPTY_ID not in grid.link["id"]
     assert grid.graphs.complete_graph.has_branch(105, 103)
 
 
 def test_grid_add_tranformer(basic_grid: Grid):
     grid = basic_grid
 
     new_transformer_array = TransformerArray.zeros(1)
-    new_transformer_array.from_node = 105
-    new_transformer_array.to_node = 103
+    new_transformer_array["from_node"] = 105
+    new_transformer_array["to_node"] = 103
 
     assert 1 == len(grid.transformer)
     assert not grid.graphs.complete_graph.has_branch(105, 103)
     grid.add_branch(new_transformer_array)
     assert 2 == len(grid.transformer)
-    assert EMPTY_ID not in grid.transformer.id
+    assert EMPTY_ID not in grid.transformer["id"]
     assert grid.graphs.complete_graph.has_branch(105, 103)
 
 
 def test_grid_delete_tranformer(basic_grid: Grid):
     grid = basic_grid
 
     transformer = grid.transformer.get(301)
-    assert grid.graphs.complete_graph.has_branch(transformer.from_node.item(), transformer.to_node.item())
+    assert grid.graphs.complete_graph.has_branch(transformer["from_node"].item(), transformer["to_node"].item())
 
     grid.delete_branch(branch=transformer)
 
     assert 0 == len(grid.transformer)
-    assert transformer.id not in grid.transformer.id
+    assert transformer["id"] not in grid.transformer["id"]
 
-    assert not grid.graphs.complete_graph.has_branch(transformer.from_node.item(), transformer.to_node.item())
+    assert not grid.graphs.complete_graph.has_branch(transformer["from_node"].item(), transformer["to_node"].item())
 
 
 def test_grid_add_three_winding_transformer():
     grid = Grid.empty()
     nodes = NodeArray.zeros(3)
-    nodes.id = [102, 103, 104]
+    nodes["id"] = [102, 103, 104]
     grid.append(nodes)
 
     three_winding_transformer = ThreeWindingTransformerArray.zeros(1)
-    three_winding_transformer.node_1 = 102
-    three_winding_transformer.node_2 = 103
-    three_winding_transformer.node_3 = 104
-    three_winding_transformer.status_1 = 1
-    three_winding_transformer.status_2 = 1
-    three_winding_transformer.status_3 = 1
+    three_winding_transformer["node_1"] = 102
+    three_winding_transformer["node_2"] = 103
+    three_winding_transformer["node_3"] = 104
+    three_winding_transformer["status_1"] = 1
+    three_winding_transformer["status_2"] = 1
+    three_winding_transformer["status_3"] = 1
     grid.append(three_winding_transformer)
 
     assert 1 == len(grid.three_winding_transformer)
@@ -268,56 +268,56 @@ def test_grid_activate_branch(basic_grid: Grid):
     grid = basic_grid
 
     line = grid.line.get(203)
-    assert line.from_status == 0 or line.to_status == 0
+    assert line["from_status"] == 0 or line["to_status"] == 0
 
-    assert not grid.graphs.active_graph.has_branch(line.from_node.item(), line.to_node.item())
+    assert not grid.graphs.active_graph.has_branch(line["from_node"].item(), line["to_node"].item())
 
     grid.make_active(branch=line)
 
-    assert grid.graphs.active_graph.has_branch(line.from_node.item(), line.to_node.item())
+    assert grid.graphs.active_graph.has_branch(line["from_node"].item(), line["to_node"].item())
 
     target_line_after = grid.line.get(203)
-    assert target_line_after.from_status == 1
-    assert target_line_after.to_status == 1
+    assert target_line_after["from_status"] == 1
+    assert target_line_after["to_status"] == 1
 
 
 def test_grid_inactivate_branch(basic_grid: Grid):
     grid = basic_grid
 
     target_line = grid.line.get(202)
-    assert target_line.from_status == 1 and target_line.to_status == 1
+    assert target_line["from_status"] == 1 and target_line["to_status"] == 1
     grid.make_inactive(branch=target_line)
 
     target_line_after = grid.line.get(202)
-    assert target_line_after.from_status == 1
-    assert target_line_after.to_status == 0
+    assert target_line_after["from_status"] == 1
+    assert target_line_after["to_status"] == 0
 
     graph = grid.graphs.active_graph
-    assert not graph.has_branch(target_line.from_node.item(), target_line.to_node.item())
+    assert not graph.has_branch(target_line["from_node"].item(), target_line["to_node"].item())
 
 
 def test_grid_make_inactive_from_side(basic_grid: Grid):
     grid = basic_grid
 
     target_line = grid.line.get(202)
     # line 7 is expected to be active
-    assert target_line.from_status == 1 and target_line.to_status == 1
+    assert target_line["from_status"] == 1 and target_line["to_status"] == 1
     grid.make_inactive(branch=target_line, at_to_side=False)
 
     target_line_after = grid.line.get(202)
-    assert 0 == target_line_after.from_status
+    assert 0 == target_line_after["from_status"]
 
 
 def test_grid_make_inactive_to_side(basic_grid: Grid):
     grid = basic_grid
 
     target_line = grid.line.get(202)
     # line 7 is expected to be active
-    assert target_line.from_status == 1 and target_line.to_status == 1
+    assert target_line["from_status"] == 1 and target_line["to_status"] == 1
     grid.make_inactive(branch=target_line)
 
     target_line_after = grid.line.get(202)
-    assert 0 == target_line_after.to_status
+    assert 0 == target_line_after["to_status"]
 
 
 def test_grid_as_str(basic_grid: Grid):
@@ -344,7 +344,7 @@ def test_from_txt_lines(self):
         assert 8 == grid.node.size
         assert 1 == grid.branches.filter(to_status=0).size
         assert 1 == grid.transformer.size
-        np.testing.assert_array_equal([14, 10, 11, 12, 13, 15, 16, 17], grid.branches.id)
+        np.testing.assert_array_equal([14, 10, 11, 12, 13, 15, 16, 17], grid.branches["id"])
 
     def test_from_txt_string(self):
         txt_string = "S1 2\nS1 3 open\n2 7\n3 5\n3 6 transformer\n5 7\n7 8\n8 9"
@@ -373,7 +373,7 @@ def test_from_txt_with_branch_ids(self):
         assert 8 == grid.node.size
         assert 1 == grid.branches.filter(to_status=0).size
         assert 1 == grid.transformer.size
-        np.testing.assert_array_equal([95, 91, 92, 93, 94, 96, 97, 98], grid.branches.id)
+        np.testing.assert_array_equal([95, 91, 92, 93, 94, 96, 97, 98], grid.branches["id"])
 
     def test_from_txt_with_conflicting_ids(self):
         with pytest.raises(ValueError):
@@ -400,4 +400,4 @@ def test_from_txt_file(self, tmp_path: Path):
         assert 8 == grid.node.size
         assert 1 == grid.branches.filter(to_status=0).size
         assert 1 == grid.transformer.size
-        np.testing.assert_array_equal([14, 10, 11, 12, 13, 15, 16, 17], grid.branches.id)
+        np.testing.assert_array_equal([14, 10, 11, 12, 13, 15, 16, 17], grid.branches["id"])