Merge branch 'rao_parameters_remove_curative_stop_criterion' of https…

…://github.com/powsybl/open-rao into rao_parameters_separate_unit_from_objective_function_type

Signed-off-by: Philippe Edwards <[email protected]>

.github/workflows/maven.yml → .github/workflows/build_and_test.yml

@@ -1,24 +1,34 @@
 name: CI
 
-on: [push]
+on: [ push ]
 
 jobs:
   build:
-    name: Build OS ${{ matrix.os }}
+    name: Build and test on ${{ matrix.os }} with ${{ matrix.jvm }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        jvm: [ java, graalvm ]
 
     steps:
       - name: Checkout sources
         uses: actions/checkout@v1
 
-      - name: Set up JDK 17
+      - name: Set up Java 17
+        if: matrix.jvm == 'java'
         uses: actions/setup-java@v1
         with:
           java-version: 17
 
+      - name: Setup GraalVM
+        if: matrix.jvm == 'graalvm'
+        uses: graalvm/setup-graalvm@v1
+        with:
+          java-version: '17.0.12'
+          distribution: 'graalvm'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build with Maven
         if: matrix.os == 'ubuntu-latest'
         run: mvn --batch-mode -Pjacoco install -DskipCucumberTests=true
@@ -37,3 +47,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+
+      - name: Run cucumber tests
+        run: mvn test -pl tests

commons/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.powsybl</groupId>
         <artifactId>powsybl-open-rao</artifactId>
-        <version>6.2.0-SNAPSHOT</version>
+        <version>6.3.0-SNAPSHOT</version>
     </parent>
     <artifactId>open-rao-commons</artifactId>
     <packaging>jar</packaging>

commons/src/main/java/com/powsybl/openrao/commons/TemporalData.java

@@ -11,6 +11,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.Function;
 
 /**
  * @author Thomas Bouquet {@literal <thomas.bouquet at rte-france.com>}
@@ -27,4 +28,6 @@ default List<OffsetDateTime> getTimestamps() {
     }
 
     void add(OffsetDateTime timestamp, T data);
+
+    <U> TemporalData<U> map(Function<T, U> function);
 }

commons/src/main/java/com/powsybl/openrao/commons/TemporalDataImpl.java

@@ -10,6 +10,8 @@
 import java.time.OffsetDateTime;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * @author Thomas Bouquet {@literal <thomas.bouquet at rte-france.com>}
@@ -32,4 +34,8 @@ public Map<OffsetDateTime, T> getDataPerTimestamp() {
     public void add(OffsetDateTime timestamp, T data) {
         dataPerTimestamp.put(timestamp, data);
     }
+
+    public <U> TemporalData<U> map(Function<T, U> function) {
+        return new TemporalDataImpl<>(dataPerTimestamp.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, entry -> function.apply(entry.getValue()))));
+    }
 }

commons/src/test/java/com/powsybl/openrao/commons/TemporalDataImplTest.java

@@ -51,4 +51,13 @@ void testAddData() {
         assertEquals(List.of(timestamp3), stringTemporalData.getTimestamps());
         assertEquals(Optional.of("ABC"), stringTemporalData.getData(timestamp3));
     }
+
+    @Test
+    void testMap() {
+        Map<OffsetDateTime, String> stringPerTimestamp = Map.of(timestamp1, "Hello world!", timestamp2, "OpenRAO");
+        TemporalData<String> stringTemporalData = new TemporalDataImpl<>(stringPerTimestamp);
+
+        TemporalData<Integer> intTemporalData = stringTemporalData.map(String::length);
+        assertEquals(Map.of(timestamp1, 12, timestamp2, 7), intTemporalData.getDataPerTimestamp());
+    }
 }

data/crac/crac-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>open-rao-crac</artifactId>
         <groupId>com.powsybl</groupId>
-        <version>6.2.0-SNAPSHOT</version>
+        <version>6.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

data/crac/crac-api/src/main/java/com/powsybl/openrao/data/crac/api/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-api/src/main/java/com/powsybl/openrao/data/crac/api/rangeaction/PstRangeActionAdder.java

@@ -28,7 +28,7 @@ public interface PstRangeActionAdder extends RemedialActionAdder<PstRangeActionA
 
     PstRangeActionAdder withTapToAngleConversionMap(Map<Integer, Double> tapToAngleConversionMap);
 
-    PstRangeActionAdder withVariationCost(Double variationCost, RangeAction.VariationDirection variationDirection);
+    PstRangeActionAdder withVariationCost(Double variationCost, VariationDirection variationDirection);
 
     TapRangeAdder newTapRange();
 

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

@@ -55,9 +55,4 @@ public interface RangeAction<T extends RangeAction<T>> extends RemedialAction<T>
     Optional<String> getGroupId();
 
     Optional<Double> getVariationCost(VariationDirection variationDirection);
-
-    enum VariationDirection {
-        UP, DOWN
-    }
-
 }

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

@@ -20,6 +20,6 @@ public interface StandardRangeActionAdder<T extends StandardRangeActionAdder<T>>
 
     T withInitialSetpoint(double initialSetpoint);
 
-    T withVariationCost(Double variationCost, RangeAction.VariationDirection variationDirection);
+    T withVariationCost(Double variationCost, VariationDirection variationDirection);
 
 }

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

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2024, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+package com.powsybl.openrao.data.crac.api.rangeaction;
+
+/**
+ * @author Thomas Bouquet {@literal <thomas.bouquet at rte-france.com>}
+ */
+public enum VariationDirection {
+    UP, DOWN
+}

data/crac/crac-impl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>open-rao-crac</artifactId>
         <groupId>com.powsybl</groupId>
-        <version>6.2.0-SNAPSHOT</version>
+        <version>6.3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -7,6 +7,7 @@
 package com.powsybl.openrao.data.crac.impl;
 
 import com.powsybl.openrao.data.crac.api.rangeaction.RangeAction;
+import com.powsybl.openrao.data.crac.api.rangeaction.VariationDirection;
 import com.powsybl.openrao.data.crac.api.usagerule.UsageRule;
 
 import java.util.HashMap;

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

@@ -9,8 +9,8 @@
 import com.powsybl.openrao.commons.OpenRaoException;
 import com.powsybl.openrao.data.crac.api.range.StandardRange;
 import com.powsybl.openrao.data.crac.api.range.StandardRangeAdder;
-import com.powsybl.openrao.data.crac.api.rangeaction.RangeAction;
 import com.powsybl.openrao.data.crac.api.rangeaction.StandardRangeActionAdder;
+import com.powsybl.openrao.data.crac.api.rangeaction.VariationDirection;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -26,7 +26,7 @@ public abstract class AbstractStandardRangeActionAdder<T extends StandardRangeAc
     protected String groupId;
     protected double initialSetpoint;
     protected List<StandardRange> ranges;
-    protected Map<RangeAction.VariationDirection, Double> variationCosts;
+    protected Map<VariationDirection, Double> variationCosts;
 
     AbstractStandardRangeActionAdder(CracImpl crac) {
         super(crac);
@@ -47,7 +47,7 @@ public T withInitialSetpoint(double initialSetpoint) {
     }
 
     @Override
-    public T withVariationCost(Double variationCost, RangeAction.VariationDirection variationDirection) {
+    public T withVariationCost(Double variationCost, VariationDirection variationDirection) {
         this.variationCosts.put(variationDirection, variationCost);
         return (T) this;
     }

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

@@ -10,6 +10,7 @@
 import com.powsybl.openrao.data.crac.api.NetworkElement;
 import com.powsybl.openrao.data.crac.api.range.StandardRange;
 import com.powsybl.openrao.data.crac.api.rangeaction.CounterTradeRangeAction;
+import com.powsybl.openrao.data.crac.api.rangeaction.VariationDirection;
 import com.powsybl.openrao.data.crac.api.usagerule.UsageRule;
 import com.powsybl.iidm.network.Country;
 import com.powsybl.iidm.network.Network;

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

@@ -13,6 +13,7 @@
 import com.powsybl.openrao.data.crac.api.NetworkElement;
 import com.powsybl.openrao.data.crac.api.range.StandardRange;
 import com.powsybl.openrao.data.crac.api.rangeaction.HvdcRangeAction;
+import com.powsybl.openrao.data.crac.api.rangeaction.VariationDirection;
 import com.powsybl.openrao.data.crac.api.usagerule.UsageRule;
 import com.powsybl.iidm.network.HvdcLine;
 import com.powsybl.iidm.network.Network;

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

@@ -47,6 +47,24 @@ public InjectionRangeActionAdder withNetworkElementAndKey(double key, String net
         return this;
     }
 
+    @Override
+    public InjectionRangeActionAdder withNetworkElement(String networkElementId) {
+        if (distributionKeys.isEmpty()) {
+            return withNetworkElementAndKey(1.0, networkElementId, networkElementId);
+        } else {
+            throw new OpenRaoException("There are already NetworkElements tied to this injection. Use instead withNetworkElementAndKey() to add multiple NetworkElements");
+        }
+    }
+
+    @Override
+    public InjectionRangeActionAdder withNetworkElement(String networkElementId, String networkElementName) {
+        if (distributionKeys.isEmpty()) {
+            return withNetworkElementAndKey(1.0, networkElementId, networkElementName);
+        } else {
+            throw new OpenRaoException("There are already NetworkElements tied to this injection. Use instead withNetworkElementAndKey() to add multiple NetworkElements");
+        }
+    }
+
     @Override
     public InjectionRangeAction add() {
         checkId();

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

@@ -13,6 +13,7 @@
 import com.powsybl.openrao.data.crac.api.NetworkElement;
 import com.powsybl.openrao.data.crac.api.range.StandardRange;
 import com.powsybl.openrao.data.crac.api.rangeaction.InjectionRangeAction;
+import com.powsybl.openrao.data.crac.api.rangeaction.VariationDirection;
 import com.powsybl.openrao.data.crac.api.usagerule.UsageRule;
 import com.powsybl.iidm.network.Generator;
 import com.powsybl.iidm.network.Load;

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

@@ -9,12 +9,12 @@
 
 import com.powsybl.action.*;
 import com.powsybl.commons.report.ReportNode;
+import com.powsybl.iidm.modification.NetworkModificationImpact;
 import com.powsybl.iidm.network.*;
 import com.powsybl.openrao.data.crac.api.networkaction.NetworkAction;
 import com.powsybl.openrao.data.crac.api.networkaction.SwitchPair;
 import com.powsybl.openrao.data.crac.api.NetworkElement;
 import com.powsybl.openrao.data.crac.api.usagerule.UsageRule;
-import org.apache.commons.lang3.NotImplementedException;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -46,41 +46,10 @@ public Set<Action> getElementaryActions() {
     @Override
     public boolean hasImpactOnNetwork(Network network) {
         return elementaryActions.stream().anyMatch(elementaryAction -> {
-            if (elementaryAction instanceof GeneratorAction generatorAction) {
-                Generator generator = network.getGenerator(generatorAction.getGeneratorId());
-                return Math.abs(generator.getTargetP() - generatorAction.getActivePowerValue().getAsDouble()) >= EPSILON;
-            } else if (elementaryAction instanceof LoadAction loadAction) {
-                Load load = network.getLoad(loadAction.getLoadId());
-                return Math.abs(load.getP0() - loadAction.getActivePowerValue().getAsDouble()) >= EPSILON;
-            } else if (elementaryAction instanceof DanglingLineAction danglingLineAction) {
-                DanglingLine danglingLine = network.getDanglingLine(danglingLineAction.getDanglingLineId());
-                return Math.abs(danglingLine.getP0() - danglingLineAction.getActivePowerValue().getAsDouble()) >= EPSILON;
-            } else if (elementaryAction instanceof ShuntCompensatorPositionAction shuntCompensatorPositionAction) {
-                ShuntCompensator shuntCompensator = network.getShuntCompensator(shuntCompensatorPositionAction.getShuntCompensatorId());
-                return Math.abs(shuntCompensator.getSectionCount() - shuntCompensatorPositionAction.getSectionCount()) > 0;
-            } else if (elementaryAction instanceof PhaseTapChangerTapPositionAction phaseTapChangerTapPositionAction) {
-                PhaseTapChanger phaseTapChanger = network.getTwoWindingsTransformer(phaseTapChangerTapPositionAction.getTransformerId()).getPhaseTapChanger();
-                return phaseTapChangerTapPositionAction.getTapPosition() != phaseTapChanger.getTapPosition();
-            } else if (elementaryAction instanceof SwitchPair switchPair) {
+            if (elementaryAction instanceof SwitchPair switchPair) {
                 return !network.getSwitch(switchPair.getSwitchToOpen().getId()).isOpen() || network.getSwitch(switchPair.getSwitchToClose().getId()).isOpen();
-            } else if (elementaryAction instanceof TerminalsConnectionAction terminalsConnectionAction) {
-                Identifiable<?> element = network.getIdentifiable(terminalsConnectionAction.getElementId());
-                if (element instanceof Branch<?> branch) {
-                    if (terminalsConnectionAction.isOpen()) {
-                        // Line is considered closed if both terminal are connected
-                        return branch.getTerminal1().isConnected() && branch.getTerminal2().isConnected();
-                    } else {
-                        // Line is already considered opened if one of the terminals is disconnected
-                        return !branch.getTerminal1().isConnected() || !branch.getTerminal2().isConnected();
-                    }
-                } else {
-                    throw new NotImplementedException("TerminalsConnectionAction are only on branches for now");
-                }
-            } else if (elementaryAction instanceof SwitchAction switchAction) {
-                Switch aSwitch = network.getSwitch(switchAction.getSwitchId());
-                return aSwitch.isOpen() != switchAction.isOpen();
             } else {
-                throw new NotImplementedException();
+                return elementaryAction.toModification().hasImpactOnNetwork(network) == NetworkModificationImpact.HAS_IMPACT_ON_NETWORK;
             }
         });
     }
@@ -97,25 +66,12 @@ public boolean apply(Network network) {
 
     @Override
     public boolean canBeApplied(Network network) {
-        // TODO: To implement on powsybl-core Action
         return elementaryActions.stream().allMatch(elementaryAction -> {
-            if (elementaryAction instanceof ShuntCompensatorPositionAction shuntCompensatorPositionAction) {
-                ShuntCompensator shuntCompensator = network.getShuntCompensator(shuntCompensatorPositionAction.getShuntCompensatorId());
-                return shuntCompensatorPositionAction.getSectionCount() <= shuntCompensator.getMaximumSectionCount();
-            } else if (elementaryAction instanceof GeneratorAction || elementaryAction instanceof LoadAction || elementaryAction instanceof DanglingLineAction) {
-                return true;
-            } else if (elementaryAction instanceof PhaseTapChangerTapPositionAction phaseTapChangerTapPositionAction) {
-                // hypothesis: transformer is a two windings transformer
-                PhaseTapChanger phaseTapChanger = network.getTwoWindingsTransformer(phaseTapChangerTapPositionAction.getTransformerId()).getPhaseTapChanger();
-                int tapPosition = phaseTapChangerTapPositionAction.getTapPosition();
-                return tapPosition >= phaseTapChanger.getLowTapPosition() && tapPosition <= phaseTapChanger.getHighTapPosition();
-            } else if (elementaryAction instanceof SwitchPair switchPair) {
+            if (elementaryAction instanceof SwitchPair switchPair) {
                 // It is only applicable if, initially, one switch was closed and the other was open.
                 return network.getSwitch(switchPair.getSwitchToOpen().getId()).isOpen() != network.getSwitch(switchPair.getSwitchToClose().getId()).isOpen();
-            } else if (elementaryAction instanceof TerminalsConnectionAction || elementaryAction instanceof SwitchAction) {
-                return true;
             } else {
-                throw new NotImplementedException();
+                return elementaryAction.toModification().hasImpactOnNetwork(network) != NetworkModificationImpact.CANNOT_BE_APPLIED;
             }
         });
     }

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

@@ -14,7 +14,7 @@
 import com.powsybl.openrao.data.crac.api.range.RangeType;
 import com.powsybl.openrao.data.crac.api.range.TapRange;
 import com.powsybl.openrao.data.crac.api.range.TapRangeAdder;
-import com.powsybl.openrao.data.crac.api.rangeaction.RangeAction;
+import com.powsybl.openrao.data.crac.api.rangeaction.VariationDirection;
 import com.powsybl.openrao.data.crac.api.usagerule.UsageRule;
 
 import java.util.*;
@@ -34,7 +34,7 @@ public class PstRangeActionAdderImpl extends AbstractRemedialActionAdder<PstRang
     private String groupId = null;
     private Integer initialTap = null;
     private Map<Integer, Double> tapToAngleConversionMap;
-    private Map<RangeAction.VariationDirection, Double> variationCosts;
+    private Map<VariationDirection, Double> variationCosts;
 
     @Override
     protected String getTypeDescription() {
@@ -78,7 +78,7 @@ public PstRangeActionAdder withTapToAngleConversionMap(Map<Integer, Double> tapT
     }
 
     @Override
-    public PstRangeActionAdder withVariationCost(Double variationCost, RangeAction.VariationDirection variationDirection) {
+    public PstRangeActionAdder withVariationCost(Double variationCost, VariationDirection variationDirection) {
         this.variationCosts.put(variationDirection, variationCost);
         return this;
     }