more files

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

Author: Thijss

tests/unit/data_source/generator/test_grid_generators.py

@@ -31,7 +31,7 @@ def test_generate_random_grid():
     assert 2 == len(grid.source)
     assert 100 == 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]
     assert 10 == len(inactive_lines)
     assert len(grid.line) - 10 == grid.graphs.active_graph.nr_branches
@@ -61,8 +61,8 @@ def test_generate_random_nodes(grid: Grid):
     assert isinstance(loads_high, SymLoadArray)
 
     # All loads are coupled to a node in the nodes array
-    assert all(np.isin(loads_high.node, nodes.id))
-    assert all(np.isin(loads_low.node, nodes.id))
+    assert all(np.isin(loads_high["node"], nodes["id"]))
+    assert all(np.isin(loads_low["node"], nodes["id"]))
 
 
 def test_generate_random_sources(grid: Grid):
@@ -79,20 +79,20 @@ def test_generate_random_sources(grid: Grid):
     assert isinstance(sources, SourceArray)
 
     # All sources are coupled to a node in the nodes array
-    assert all(np.isin(sources.node, nodes.id))
+    assert all(np.isin(sources["node"], nodes["id"]))
 
 
 def test_generate_random_lines(grid: Grid):
     """Generate random lines"""
     nodes = NodeArray.zeros(4)
-    nodes.id = [0, 1, 2, 3]
-    nodes.u_rated = [10_500] * 4
+    nodes["id"] = [0, 1, 2, 3]
+    nodes["u_rated"] = [10_500] * 4
 
     sources = SourceArray.zeros(1)
-    sources.id = [4]
-    sources.node = [0]
-    sources.status = [1]
-    sources.u_ref = [1]
+    sources["id"] = [4]
+    sources["node"] = [0]
+    sources["status"] = [1]
+    sources["u_ref"] = [1]
 
     grid.append(nodes)
     grid.append(sources)
@@ -103,27 +103,27 @@ def test_generate_random_lines(grid: Grid):
     # We have generated at least 5 lines
     assert len(lines) >= 5
     # Two lines are inactive
-    inactive_line_mask = np.logical_or(lines.from_status == 0, lines.to_status == 0)
+    inactive_line_mask = np.logical_or(lines["from_status"] == 0, lines["to_status"] == 0)
     assert 2 == sum(inactive_line_mask)
 
     assert isinstance(lines, LineArray)
 
     # All lines have from and to nodes in the nodes array
-    assert all(np.isin(lines.from_node, nodes.id))
-    assert all(np.isin(lines.to_node, nodes.id))
+    assert all(np.isin(lines["from_node"], nodes["id"]))
+    assert all(np.isin(lines["to_node"], nodes["id"]))
 
 
 def test_create_routes(grid: Grid):
     """Generate new routes"""
     nodes = NodeArray.zeros(4)
-    nodes.id = [0, 1, 2, 3]
-    nodes.u_rated = [10_500] * 4
+    nodes["id"] = [0, 1, 2, 3]
+    nodes["u_rated"] = [10_500] * 4
 
     sources = SourceArray.zeros(1)
-    sources.id = [4]
-    sources.node = [0]
-    sources.status = [1]
-    sources.u_ref = [1]
+    sources["id"] = [4]
+    sources["node"] = [0]
+    sources["status"] = [1]
+    sources["u_ref"] = [1]
 
     grid.append(nodes)
     grid.append(sources)
@@ -136,15 +136,15 @@ def test_create_routes(grid: Grid):
     assert 2 == len(line_generator.line_array)
     # These lines are active
     inactive_line_mask = np.logical_or(
-        line_generator.line_array.from_status == 0,
-        line_generator.line_array.to_status == 0,
+        line_generator.line_array["from_status"] == 0,
+        line_generator.line_array["to_status"] == 0,
     )
     assert 0 == sum(inactive_line_mask)
 
-    # All lines have from node in sources.node
-    assert all(np.isin(line_generator.line_array.from_node, sources.node))
-    # All lines have to node in nodes.id
-    assert all(np.isin(line_generator.line_array.to_node, nodes.id))
+    # All lines have from node in sources["node"]
+    assert all(np.isin(line_generator.line_array["from_node"], sources["node"]))
+    # All lines have to node in nodes["id"]
+    assert all(np.isin(line_generator.line_array["to_node"], nodes["id"]))
 
 
 def test_determine_number_of_routes(grid: Grid):
@@ -172,21 +172,21 @@ def test_determine_number_of_routes(grid: Grid):
 def test_connect_nodes(grid: Grid):
     """Connect nodes"""
     nodes = NodeArray.zeros(4)
