down merge

Signed-off-by: Tony Xiang <[email protected]>

Author: TonyXiang8787

.pre-commit-config.yaml

@@ -15,7 +15,6 @@ repos:
     rev: 22.6.0
     hooks:
       - id: black
-        language_version: python3.8
   - repo: local
     hooks:
       - id: pylint

src/power_grid_model/validation/utils.py

@@ -215,6 +215,8 @@ def update_input_data(input_data: Dict[str, np.ndarray], update_data: Dict[str,
                 mask = ~np.isnan(array[field])
             else:
                 mask = np.not_equal(array[field], nan)
+            if mask.ndim == 2:
+                mask = np.any(mask, axis=1)
             data = array[["id", field]][mask]
             idx = np.where(merged_data[component]["id"] == np.reshape(data["id"], (-1, 1)))
             if isinstance(idx, tuple):

tests/unit/validation/test_batch_validation.py

@@ -7,7 +7,7 @@
 import numpy as np
 import pytest
 
-from power_grid_model import initialize_array
+from power_grid_model import LoadGenType, initialize_array
 from power_grid_model.validation import validate_batch_data
 from power_grid_model.validation.errors import (
     MultiComponentNotUniqueError,
@@ -32,15 +32,34 @@ def input_data() -> Dict[str, np.ndarray]:
     line["c1"] = 3.0
     line["tan1"] = 4.0
     line["i_n"] = 5.0
-    return {"node": node, "line": line}
+
+    asym_load = initialize_array("input", "asym_load", 2)
+    asym_load["id"] = [9, 10]
+    asym_load["node"] = [1, 2]
+    asym_load["status"] = [1, 1]
+    asym_load["type"] = [LoadGenType.const_power, LoadGenType.const_power]
+    asym_load["p_specified"] = [[11e6, 12e6, 13e6], [21e6, 22e6, 23e6]]
+    asym_load["q_specified"] = [[11e5, 12e5, 13e5], [21e5, 22e5, 23e5]]
+
+    return {"node": node, "line": line, "asym_load": asym_load}
 
 
 @pytest.fixture
 def batch_data() -> Dict[str, np.ndarray]:
     line = initialize_array("update", "line", (3, 2))
     line["id"] = [[5, 6], [6, 7], [7, 5]]
     line["from_status"] = [[1, 1], [1, 1], [1, 1]]
-    return {"line": line}
+
+    # Add batch for asym_load, which has 2-D array for p_specified
+    asym_load = initialize_array("update", "asym_load", (3, 2))
+    asym_load["id"] = [[9, 10], [9, 10], [9, 10]]
+
+    return {"line": line, "asym_load": asym_load}
+
+
+def test_validate_batch_data(input_data, batch_data):
+    errors = validate_batch_data(input_data, batch_data)
+    assert not errors
 
 
 def test_validate_batch_data_input_error(input_data, batch_data):

tests/unit/validation/test_utils.py

@@ -388,6 +388,28 @@ def test_update_input_data_int_nan():
     np.testing.assert_array_equal(merged["line"]["from_status"], [0, -128, 1])
 
 
+def test_update_input_data_asym_nans():
+    input_load = initialize_array("input", "asym_load", 3)
+    input_load["id"] = [1, 2, 3]
+    input_load["p_specified"] = [[1.1, 1.2, 1.3], [2.1, np.nan, np.nan], [np.nan, np.nan, np.nan]]
+
+    update_load = initialize_array("update", "asym_load", 3)
+    update_load["id"] = [1, 2, 3]
+    update_load["p_specified"] = [[np.nan, np.nan, np.nan], [np.nan, np.nan, 5.3], [6.1, 6.2, 6.3]]
+
+    merged = update_input_data(input_data={"asym_load": input_load}, update_data={"asym_load": update_load})
+
+    # The desired result would be to update all non-NaN values individually:
+    # np.testing.assert_array_equal(
+    #     merged["asym_load"]["p_specified"], [[1.1, 1.2, 1.3], [2.1, np.nan, 5.3], [6.1, 6.2, 6.3]]
+    # )
+
+    # The current C++ implementation updates the entire 3-phase value is one of the elements is non-NaN:
+    np.testing.assert_array_equal(
+        merged["asym_load"]["p_specified"], [[1.1, 1.2, 1.3], [np.nan, np.nan, 5.3], [6.1, 6.2, 6.3]]
+    )
+
+
 def test_errors_to_string_no_errors():
     assert errors_to_string(errors=None) == "the data: OK"
     assert errors_to_string(errors=[]) == "the data: OK"