Handling updown scalable get steady state power (#2710)

Signed-off-by: Luma <zamarrenolm@aia.es>

iidm/iidm-modification/src/main/java/com/powsybl/iidm/modification/scalable/DanglingLineScalable.java

@@ -166,7 +166,7 @@ public double minimumValue(Network n) {
     }
 
     @Override
-    public double getSteadyStatePower(Network network, ScalingConvention scalingConvention) {
+    public double getSteadyStatePower(Network network, double asked, ScalingConvention scalingConvention) {
         DanglingLine line = network.getDanglingLine(id);
         if (line == null) {
             LOGGER.warn("DanglingLine {} not found", id);

iidm/iidm-modification/src/main/java/com/powsybl/iidm/modification/scalable/GeneratorScalable.java

@@ -186,7 +186,7 @@ public double scale(Network n, double asked, ScalingParameters parameters) {
     }
 
     @Override
-    public double getSteadyStatePower(Network network, ScalingConvention scalingConvention) {
+    public double getSteadyStatePower(Network network, double asked, ScalingConvention scalingConvention) {
         Generator generator = network.getGenerator(id);
         if (generator == null) {
             LOGGER.warn("Generator {} not found", id);

iidm/iidm-modification/src/main/java/com/powsybl/iidm/modification/scalable/LoadScalable.java

@@ -160,7 +160,7 @@ public double scale(Network n, double asked, ScalingParameters parameters) {
     }
 
     @Override
-    public double getSteadyStatePower(Network network, ScalingConvention scalingConvention) {
+    public double getSteadyStatePower(Network network, double asked, ScalingConvention scalingConvention) {
         Load load = network.getLoad(id);
         if (load == null) {
             LOGGER.warn("Load {} not found", id);

iidm/iidm-modification/src/main/java/com/powsybl/iidm/modification/scalable/ProportionalScalable.java

@@ -258,7 +258,7 @@ public double scale(Network n, double asked, ScalingParameters parameters) {
         Objects.requireNonNull(parameters);
 
         // Compute the current power value
-        double currentGlobalPower = getSteadyStatePower(n, parameters.getScalingConvention());
+        double currentGlobalPower = getSteadyStatePower(n, asked, parameters.getScalingConvention());
 
         // Variation asked
         double variationAsked = Scalable.getVariationAsked(parameters, asked, currentGlobalPower);
@@ -308,8 +308,8 @@ private void reinitIterationPercentage() {
     }
 
     @Override
-    public double getSteadyStatePower(Network network, ScalingConvention scalingConvention) {
-        return scalablePercentageList.stream().mapToDouble(scalablePercentage -> scalablePercentage.getScalable().getSteadyStatePower(network, scalingConvention)).sum();
+    public double getSteadyStatePower(Network network, double asked, ScalingConvention scalingConvention) {
+        return scalablePercentageList.stream().mapToDouble(scalablePercentage -> scalablePercentage.getScalable().getSteadyStatePower(network, asked, scalingConvention)).sum();
     }
 
 }

iidm/iidm-modification/src/main/java/com/powsybl/iidm/modification/scalable/Scalable.java

@@ -262,5 +262,5 @@ static double getVariationAsked(ScalingParameters scalingParameters, double aske
      * @param network Network in which the injections are defined
      * @return the current power value
      */
-    double getSteadyStatePower(Network network, ScalingConvention scalingConvention);
+    double getSteadyStatePower(Network network, double asked, ScalingConvention scalingConvention);
 }

iidm/iidm-modification/src/main/java/com/powsybl/iidm/modification/scalable/ScalableAdapter.java

@@ -91,7 +91,7 @@ public double scale(Network n, double asked, ScalingParameters parameters) {
     }
 
     @Override
-    public double getSteadyStatePower(Network network, ScalingConvention scalingConvention) {
-        return getScalable(network).getSteadyStatePower(network, scalingConvention);
+    public double getSteadyStatePower(Network network, double asked, ScalingConvention scalingConvention) {
+        return getScalable(network).getSteadyStatePower(network, asked, scalingConvention);
     }
 }

iidm/iidm-modification/src/main/java/com/powsybl/iidm/modification/scalable/StackScalable.java

@@ -39,7 +39,7 @@ public double scale(Network n, double asked, ScalingParameters parameters) {
         Objects.requireNonNull(n);
 
         // Compute the current power value
-        double currentGlobalPower = getSteadyStatePower(n, parameters.getScalingConvention());
+        double currentGlobalPower = getSteadyStatePower(n, asked, parameters.getScalingConvention());
 
         // Variation asked
         double variationAsked = Scalable.getVariationAsked(parameters, asked, currentGlobalPower);
@@ -57,7 +57,7 @@ public double scale(Network n, double asked, ScalingParameters parameters) {
     }
 
     @Override
-    public double getSteadyStatePower(Network network, ScalingConvention scalingConvention) {
-        return scalables.stream().mapToDouble(scalable -> scalable.getSteadyStatePower(network, scalingConvention)).sum();
+    public double getSteadyStatePower(Network network, double asked, ScalingConvention scalingConvention) {
+        return scalables.stream().mapToDouble(scalable -> scalable.getSteadyStatePower(network, asked, scalingConvention)).sum();
     }
 }

iidm/iidm-modification/src/main/java/com/powsybl/iidm/modification/scalable/UpDownScalable.java

@@ -6,7 +6,6 @@
  */
 package com.powsybl.iidm.modification.scalable;
 
-import com.powsybl.commons.PowsyblException;
 import com.powsybl.iidm.network.Injection;
 import com.powsybl.iidm.network.Network;
 
@@ -66,7 +65,7 @@ public double scale(Network n, double asked, ScalingParameters parameters) {
     }
 
     @Override
-    public double getSteadyStatePower(Network network, ScalingConvention scalingConvention) {
-        throw new PowsyblException("getCurrentPower should not be used on UpDownScalable, only on other types of Scalable");
+    public double getSteadyStatePower(Network network, double asked, ScalingConvention scalingConvention) {
+        return asked > 0 ? upScalable.getSteadyStatePower(network, asked, scalingConvention) : downScalable.getSteadyStatePower(network, asked, scalingConvention);
     }
 }

iidm/iidm-modification/src/test/java/com/powsybl/iidm/modification/scalable/UpDownScalableTest.java

@@ -6,7 +6,6 @@
  */
 package com.powsybl.iidm.modification.scalable;
 
-import com.powsybl.commons.PowsyblException;
 import com.powsybl.iidm.network.Injection;
 import com.powsybl.iidm.network.Network;
 import org.junit.jupiter.api.Test;
@@ -90,8 +89,14 @@ void checkErrorOnGetCurrentPower() {
         Scalable downScalable = Scalable.onLoad("l1", 50, 200);
         Scalable upDownScalable = Scalable.upDown(upScalable, downScalable);
 
-        // Error raised
-        PowsyblException e0 = assertThrows(PowsyblException.class, () -> upDownScalable.getSteadyStatePower(testNetwork, Scalable.ScalingConvention.LOAD));
-        assertEquals("getCurrentPower should not be used on UpDownScalable, only on other types of Scalable", e0.getMessage());
+        testNetwork.getGenerator("g2").setTargetP(32);
+        double asked = 1;
+        assertEquals(-32, upDownScalable.getSteadyStatePower(testNetwork, asked, Scalable.ScalingConvention.LOAD));
+        assertEquals(32, upDownScalable.getSteadyStatePower(testNetwork, asked, Scalable.ScalingConvention.GENERATOR));
+
+        testNetwork.getLoad("l1").setP0(42);
+        asked = -1;
+        assertEquals(42, upDownScalable.getSteadyStatePower(testNetwork, asked, Scalable.ScalingConvention.LOAD));
+        assertEquals(-42, upDownScalable.getSteadyStatePower(testNetwork, asked, Scalable.ScalingConvention.GENERATOR));
     }
 }