[WIP INTERNSHIP] Add constraints correctly on multi TimeSteps for PST

data/crac-io/crac-io-json/src/main/java/com/powsybl/openrao/data/craciojson/deserializers/StandardRangeArrayDeserializer.java

@@ -24,7 +24,6 @@ public final class StandardRangeArrayDeserializer {
     private StandardRangeArrayDeserializer() {
     }
 
-    //a Standard range is implicitly of type "ABSOLUTE" : no RANGE_TYPE
     public static void deserialize(JsonParser jsonParser, StandardRangeActionAdder<?> ownerAdder) throws IOException {
         while (jsonParser.nextToken() != JsonToken.END_ARRAY) {
             StandardRangeAdder<?> adder = ownerAdder.newRange();
@@ -38,6 +37,10 @@ public static void deserialize(JsonParser jsonParser, StandardRangeActionAdder<?
                         jsonParser.nextToken();
                         adder.withMax(jsonParser.getDoubleValue());
                         break;
+                    case RANGE_TYPE:
+                        jsonParser.nextToken();
+                        adder.withRangeType(deserializeRangeType(jsonParser.getText()));
+                        break;
                     default:
                         throw new OpenRaoException("Unexpected field in StandardRange: " + jsonParser.getCurrentName());
                 }

data/crac-io/crac-io-json/src/main/java/com/powsybl/openrao/data/craciojson/serializers/StandardRangeSerializer.java

@@ -28,6 +28,7 @@ public void serialize(StandardRange value, JsonGenerator gen, SerializerProvider
         if (value.getMax() < Integer.MAX_VALUE) {
             gen.writeNumberField(MAX, value.getMax());
         }
+        gen.writeStringField(RANGE_TYPE, serializeRangeType(value.getRangeType()));
         gen.writeEndObject();
     }
 }

data/crac/crac-api/src/main/java/com/powsybl/openrao/data/cracapi/range/StandardRangeAdder.java

@@ -19,5 +19,7 @@ public interface StandardRangeAdder<T extends StandardRangeActionAdder<T>> {
 
     StandardRangeAdder<T> withMax(double maxSetpoint);
 
+    StandardRangeAdder<T> withRangeType(RangeType rangeType);
+
     T add();
 }

data/crac/crac-api/src/main/java/com/powsybl/openrao/data/cracapi/rangeaction/InjectionRangeActionAdder.java

@@ -17,6 +17,10 @@ public interface InjectionRangeActionAdder extends StandardRangeActionAdder<Inje
 
     InjectionRangeActionAdder withNetworkElementAndKey(double key, String networkElementId, String networkElementName);
 
+    InjectionRangeActionAdder withNetworkElement(String networkElementId);
+
+    InjectionRangeActionAdder withNetworkElement(String networkElementId, String networkElementName);
+
     InjectionRangeActionAdder withInitialSetpoint(double initialSetpoint);
 
     StandardRangeAdder<InjectionRangeActionAdder> newRange();

data/crac/crac-impl/src/main/java/com/powsybl/openrao/data/cracimpl/InjectionRangeActionAdderImpl.java

@@ -46,6 +46,16 @@ public InjectionRangeActionAdder withNetworkElementAndKey(double key, String net
         return this;
     }
 
+    @Override
+    public InjectionRangeActionAdder withNetworkElement(String networkElementId) {
+        return withNetworkElementAndKey(1.0, networkElementId, networkElementId);
+    }
+
+    @Override
+    public InjectionRangeActionAdder withNetworkElement(String networkElementId, String networkElementName) {
+        return withNetworkElementAndKey(1.0, networkElementId, networkElementName);
+    }
+
     @Override
     public InjectionRangeAction add() {
         checkId();

data/crac/crac-impl/src/main/java/com/powsybl/openrao/data/cracimpl/StandardRangeActionUtils.java

@@ -12,7 +12,7 @@
 import java.util.List;
 
 /**
- * Common code for StandradRangeAction implementations (adding another abstract class for standard range actions would be too much class depth)
+ * Common code for StandardRangeAction implementations (adding another abstract class for standard range actions would be too much class depth)
  * @author Gabriel Plante {@literal <gabriel.plante_externe at rte-france.com}
  */
 public final class StandardRangeActionUtils {
@@ -33,6 +33,9 @@ static double getMinAdmissibleSetpoint(double previousInstantSetPoint, List<Stan
                 case RELATIVE_TO_PREVIOUS_INSTANT:
                     minAdmissibleSetpoint = Math.max(minAdmissibleSetpoint, previousInstantSetPoint + range.getMin());
                     break;
+                // to avoid throwing exception
+                case RELATIVE_TO_PREVIOUS_TIME_STEP:
+                    break;
                 default:
                     throw new NotImplementedException("Range Action type is not implemented yet.");
             }
@@ -53,6 +56,9 @@ static double getMaxAdmissibleSetpoint(double previousInstantSetPoint, List<Stan
                 case RELATIVE_TO_PREVIOUS_INSTANT:
                     maxAdmissibleSetpoint = Math.min(maxAdmissibleSetpoint, previousInstantSetPoint + range.getMax());
                     break;
+                // to avoid throwing exception
+                case RELATIVE_TO_PREVIOUS_TIME_STEP:
+                    break;
                 default:
                     throw new NotImplementedException("Range Action type is not implemented yet.");
             }

data/crac/crac-impl/src/main/java/com/powsybl/openrao/data/cracimpl/StandardRangeAdderImpl.java

@@ -8,6 +8,7 @@
 package com.powsybl.openrao.data.cracimpl;
 
 import com.powsybl.openrao.commons.OpenRaoException;
+import com.powsybl.openrao.data.cracapi.range.RangeType;
 import com.powsybl.openrao.data.cracapi.range.StandardRange;
 import com.powsybl.openrao.data.cracapi.range.StandardRangeAdder;
 import com.powsybl.openrao.data.cracapi.rangeaction.*;
@@ -24,10 +25,13 @@ public class StandardRangeAdderImpl<T extends StandardRangeActionAdder<T>> imple
     private Double min;
     private Double max;
 
+    private RangeType rangeType;
+
     StandardRangeAdderImpl(AbstractStandardRangeActionAdder<T> ownerAdder) {
         this.ownerAdder = ownerAdder;
         this.min = Double.MIN_VALUE;
         this.max = Double.MAX_VALUE;
+        this.rangeType = RangeType.ABSOLUTE;
     }
 
     @Override
@@ -42,10 +46,17 @@ public StandardRangeAdder<T> withMax(double maxSetpoint) {
         return this;
     }
 
+    @Override
+    public StandardRangeAdder<T> withRangeType(RangeType rangeType) {
+        this.rangeType = rangeType;
+        return this;
+    }
+
     @Override
     public T add() {
         AdderUtils.assertAttributeNotNull(min, CLASS_NAME, "min value", "withMin()");
         AdderUtils.assertAttributeNotNull(max, CLASS_NAME, "max value", "withMax()");
+        AdderUtils.assertAttributeNotNull(rangeType, CLASS_NAME, "range type", "withRangeType()");
 
         if (max == Double.MAX_VALUE) {
             throw new OpenRaoException("StandardRange max value was not defined.");
@@ -57,7 +68,7 @@ public T add() {
             throw new OpenRaoException("Max value of StandardRange must be equal or greater than min value.");
         }
 
-        StandardRange standardRange = new StandardRangeImpl(min, max);
+        StandardRange standardRange = new StandardRangeImpl(min, max, rangeType);
 
         ownerAdder.addRange(standardRange);
         return (T) ownerAdder;

data/crac/crac-impl/src/main/java/com/powsybl/openrao/data/cracimpl/StandardRangeImpl.java

@@ -20,8 +20,9 @@ public class StandardRangeImpl extends AbstractRange implements StandardRange {
     private final double min;
     private final double max;
 
-    StandardRangeImpl(double min, double max) {
-        super(RangeType.ABSOLUTE, Unit.MEGAWATT);
+    // rangeType added to StandardRange to accept also RELATIVE_TO_PREVIOUS_TIME_STEP, and not only ABSOLUTE
+    StandardRangeImpl(double min, double max, RangeType rangeType) {
+        super(rangeType, Unit.MEGAWATT);
         this.min = min;
         this.max = max;
     }

data/crac/crac-impl/src/test/java/com/powsybl/openrao/data/cracimpl/InjectionRangeActionAdderImplTest.java

@@ -125,6 +125,37 @@ void testAddWithoutGroupId() {
         assertEquals(2, crac.getNetworkElements().size());
     }
 
+    @Test
+    void testAddDefaultKey() {
+        InjectionRangeAction injectionRangeAction = crac.newInjectionRangeAction()
+            .withId("id1")
+            .withOperator("BE")
+            .withGroupId("groupId1")
+            .withNetworkElement(injectionId1)
+            .withNetworkElement(injectionId2, injectionName2)
+            .newRange().withMin(-5).withMax(10).add()
+            .newOnInstantUsageRule().withInstant(PREVENTIVE_INSTANT_ID).withUsageMethod(UsageMethod.AVAILABLE).add()
+            .add();
+
+        assertEquals("id1", injectionRangeAction.getId());
+        assertEquals("id1", injectionRangeAction.getName());
+        assertEquals("BE", injectionRangeAction.getOperator());
+        assertTrue(injectionRangeAction.getGroupId().isPresent());
+        assertEquals("groupId1", injectionRangeAction.getGroupId().get());
+        assertEquals(1, injectionRangeAction.getRanges().size());
+        assertEquals(1, injectionRangeAction.getUsageRules().size());
+
+        assertEquals(2, injectionRangeAction.getInjectionDistributionKeys().size());
+        assertEquals(1., injectionRangeAction.getInjectionDistributionKeys().get(crac.getNetworkElement(injectionId1)), 1e-6);
+        assertEquals(1., injectionRangeAction.getInjectionDistributionKeys().get(crac.getNetworkElement(injectionId2)), 1e-6);
+
+        assertEquals(2, crac.getNetworkElements().size());
+        assertNotNull(crac.getNetworkElement(injectionId1));
+        assertNotNull(crac.getNetworkElement(injectionId2));
+
+        assertEquals(1, crac.getRangeActions().size());
+    }
+
     @Test
     void testAddWithoutUsageRule() {
         /*

data/crac/crac-impl/src/test/java/com/powsybl/openrao/data/cracimpl/StandardRangeImplTest.java

@@ -25,7 +25,7 @@ class StandardRangeImplTest {
 
     @BeforeEach
     public void setUp() {
-        fixedRange = new StandardRangeImpl(min, max);
+        fixedRange = new StandardRangeImpl(min, max, RangeType.ABSOLUTE);
     }
 
     @Test
@@ -45,19 +45,19 @@ void getRangeTypeTest() {
 
     @Test
     void testEquals() {
-        StandardRangeImpl range1 = new StandardRangeImpl(0, 10);
-        StandardRangeImpl range2 = new StandardRangeImpl(0, 10);
-        StandardRangeImpl range3 = new StandardRangeImpl(0, 11);
+        StandardRangeImpl range1 = new StandardRangeImpl(0, 10, RangeType.ABSOLUTE);
+        StandardRangeImpl range2 = new StandardRangeImpl(0, 10, RangeType.ABSOLUTE);
+        StandardRangeImpl range3 = new StandardRangeImpl(0, 11, RangeType.ABSOLUTE);
 
         assertEquals(range1, range2);
         assertNotEquals(range1, range3);
     }
 
     @Test
     void testHashCode() {
-        StandardRangeImpl range1 = new StandardRangeImpl(0, 10);
-        StandardRangeImpl range2 = new StandardRangeImpl(0, 10);
-        StandardRangeImpl range3 = new StandardRangeImpl(0, 11);
+        StandardRangeImpl range1 = new StandardRangeImpl(0, 10, RangeType.ABSOLUTE);
+        StandardRangeImpl range2 = new StandardRangeImpl(0, 10, RangeType.ABSOLUTE);
+        StandardRangeImpl range3 = new StandardRangeImpl(0, 11, RangeType.ABSOLUTE);
 
         assertEquals(range1.hashCode(), range2.hashCode());
         assertNotEquals(range1.hashCode(), range3.hashCode());

ra-optimisation/search-tree-rao/src/main/java/com/powsybl/openrao/searchtreerao/commons/SensitivityComputerMultiTS.java

@@ -24,7 +24,7 @@
 import java.util.*;
 
 /**
- * @author Joris Mancini {@literal <joris.mancini at rte-france.com>}
+ * @author Jeremy Wang {@literal <jeremy.wang at rte-france.com>}
  */
 public final class SensitivityComputerMultiTS {
     private List<SystematicSensitivityInterface> systematicSensitivityInterfaces;
@@ -41,14 +41,14 @@ public static SensitivityComputerBuilder create() {
     }
 
     public void compute(List<Network> networks) {
-        results = new ArrayList<>(); //besoin d'initialiser?
+        results = new ArrayList<>();
         for (int i = 0; i < networks.size(); i++) {
             results.add(systematicSensitivityInterfaces.get(i).run(networks.get(i)));
         }
     }
 
     public FlowResult getBranchResult(Network network, int i) {
-        return branchResultAdapters.get(i).getResult(results.get(i), network); //???
+        return branchResultAdapters.get(i).getResult(results.get(i), network);
     }
 
     public MultipleSensitivityResult getSensitivityResults() {
@@ -62,14 +62,15 @@ public MultipleSensitivityResult getSensitivityResults() {
     public static final class SensitivityComputerBuilder {
         private ToolProvider toolProvider;
         private List<Set<FlowCnec>> flowCnecsList;
-        private List<Set<RangeAction<?>>> rangeActionsList;
+        private Set<RangeAction<?>> rangeActions;
         private FlowResult fixedPtdfs;
         private AbsolutePtdfSumsComputation absolutePtdfSumsComputation;
         private FlowResult fixedCommercialFlows;
         private LoopFlowComputation loopFlowComputation;
         private List<Set<FlowCnec>> loopFlowCnecsList;
         private AppliedRemedialActions appliedRemedialActions;
-        private Instant outageInstant; //list of outage instants?
+        private Instant outageInstant;
+        // curently using only one outageInstant, but we could use a List ot make it cleaner
 
         public SensitivityComputerBuilder withToolProvider(ToolProvider toolProvider) {
             this.toolProvider = toolProvider;
@@ -81,8 +82,8 @@ public SensitivityComputerBuilder withCnecs(List<Set<FlowCnec>> flowCnecsList) {
             return this;
         }
 
-        public SensitivityComputerBuilder withRangeActions(List<Set<RangeAction<?>>> rangeActionsList) {
-            this.rangeActionsList = rangeActionsList;
+        public SensitivityComputerBuilder withRangeActions(Set<RangeAction<?>> rangeActions) {
+            this.rangeActions = rangeActions;
             return this;
         }
 
@@ -124,7 +125,7 @@ public SensitivityComputerBuilder withOutageInstant(Instant outageInstant) {
         public SensitivityComputerMultiTS build() {
             Objects.requireNonNull(toolProvider);
             Objects.requireNonNull(flowCnecsList);
-            Objects.requireNonNull(rangeActionsList);
+            Objects.requireNonNull(rangeActions);
             Objects.requireNonNull(outageInstant);
             SensitivityComputerMultiTS sensitivityComputer = new SensitivityComputerMultiTS();
             boolean computePtdfs = absolutePtdfSumsComputation != null;
@@ -137,7 +138,7 @@ public SensitivityComputerMultiTS build() {
             for (int i = 0; i < flowCnecsList.size(); i++) {
                 sensitivityComputer.systematicSensitivityInterfaces.add(toolProvider.getSystematicSensitivityInterface(
                     flowCnecsList.get(i),
-                    rangeActionsList.get(i),
+                    rangeActions,
                     computePtdfs,
                     computeLoopFlows,
                     appliedRemedialActions,

ra-optimisation/search-tree-rao/src/main/java/com/powsybl/openrao/searchtreerao/linearoptimisation/algorithms/BestTapFinderMultiTS.java

@@ -30,7 +30,7 @@
 import static com.powsybl.openrao.commons.Unit.MEGAWATT;
 
 /**
- * @author Joris Mancini {@literal <joris.mancini at rte-france.com>}
+ * @author Jeremy Wang {@literal <jeremy.wang at rte-france.com>}
  */
 public final class BestTapFinderMultiTS {