-    nodes.id = [0, 1, 2, 3]
-    nodes.u_rated = [10_500] * 4
+    nodes["id"] = [0, 1, 2, 3]
+    nodes["u_rated"] = [10_500] * 4
 
     sources = SourceArray.zeros(1)
-    sources.id = [4]
-    sources.node = [0]
-    sources.status = [1]
-    sources.u_ref = [1]
+    sources["id"] = [4]
+    sources["node"] = [0]
+    sources["status"] = [1]
+    sources["u_ref"] = [1]
 
     line_array = LineArray.zeros(1)
-    line_array.id = [5]
-    line_array.from_node = [0]
-    line_array.to_node = [1]
-    line_array.from_status = [1]
-    line_array.to_status = [1]
+    line_array["id"] = [5]
+    line_array["from_node"] = [0]
+    line_array["to_node"] = [1]
+    line_array["from_status"] = [1]
+    line_array["to_status"] = [1]
 
     grid.append(nodes)
     grid.append(sources)
@@ -209,21 +209,21 @@ def test_connect_nodes(grid: Grid):
 def test_create_nops(grid: Grid):
     """Create normally open points"""
     nodes = NodeArray.zeros(4)
-    nodes.id = [0, 1, 2, 3]
-    nodes.u_rated = [10_500] * 4
+    nodes["id"] = [0, 1, 2, 3]
+    nodes["u_rated"] = [10_500] * 4
 
     sources = SourceArray.zeros(1)
-    sources.id = [4]
-    sources.node = [0]
-    sources.status = [1]
-    sources.u_ref = [1]
+    sources["id"] = [4]
+    sources["node"] = [0]
+    sources["status"] = [1]
+    sources["u_ref"] = [1]
 
     line_array = LineArray.zeros(2)
-    line_array.id = [5, 6]
-    line_array.from_node = [0, 0]
-    line_array.to_node = [1, 2]
-    line_array.from_status = [1, 1]
-    line_array.to_status = [1, 1]
+    line_array["id"] = [5, 6]
+    line_array["from_node"] = [0, 0]
+    line_array["to_node"] = [1, 2]
+    line_array["from_status"] = [1, 1]
+    line_array["to_status"] = [1, 1]
 
     grid.append(nodes)
     grid.append(sources)
@@ -238,8 +238,8 @@ def test_create_nops(grid: Grid):
     assert 3 == len(line_generator.line_array)
     # This line is inactive
     inactive_line_mask = np.logical_or(
-        line_generator.line_array.from_status == 0,
-        line_generator.line_array.to_status == 0,
+        line_generator.line_array["from_status"] == 0,
+        line_generator.line_array["to_status"] == 0,
     )
     assert 1 == sum(inactive_line_mask)
 
@@ -251,8 +251,8 @@ def test_generate_random_grid_with_tranformers():
 
     # two ten to 3 kv transformers have been added
     assert 2 == len(grid.transformer)
-    assert all(np.isclose([10_500] * 2, grid.transformer.u1.tolist()))
-    assert all(np.isclose([3_000] * 2, grid.transformer.u2.tolist()))
+    assert all(np.isclose([10_500] * 2, grid.transformer["u1"].tolist()))
+    assert all(np.isclose([3_000] * 2, grid.transformer["u2"].tolist()))
 
     core_interface = PowerGridModelInterface(grid=grid)
     core_interface.create_input_from_grid()

tests/unit/model/grids/test_grid_search.py

@@ -14,7 +14,7 @@
 
 def test_grid_get_nearest_substation_node(basic_grid):
     substation_node = basic_grid.get_nearest_substation_node(node_id=103)
-    assert NodeType.SUBSTATION_NODE == substation_node.node_type
+    assert NodeType.SUBSTATION_NODE == substation_node["node_type"]
 
 
 def test_grid_get_nearest_substation_node_no_substation(basic_grid):
@@ -40,12 +40,12 @@ def test_get_downstream_nodes_from_substation_node(self):
 class TestGetBranchesInPath:
     def test_get_branches_in_path(self, basic_grid):
         branches = basic_grid.get_branches_in_path([106, 102, 101])
-        np.testing.assert_array_equal(branches.id, [301, 201])
+        np.testing.assert_array_equal(branches["id"], [301, 201])
 
     def test_get_branches_in_path_inactive(self, basic_grid):
         branches = basic_grid.get_branches_in_path([101, 102, 103, 104, 105])
         # branch 203 is the normally open point should not be in the result
-        np.testing.assert_array_equal(branches.id, [201, 202, 204, 601])
+        np.testing.assert_array_equal(branches["id"], [201, 202, 204, 601])
 
     def test_get_branches_in_path_one_node(self, basic_grid):
         branches = basic_grid.get_branches_in_path([106])
