Merge pull request #670 from PowerGridModel/bugfix/fix-669-regulator-…

…without-other-trafo-type fix #669 transformer tap regulator without other transformer type in data
PowerGridModel · Jul 9, 2024 · 4dd45b0 · 4dd45b0
2 parents a6d607b + 22237ca
commit 4dd45b0
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 4 deletions.
diff --git a/src/power_grid_model/validation/rules.py b/src/power_grid_model/validation/rules.py
@@ -917,10 +917,11 @@ def all_supported_tap_control_side(  # pylint: disable=too-many-arguments
     invalid = np.zeros_like(mask)
 
     for ref_component, ref_field in tap_side_fields:
-        indices = get_indexer(data[ref_component]["id"], data[component][regulated_object_field], default_value=-1)
-        found = indices != -1
-        ref_comp_values = data[ref_component][ref_field][indices[found]]
-        invalid[found] = np.logical_or(invalid[found], values[found] == ref_comp_values)
+        if ref_component in data:
+            indices = get_indexer(data[ref_component]["id"], data[component][regulated_object_field], default_value=-1)
+            found = indices != -1
+            ref_comp_values = data[ref_component][ref_field][indices[found]]
+            invalid[found] = np.logical_or(invalid[found], values[found] == ref_comp_values)
 
     if invalid.any():
         return [

diff --git a/tests/unit/validation/test_rules.py b/tests/unit/validation/test_rules.py
@@ -27,6 +27,7 @@
     NotUniqueError,
     SameValueError,
     TwoValuesZeroError,
+    UnsupportedTransformerRegulationError,
 )
 from power_grid_model.validation.rules import (
     all_between,
@@ -44,6 +45,7 @@
     all_less_than,
     all_not_two_values_equal,
     all_not_two_values_zero,
+    all_supported_tap_control_side,
     all_unique,
     all_valid_clocks,
     all_valid_enum_values,
@@ -545,3 +547,34 @@ def test_all_valid_fault_phases():
     errors = all_valid_fault_phases(invalid, "fault", "foo", "bar")
     assert len(errors) == 1
     assert FaultPhaseError("fault", fields=["foo", "bar"], ids=list(range(26))) in errors
+
+
+def test_supported_tap_control_side():
+    valid = {
+        "foo": np.array([(0, 4)], dtype=[("id", "i4"), ("foofoo", "i1")]),
+        "bar": np.array([(1, 5)], dtype=[("id", "i4"), ("barbar", "i1")]),
+        "regulator": np.array([(2, 0, 6), (3, 1, 7)], dtype=[("id", "i4"), ("regulated", "i4"), ("control", "i1")]),
+    }
+    errors = all_supported_tap_control_side(
+        valid,
+        "regulator",
+        "control",
+        "regulated",
+        [("foo", "foofoo"), ("bar", "barbar"), ("baz", "bazbaz")],
+    )
+    assert not errors
+
+    invalid = {
+        "foo": np.array([(0, 4)], dtype=[("id", "i4"), ("foofoo", "i1")]),
+        "bar": np.array([(1, 5)], dtype=[("id", "i4"), ("barbar", "i1")]),
+        "regulator": np.array([(2, 0, 4), (3, 1, 5)], dtype=[("id", "i4"), ("regulated", "i4"), ("control", "i1")]),
+    }
+    errors = all_supported_tap_control_side(
+        invalid,
+        "regulator",
+        "control",
+        "regulated",
+        [("foo", "foofoo"), ("bar", "barbar"), ("baz", "bazbaz")],
+    )
+    assert len(errors) == 1
+    assert UnsupportedTransformerRegulationError(component="regulator", fields=["control", "regulated"], ids=[2, 3])