Add AsymPowerSensorArray

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

Author: Thijss

src/power_grid_model_ds/_core/model/arrays/__init__.py

@@ -9,6 +9,7 @@
 from power_grid_model_ds._core.model.arrays.pgm_arrays import (
     AsymCurrentSensorArray,
     AsymLineArray,
+    AsymPowerSensorArray,
     AsymVoltageSensorArray,
     Branch3Array,
     BranchArray,
@@ -29,6 +30,7 @@
 )
 
 __all__ = [
+    "AsymPowerSensorArray",
     "AsymVoltageSensorArray",
     "AsymCurrentSensorArray",
     "Branch3Array",

src/power_grid_model_ds/_core/model/arrays/pgm_arrays.py

@@ -27,6 +27,7 @@
 from power_grid_model_ds._core.model.dtypes.regulators import TransformerTapRegulator
 from power_grid_model_ds._core.model.dtypes.sensors import (
     AsymCurrentSensor,
+    AsymPowerSensor,
     AsymVoltageSensor,
     SymCurrentSensor,
     SymPowerSensor,
@@ -154,11 +155,15 @@ class SymVoltageSensorArray(IdArray, SymVoltageSensor):
     pass
 
 
-class AsymVoltageSensorArray(IdArray, AsymVoltageSensor):
+class SymCurrentSensorArray(IdArray, SymCurrentSensor):
     pass
 
 
-class SymCurrentSensorArray(IdArray, SymCurrentSensor):
+class AsymPowerSensorArray(IdArray, AsymPowerSensor):
+    pass
+
+
+class AsymVoltageSensorArray(IdArray, AsymVoltageSensor):
     pass
 
 

src/power_grid_model_ds/_core/model/dtypes/sensors.py

@@ -31,7 +31,6 @@ class GenericPowerSensor(Sensor):
     """Base class for power sensor data type"""
 
     measured_terminal_type: NDArray[np.int32]
-    power_sigma: NDArray[np.float64]  # std of total power
 
 
 class SymPowerSensor(GenericPowerSensor):
@@ -43,6 +42,15 @@ class SymPowerSensor(GenericPowerSensor):
     q_sigma: NDArray[np.float64]  # std of reactive power
 
 
+class AsymPowerSensor(GenericPowerSensor):
+    """AsymPowerSensor data type"""
+
+    p_measured: NDArray3[np.float64]  # measured active power
+    q_measured: NDArray3[np.float64]  # measured reactive power
+    p_sigma: NDArray3[np.float64]  # std of active power
+    q_sigma: NDArray3[np.float64]  # std of reactive power
+
+
 class GenericVoltageSensor(Sensor):
     """Base class for voltage sensor data type"""
 

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

@@ -19,6 +19,7 @@
 from power_grid_model_ds._core.model.arrays import (
     AsymCurrentSensorArray,
     AsymLineArray,
+    AsymPowerSensorArray,
     AsymVoltageSensorArray,
     Branch3Array,
     BranchArray,
@@ -89,8 +90,9 @@ class Grid(FancyArrayContainer):
     # sensors
     sym_power_sensor: SymPowerSensorArray
     sym_voltage_sensor: SymVoltageSensorArray
-    asym_voltage_sensor: AsymVoltageSensorArray
     sym_current_sensor: SymCurrentSensorArray
+    asym_power_sensor: AsymPowerSensorArray
+    asym_voltage_sensor: AsymVoltageSensorArray
     asym_current_sensor: AsymCurrentSensorArray
 
     def __str__(self) -> str:

tests/unit/model/grids/test_grid_base.py

@@ -31,24 +31,25 @@ def test_initialize_empty_grid(grid: Grid):
     assert isinstance(grid, Grid)
     fields = dataclasses.asdict(grid).keys()
     assert {
-        "link",
-        "sym_load",
-        "sym_power_sensor",
-        "source",
         "_id_counter",
-        "transformer_tap_regulator",
-        "asym_voltage_sensor",
-        "sym_current_sensor",
         "asym_current_sensor",
-        "three_winding_transformer",
-        "transformer",
-        "node",
-        "line",
-        "generic_branch",
         "asym_line",
-        "sym_gen",
+        "asym_power_sensor",
+        "asym_voltage_sensor",
+        "generic_branch",
         "graphs",
+        "line",
+        "link",
+        "node",
+        "source",
+        "sym_current_sensor",
+        "sym_gen",
+        "sym_load",
+        "sym_power_sensor",
         "sym_voltage_sensor",
+        "three_winding_transformer",
+        "transformer",
+        "transformer_tap_regulator",
     } == set(fields)