@@ -57,7 +57,7 @@ def test_get_branches_in_path_empty_path(self, basic_grid):
 
 
 def test_component_three_winding_transformer(grid_with_3wt):
-    substation_nodes = grid_with_3wt.node.filter(node_type=NodeType.SUBSTATION_NODE.value).id
+    substation_nodes = grid_with_3wt.node.filter(node_type=NodeType.SUBSTATION_NODE.value)["id"]
     with grid_with_3wt.graphs.active_graph.tmp_remove_nodes(substation_nodes):
         component_list = grid_with_3wt.graphs.active_graph.get_components()
 

tests/unit/model/grids/test_helpers.py

@@ -16,18 +16,18 @@ def test_set_feeder_ids(grid):
     grid = build_basic_grid(grid=grid)
 
     # Set all feeder ids to a value to check they have been reset
-    grid.branches.feeder_branch_id = 1
-    grid.node.feeder_branch_id = 1
-    grid.branches.feeder_node_id = 1
-    grid.node.feeder_node_id = 1
+    grid.branches["feeder_branch_id"] = 1
+    grid.node["feeder_branch_id"] = 1
+    grid.branches["feeder_node_id"] = 1
+    grid.node["feeder_node_id"] = 1
 
     grid.set_feeder_ids()
 
-    assert_array_equal(grid.branches.is_feeder, np.array([False, True, False, False, True, False]))
-    assert_array_equal(grid.branches.feeder_branch_id, np.array([201, 201, 201, EMPTY_ID, 204, 204]))
-    assert_array_equal(grid.node.feeder_branch_id, np.array([EMPTY_ID, 201, 201, 204, 204, 201]))
-    assert_array_equal(grid.branches.feeder_node_id, np.array([101, 101, 101, EMPTY_ID, 101, 101]))
-    assert_array_equal(grid.node.feeder_node_id, np.array([EMPTY_ID, 101, 101, 101, 101, 101]))
+    assert_array_equal(grid.branches["is_feeder"], np.array([False, True, False, False, True, False]))
+    assert_array_equal(grid.branches["feeder_branch_id"], np.array([201, 201, 201, EMPTY_ID, 204, 204]))
+    assert_array_equal(grid.node["feeder_branch_id"], np.array([EMPTY_ID, 201, 201, 204, 204, 201]))
+    assert_array_equal(grid.branches["feeder_node_id"], np.array([101, 101, 101, EMPTY_ID, 101, 101]))
+    assert_array_equal(grid.node["feeder_node_id"], np.array([EMPTY_ID, 101, 101, 101, 101, 101]))
 
 
 def test_set_feeder_ids_unconnected_node(grid):
@@ -37,11 +37,11 @@ def test_set_feeder_ids_unconnected_node(grid):
     grid.append(extra_node)
     grid.set_feeder_ids()
 
-    assert_array_equal(grid.branches.is_feeder, np.array([False, True, False, False, True, False]))
-    assert_array_equal(grid.branches.feeder_branch_id, np.array([201, 201, 201, EMPTY_ID, 204, 204]))
-    assert_array_equal(grid.node.feeder_branch_id, np.array([EMPTY_ID, 201, 201, 204, 204, 201, EMPTY_ID]))
-    assert_array_equal(grid.branches.feeder_node_id, np.array([101, 101, 101, EMPTY_ID, 101, 101]))
-    assert_array_equal(grid.node.feeder_node_id, np.array([EMPTY_ID, 101, 101, 101, 101, 101, EMPTY_ID]))
+    assert_array_equal(grid.branches["is_feeder"], np.array([False, True, False, False, True, False]))
+    assert_array_equal(grid.branches["feeder_branch_id"], np.array([201, 201, 201, EMPTY_ID, 204, 204]))
+    assert_array_equal(grid.node["feeder_branch_id"], np.array([EMPTY_ID, 201, 201, 204, 204, 201, EMPTY_ID]))
+    assert_array_equal(grid.branches["feeder_node_id"], np.array([101, 101, 101, EMPTY_ID, 101, 101]))
+    assert_array_equal(grid.node["feeder_node_id"], np.array([EMPTY_ID, 101, 101, 101, 101, 101, EMPTY_ID]))
 
 
 def test_set_feeder_ids_parallel_line(grid):
@@ -50,19 +50,19 @@ def test_set_feeder_ids_parallel_line(grid):
 
     # Add a second (parallel) line from 101 to 102
     extra_line = LineArray.empty(1)
-    extra_line.from_node = 101
-    extra_line.to_node = 102
-    extra_line.from_status = 1
-    extra_line.to_status = 1
+    extra_line["from_node"] = 101
+    extra_line["to_node"] = 102
+    extra_line["from_status"] = 1
+    extra_line["to_status"] = 1
     grid.append(extra_line)
 
     grid.set_feeder_ids()
 
