improve SVC validation rules wip

Signed-off-by: Samir Romdhani <samir.romdhani_externe@rte-france.com>

Author: samirromdhani

loadflow/loadflow-validation/src/main/java/com/powsybl/loadflow/validation/StaticVarCompensatorsValidation.java

@@ -25,8 +25,7 @@
 import com.powsybl.iidm.network.StaticVarCompensator.RegulationMode;
 import com.powsybl.loadflow.validation.io.ValidationWriter;
 
-import static com.powsybl.loadflow.validation.ValidationUtils.isOutsideTolerance;
-import static com.powsybl.loadflow.validation.ValidationUtils.isUndefinedOrZero;
+import static com.powsybl.loadflow.validation.ValidationUtils.*;
 
 /**
  *
@@ -150,7 +149,7 @@ public boolean checkSVCs(String id, double p, double q, double vControlled, doub
 
         if (connected && ValidationUtils.isMainComponent(config, mainComponent)) {
             if (Double.isNaN(p) || Double.isNaN(q)) {
-                // Rule2 : TODO
+                // Rule2: **reactivePowerSetpoint** must be 0 if p or q is missing (NaN)
                 validated = checkSVCsNaNValues(id, p, q, reactivePowerSetpoint);
             } else {
                 // Rule1, Rule3, Rule4, Rule5
@@ -167,7 +166,6 @@ public boolean checkSVCs(String id, double p, double q, double vControlled, doub
 
     private static boolean checkSVCsNaNValues(String id, double p, double q, double reactivePowerSetpoint) {
         // a validation error should be detected if there is a setpoint but no p or q
-        // Rule2: reactivePowerSetpoint must be undefined or equal to 0 when no p or q
         if (!isUndefinedOrZero(reactivePowerSetpoint, 0.0)) {
             LOGGER.warn("{} {}: {}: P={} Q={} reactivePowerSetpoint={}", ValidationType.SVCS, ValidationUtils.VALIDATION_ERROR, id, p, q, reactivePowerSetpoint);
             return false;
@@ -185,11 +183,9 @@ private static boolean checkSVCsValues(String id, double p, double q, double vCo
             LOGGER.warn("{} {}: {}: P={}", ValidationType.SVCS, ValidationUtils.VALIDATION_ERROR, id, p);
             validated = false;
         }
-
-        double vAux = vController; // voltage in bus
-        if (vAux == 0 || Double.isNaN(vAux)) {
-            vAux = nominalVcontroller; // voltage in VoltageLevel
-        }
+        // vController: voltage in bus
+        // nominalVcontroller: voltage in VoltageLevel
+        double vAux = voltageFrom(vController, nominalVcontroller);
         double qMin = -bMax * vAux * vAux;
         double qMax = -bMin * vAux * vAux;
 
@@ -223,14 +219,13 @@ private static boolean checkSVCsValues(String id, double p, double q, double vCo
     private static boolean reactivePowerRegulationModeKo(RegulationMode regulationMode, double q, double qMin,
         double qMax, double reactivePowerSetpoint, ValidationConfig config) {
         // if regulationMode = REACTIVE_POWER, the reactive power must be equal to setpoint
-
         if (regulationMode != RegulationMode.REACTIVE_POWER) {
             return false;
         }
         if (ValidationUtils.areNaN(config, reactivePowerSetpoint, qMin, qMax)) {
             return true;
         }
-        return Math.abs(q - reactivePowerSetpoint) > config.getThreshold();
+        return isOutsideTolerance(q, reactivePowerSetpoint, config.getThreshold());
     }
 
     private static boolean voltageRegulationModeKo(RegulationMode regulationMode, double q, double qMin,
@@ -240,20 +235,21 @@ private static boolean voltageRegulationModeKo(RegulationMode regulationMode, do
         // or q is equal to Qmin = -bMax * V * V and V is higher than voltageSetpoint
         // or V at the controlled bus is equal to voltageSetpoint and q is bounded
         // within [Qmin=-bMax*V*V, Qmax=-bMin*V*V]
-
+        double threshold = config.getThreshold();
         if (regulationMode != RegulationMode.VOLTAGE) {
             return false;
         }
         if (ValidationUtils.areNaN(config, qMin, qMax, vControlled, voltageSetpoint)) {
             return true;
         }
-        if (vControlled < voltageSetpoint - config.getThreshold() && Math.abs(q - qMax) > config.getThreshold()) {
+        if (vControlled < voltageSetpoint - threshold && isOutsideTolerance(q, qMax, threshold)) {
             return true;
         }
-        if (vControlled > voltageSetpoint + config.getThreshold() && Math.abs(q - qMin) > config.getThreshold()) {
+        if (vControlled > voltageSetpoint + threshold && isOutsideTolerance(q, qMin, threshold)) {
             return true;
         }
-        return Math.abs(vControlled - voltageSetpoint) < config.getThreshold() && !ValidationUtils.boundedWithin(qMin, qMax, q, config.getThreshold());
+        boolean voltageAtSetpoint = Math.abs(vControlled - voltageSetpoint) < threshold;
+        return voltageAtSetpoint && !boundedWithin(qMin, qMax, q, threshold);
     }
 
     private static boolean notRegulatingKo(boolean regulating, double q, ValidationConfig config) {

loadflow/loadflow-validation/src/main/java/com/powsybl/loadflow/validation/ValidationUtils.java

@@ -122,4 +122,13 @@ public static double computeShuntExpectedQ(double bPerSection, int sectionCount,
         return -bPerSection * sectionCount * v * v;
     }
 
+    public record QBounds(double qMin, double qMax) { }
+
+    public static double voltageFrom(double vBus, double nominalV) {
+        return (Double.isNaN(vBus) || vBus == 0.0) ? nominalV : vBus;
+    }
+
+    public static boolean isWithinInclusive(double value, double min, double max, double epsilon) {
+        return boundedWithin(min, max, value, epsilon);
+    }
 }

loadflow/loadflow-validation/src/test/java/com/powsybl/loadflow/validation/StaticVarCompensatorsValidationTest.java

@@ -9,6 +9,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.when;
 
 import java.io.IOException;
 import java.util.stream.Stream;
@@ -189,4 +190,32 @@ void checkNetworkSvcs() throws IOException {
         ValidationWriter validationWriter = ValidationUtils.createValidationWriter(network.getId(), looseConfig, NullWriter.INSTANCE, ValidationType.SVCS);
         assertTrue(ValidationType.SVCS.check(network, looseConfig, validationWriter));
     }
+
+    // Rule1: active power should be equal to 0
+    @Test
+    void checkSVCActivePowerShouldBeZeroWithinThreshold() {
+        // Given (p = 0)
+        when(svcTerminal.getP()).thenReturn(0.0);
+        assertTrue(StaticVarCompensatorsValidation.INSTANCE.checkSVCs(svc, strictConfig, NullWriter.INSTANCE));
+        // Given (p = 0.01 ~ threshold)
+        when(svcTerminal.getP()).thenReturn(0.01);
+        assertTrue(StaticVarCompensatorsValidation.INSTANCE.checkSVCs(svc, strictConfig, NullWriter.INSTANCE));
+        //Given (p > 0.01)
+        when(svcTerminal.getP()).thenReturn(0.02);
+        assertFalse(StaticVarCompensatorsValidation.INSTANCE.checkSVCs(svc, strictConfig, NullWriter.INSTANCE));
+    }
+
+    // Rule2: **reactivePowerSetpoint** must be 0 if p or q is missing (NaN)
+    @Test
+    void checkSVCReactivePowerSetpointWhenPOrQMissing() {
+        // non-zero setpoint with missing p/q => KO
+        when(svcTerminal.getP()).thenReturn(Double.NaN);
+        when(svcTerminal.getQ()).thenReturn(Double.NaN);
+        when(svc.getReactivePowerSetpoint()).thenReturn(5.0);
+        assertFalse(StaticVarCompensatorsValidation.INSTANCE.checkSVCs(svc, strictConfig, NullWriter.INSTANCE));
+        // zero setpoint with missing p/q => OK
+        when(svc.getReactivePowerSetpoint()).thenReturn(0.0);
+        assertTrue(StaticVarCompensatorsValidation.INSTANCE.checkSVCs(svc, strictConfig, NullWriter.INSTANCE));
+    }
+
 }