PCons can be equal to 0 Fix

Author: basseche

src/main/java/org/gridsuite/modification/modifications/byfilter/AbstractModificationByAssignment.java

@@ -119,7 +119,10 @@ protected boolean checkGeneratorsPowerValues(Identifiable<?> equipment, Abstract
             } else if (abstractAssignmentInfos.getEditedField().equals(MAXIMUM_ACTIVE_POWER.name())) {
                 return validateMaximumActivePower(generator, reports, Double.parseDouble(getNewValue(equipment, abstractAssignmentInfos)));
             } else if (abstractAssignmentInfos.getEditedField().equals(ACTIVE_POWER_SET_POINT.name())) {
-                return validateActivePowerValue(generator, FIELD_ACTIVE_POWER_TARGET, reports, Double.parseDouble(getNewValue(equipment, abstractAssignmentInfos)));
+                double newValue = Double.parseDouble(getNewValue(equipment, abstractAssignmentInfos));
+                if (newValue != 0) { // 0 is an exception to the rule
+                    return validateActivePowerValue(generator, FIELD_ACTIVE_POWER_TARGET, reports, newValue);
+                }
             }
         }
         return true;

src/main/java/org/gridsuite/modification/utils/ModificationUtils.java

@@ -1945,7 +1945,8 @@ public static void checkPowerValues(String errorMessage, double minP, double max
     }
 
     public static void checkMinimumActivePower(String errorMessage, double maxP, double targetP, Double pImp, double newValue, NetworkModificationException.Type exceptionType) throws NetworkModificationException {
-        double pMin = Math.min(targetP, maxP);
+        // targetP = 0 is an exception to the rule
+        double pMin = targetP != 0 ? Math.min(targetP, maxP) : maxP;
         if (pImp != null) {
             pMin = Math.min(pMin, pImp);
         }
@@ -1954,10 +1955,11 @@ public static void checkMinimumActivePower(String errorMessage, double maxP, dou
         }
     }
 
-    public static void checkMaximumActivePower(String errorMessage, double minP, double targetP, Double pImp, double newValue, NetworkModificationException.Type exceptionType) throws NetworkModificationException {
-        double pMax = Math.max(targetP, minP);
-        if (pImp != null) {
-            pMax = Math.max(pMax, pImp);
+    public static void checkMaximumActivePower(String errorMessage, double minP, double targetP, Double plannedActivePowerSetPoint, double newValue, NetworkModificationException.Type exceptionType) throws NetworkModificationException {
+        // targetP = 0 is an exception to the rule
+        double pMax = targetP != 0 ? Math.max(targetP, minP) : minP;
+        if (plannedActivePowerSetPoint != null) {
+            pMax = Math.max(pMax, plannedActivePowerSetPoint);
         }
         if (pMax > newValue) {
             throw new NetworkModificationException(exceptionType, errorMessage + String.format("Invalid value %.2f of field %s should be be greater or equal to %.2f", newValue, FIELD_MAX_ACTIVE_POWER, pMax));
@@ -1966,11 +1968,12 @@ public static void checkMaximumActivePower(String errorMessage, double minP, dou
 
     public static boolean validateMinimumActivePower(Generator generator, List<ReportNode> reports, double newValue) {
         GeneratorStartup generatorStartup = generator.getExtension(GeneratorStartup.class);
-        Double pImp = generatorStartup != null && !Double.isNaN(generatorStartup.getPlannedActivePowerSetpoint()) ? generatorStartup.getPlannedActivePowerSetpoint() : null;
+        Double plannedActivePowerSetPoint = generatorStartup != null && !Double.isNaN(generatorStartup.getPlannedActivePowerSetpoint()) ? generatorStartup.getPlannedActivePowerSetpoint() : null;
 
-        double minP = Math.min(generator.getTargetP(), generator.getMaxP());
-        if (pImp != null) {
-            minP = Math.min(minP, pImp);
+        // targetP = 0 is an exception to the rule
+        double minP = generator.getTargetP() != 0 ? Math.min(generator.getTargetP(), generator.getMaxP()) : generator.getMaxP();
+        if (plannedActivePowerSetPoint != null) {
+            minP = Math.min(minP, plannedActivePowerSetPoint);
         }
 
         if (minP < newValue) {
@@ -1991,7 +1994,8 @@ public static boolean validateMaximumActivePower(Generator generator, List<Repor
         GeneratorStartup generatorStartup = generator.getExtension(GeneratorStartup.class);
         Double pImp = generatorStartup != null && !Double.isNaN(generatorStartup.getPlannedActivePowerSetpoint()) ? generatorStartup.getPlannedActivePowerSetpoint() : null;
 
-        double maxP = Math.max(generator.getTargetP(), generator.getMinP());
+        // targetP = 0 is an exception to the rule
+        double maxP = generator.getTargetP() != 0 ? Math.max(generator.getTargetP(), generator.getMinP()) : generator.getMinP();
         if (pImp != null) {
             maxP = Math.min(maxP, pImp);
         }

src/main/resources/org/gridsuite/modification/reports.properties

@@ -169,8 +169,8 @@ network.modification.generatorNotFound.generatorsFrequencyReserve = Frequency re
 network.modification.generatorNotFound.generatorsWithFixedSupply = Generators with fixed active power: Cannot find generator ${notFoundGeneratorId} in filter ${filterName}
 network.modification.generatorNotFound.generatorsWithoutOutage = Generators without outage simulation: Cannot find generator ${notFoundGeneratorId} in filter ${filterName}
 network.modification.generatorScaling = Generator scaling
-network.modification.generator.ValueShouldBeGreaterThan = Generator ${equipmentName} : Invalid value ${fieldValue} for field ${fieldName}. Value should be greater or equal to s{targetValue}.
-network.modification.generator.ValueShouldBeSmallerThan = Generator ${equipmentName} : Invalid value ${fieldValue} for field ${fieldName}. Value should be smaller or equal to s{targetValue}.
+network.modification.generator.ValueShouldBeGreaterThan = Generator ${equipmentName} : Invalid value ${fieldValue} for field ${fieldName}. Value should be greater or equal to ${targetValue}.
+network.modification.generator.ValueShouldBeSmallerThan = Generator ${equipmentName} : Invalid value ${fieldValue} for field ${fieldName}. Value should be smaller or equal to ${targetValue}.
 network.modification.generator.ValueShouldBeWithinInterval = Generator ${equipmentName} : Invalid value ${fieldValue} for field ${fieldName}. Value should be within interval [${minValue}; ${maxValue}].
 network.modification.groovyScript = Apply groovy script
 network.modification.groovyScriptApplied = Groovy script applied