-    assert_array_equal(grid.branches.is_feeder, np.array([False, True, False, False, True, True, False]))
-    assert_array_equal(grid.branches.feeder_branch_id, np.array([201, 201, 201, EMPTY_ID, 204, 201, 204]))
-    assert_array_equal(grid.node.feeder_branch_id, np.array([EMPTY_ID, 201, 201, 204, 204, 201]))
-    assert_array_equal(grid.branches.feeder_node_id, np.array([101, 101, 101, EMPTY_ID, 101, 101, 101]))
-    assert_array_equal(grid.node.feeder_node_id, np.array([EMPTY_ID, 101, 101, 101, 101, 101]))
+    assert_array_equal(grid.branches["is_feeder"], np.array([False, True, False, False, True, True, False]))
+    assert_array_equal(grid.branches["feeder_branch_id"], np.array([201, 201, 201, EMPTY_ID, 204, 201, 204]))
+    assert_array_equal(grid.node["feeder_branch_id"], np.array([EMPTY_ID, 201, 201, 204, 204, 201]))
+    assert_array_equal(grid.branches["feeder_node_id"], np.array([101, 101, 101, EMPTY_ID, 101, 101, 101]))
+    assert_array_equal(grid.node["feeder_node_id"], np.array([EMPTY_ID, 101, 101, 101, 101, 101]))
 
 
 def test_set_feeder_ids_inactive(grid):
@@ -74,11 +74,11 @@ def test_set_feeder_ids_inactive(grid):
 
     grid.set_feeder_ids()
 
-    assert_array_equal(grid.branches.is_feeder, np.array([False, True, False, False, True, False]))
-    assert_array_equal(grid.branches.feeder_branch_id, np.array([201, 201, 201, 201, EMPTY_ID, 201]))
-    assert_array_equal(grid.node.feeder_branch_id, np.array([EMPTY_ID, 201, 201, 201, 201, 201]))
-    assert_array_equal(grid.branches.feeder_node_id, np.array([101, 101, 101, 101, EMPTY_ID, 101]))
-    assert_array_equal(grid.node.feeder_node_id, np.array([EMPTY_ID, 101, 101, 101, 101, 101]))
+    assert_array_equal(grid.branches["is_feeder"], np.array([False, True, False, False, True, False]))
+    assert_array_equal(grid.branches["feeder_branch_id"], np.array([201, 201, 201, 201, EMPTY_ID, 201]))
+    assert_array_equal(grid.node["feeder_branch_id"], np.array([EMPTY_ID, 201, 201, 201, 201, 201]))
+    assert_array_equal(grid.branches["feeder_node_id"], np.array([101, 101, 101, 101, EMPTY_ID, 101]))
+    assert_array_equal(grid.node["feeder_node_id"], np.array([EMPTY_ID, 101, 101, 101, 101, 101]))
 
 
 def test_set_feeder_to_node(grid):
@@ -96,17 +96,17 @@ def test_set_feeder_to_node(grid):
 
     # Add Lines
     lines = LineArray.empty(2)
-    lines.id = [200, 201]
-    lines.from_status = [1] * 2
-    lines.to_status = [1] * 2
-    lines.from_node = [100, 102]
-    lines.to_node = [101, 101]
+    lines["id"] = [200, 201]
+    lines["from_status"] = [1] * 2
+    lines["to_status"] = [1] * 2
+    lines["from_node"] = [100, 102]
+    lines["to_node"] = [101, 101]
     grid.append(lines, check_max_id=False)
 
     grid.set_feeder_ids()
 
-    assert_array_equal(grid.branches.is_feeder, np.array([False, True]))
-    assert_array_equal(grid.branches.feeder_branch_id, np.array([EMPTY_ID, 201]))
-    assert_array_equal(grid.node.feeder_branch_id, np.array([EMPTY_ID, EMPTY_ID, 201]))
-    assert_array_equal(grid.branches.feeder_node_id, np.array([EMPTY_ID, 101]))
-    assert_array_equal(grid.node.feeder_node_id, np.array([EMPTY_ID, EMPTY_ID, 101]))
+    assert_array_equal(grid.branches["is_feeder"], np.array([False, True]))
+    assert_array_equal(grid.branches["feeder_branch_id"], np.array([EMPTY_ID, 201]))
+    assert_array_equal(grid.node["feeder_branch_id"], np.array([EMPTY_ID, EMPTY_ID, 201]))
+    assert_array_equal(grid.branches["feeder_node_id"], np.array([EMPTY_ID, 101]))
+    assert_array_equal(grid.node["feeder_node_id"], np.array([EMPTY_ID, EMPTY_ID, 101]))