Fix: set scaling iterative parameter (#266)

Signed-off-by: Etienne Homer <[email protected]>

Author: etiennehomer

src/main/java/org/gridsuite/modification/server/modifications/GeneratorScaling.java

@@ -10,6 +10,7 @@
 import com.powsybl.commons.reporter.Reporter;
 import com.powsybl.commons.reporter.TypedValue;
 import com.powsybl.iidm.modification.scalable.Scalable;
+import com.powsybl.iidm.modification.scalable.ScalingParameters;
 import com.powsybl.iidm.network.Generator;
 import com.powsybl.iidm.network.Network;
 import org.gridsuite.modification.server.VariationType;
@@ -49,7 +50,7 @@ protected void applyStackingUpVariation(Network network,
                     sum.set(network.getGenerator(equipment.getId()).getTargetP() + sum.get());
                     return getScalable(equipment.getId());
                 }).toArray(Scalable[]::new));
-        scale(network, subReporter, generatorScalingVariation, sum, stackingUpScalable);
+        scale(network, subReporter, generatorScalingVariation, sum, stackingUpScalable, new ScalingParameters());
     }
 
     @Override
@@ -69,7 +70,7 @@ protected void applyVentilationVariation(Network network,
                 percentages.add((float) ((equipment.getDistributionKey() / distributionKeys) * 100));
             });
             Scalable ventilationScalable = Scalable.proportional(percentages, scalables);
-            scale(network, subReporter, generatorScalingVariation, sum, ventilationScalable);
+            scale(network, subReporter, generatorScalingVariation, sum, ventilationScalable, new ScalingParameters().setIterative(true));
         }
     }
 
@@ -94,7 +95,7 @@ protected void applyRegularDistributionVariation(Network network,
 
         List<Float> percentages = new ArrayList<>(Collections.nCopies(scalables.size(), (float) (100.0 / scalables.size())));
         Scalable regularDistributionScalable = Scalable.proportional(percentages, scalables);
-        scale(network, subReporter, generatorScalingVariation, sum, regularDistributionScalable);
+        scale(network, subReporter, generatorScalingVariation, sum, regularDistributionScalable, new ScalingParameters().setIterative(true));
     }
 
     @Override
@@ -120,7 +121,7 @@ protected void applyProportionalToPmaxVariation(Network network,
 
         setScalablePercentage(maxPSum, maxPMap, percentages, scalables);
         Scalable proportionalToPmaxScalable = Scalable.proportional(percentages, scalables);
-        scale(network, subReporter, generatorScalingVariation, targetPSum, proportionalToPmaxScalable);
+        scale(network, subReporter, generatorScalingVariation, targetPSum, proportionalToPmaxScalable, new ScalingParameters().setIterative(true));
     }
 
     @Override
@@ -144,7 +145,7 @@ protected void applyProportionalVariation(Network network,
         // we calculate percentage of each target P value relative to the sum of target P
         setScalablePercentage(sum, targetPMap, percentages, scalables);
         Scalable proportionalScalable = Scalable.proportional(percentages, scalables);
-        scale(network, subReporter, generatorScalingVariation, sum, proportionalScalable);
+        scale(network, subReporter, generatorScalingVariation, sum, proportionalScalable, new ScalingParameters().setIterative(true));
     }
 
     private void setScalablePercentage(AtomicReference<Double> sum,
@@ -157,9 +158,9 @@ private void setScalablePercentage(AtomicReference<Double> sum,
         });
     }
 
-    private void scale(Network network, Reporter subReporter, ScalingVariationInfos scalingVariationInfos, AtomicReference<Double> sum, Scalable scalable) {
+    private void scale(Network network, Reporter subReporter, ScalingVariationInfos scalingVariationInfos, AtomicReference<Double> sum, Scalable scalable, ScalingParameters scalingParameters) {
         double asked = getAsked(scalingVariationInfos, sum);
-        double done = scalable.scale(network, asked);
+        double done = scalable.scale(network, asked, scalingParameters);
         createReport(subReporter,
                 "scalingApplied",
                 String.format("successfully scaled for mode %s with variation value asked is %s. variation done is  %s", scalingVariationInfos.getVariationMode(), asked, done),