remove power gradients (#1295)

Signed-off-by: Thomas Bouquet <thomas.bouquet@rte-france.com>
Co-authored-by: Godelaine <87479798+Godelaine@users.noreply.github.com>

Author: bqth29

data/inter-temporal-constraint/pom.xml

@@ -20,7 +20,6 @@
         <module>flowbased-domain</module>
         <module>generator-constraints</module>
         <module>glsk</module>
-        <module>inter-temporal-constraint</module>
         <module>rao-result</module>
         <module>refprog</module>
         <module>virtual-hubs</module>

data/inter-temporal-constraint/src/main/java/com/powsybl/openrao/data/intertemporalconstraint/PowerGradient.java

@@ -87,11 +87,6 @@
             <artifactId>open-rao-generator-constraints</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>open-rao-inter-temporal-constraint</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>open-rao-loopflow-computation</artifactId>

data/inter-temporal-constraint/src/test/java/com/powsybl/openrao/data/intertemporalconstraint/PowerGradientTest.java

@@ -295,11 +295,6 @@
                 <artifactId>open-rao-glsk-virtual-hubs</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>open-rao-inter-temporal-constraint</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>open-rao-rao-result</artifactId>

data/pom.xml

@@ -22,11 +22,6 @@
             <artifactId>open-rao-crac-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.powsybl</groupId>
-            <artifactId>open-rao-inter-temporal-constraint</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>open-rao-rao-result-api</artifactId>
@@ -115,5 +110,9 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.powsybl</groupId>
+            <artifactId>open-rao-generator-constraints</artifactId>
+        </dependency>
     </dependencies>
 </project>

distribution/pom.xml

@@ -9,7 +9,7 @@
 
 import com.powsybl.openrao.commons.OpenRaoException;
 import com.powsybl.openrao.commons.TemporalData;
-import com.powsybl.openrao.data.intertemporalconstraint.PowerGradient;
+import com.powsybl.openrao.data.generatorconstraints.GeneratorConstraints;
 
 import java.time.OffsetDateTime;
 import java.util.HashSet;
@@ -23,17 +23,17 @@
 public class InterTemporalRaoInput {
     private final TemporalData<RaoInput> raoInputs;
     private final Set<OffsetDateTime> timestampsToRun;
-    private final Set<PowerGradient> powerGradients;
+    private final Set<GeneratorConstraints> generatorConstraints;
 
-    public InterTemporalRaoInput(TemporalData<RaoInput> raoInputs, Set<OffsetDateTime> timestampsToRun, Set<PowerGradient> powerGradients) {
+    public InterTemporalRaoInput(TemporalData<RaoInput> raoInputs, Set<OffsetDateTime> timestampsToRun, Set<GeneratorConstraints> powerGradients) {
         this.raoInputs = raoInputs;
         this.timestampsToRun = timestampsToRun;
-        this.powerGradients = powerGradients;
+        this.generatorConstraints = powerGradients;
         checkTimestampsToRun();
     }
 
-    public InterTemporalRaoInput(TemporalData<RaoInput> raoInputs, Set<PowerGradient> powerGradients) {
-        this(raoInputs, new HashSet<>(raoInputs.getTimestamps()), powerGradients);
+    public InterTemporalRaoInput(TemporalData<RaoInput> raoInputs, Set<GeneratorConstraints> generatorConstraints) {
+        this(raoInputs, new HashSet<>(raoInputs.getTimestamps()), generatorConstraints);
     }
 
     public TemporalData<RaoInput> getRaoInputs() {
@@ -44,8 +44,8 @@ public Set<OffsetDateTime> getTimestampsToRun() {
         return timestampsToRun;
     }
 
-    public Set<PowerGradient> getPowerGradients() {
-        return powerGradients;
+    public Set<GeneratorConstraints> getGeneratorConstraints() {
+        return generatorConstraints;
     }
 
     private void checkTimestampsToRun() {

pom.xml

@@ -10,7 +10,7 @@
 import com.powsybl.openrao.commons.OpenRaoException;
 import com.powsybl.openrao.commons.TemporalData;
 import com.powsybl.openrao.commons.TemporalDataImpl;
-import com.powsybl.openrao.data.intertemporalconstraint.PowerGradient;
+import com.powsybl.openrao.data.generatorconstraints.GeneratorConstraints;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
@@ -32,7 +32,7 @@ class InterTemporalRaoInputTest {
     private OffsetDateTime timestamp2;
     private OffsetDateTime timestamp3;
     private TemporalData<RaoInput> temporalData;
-    private Set<PowerGradient> powerGradients;
+    private Set<GeneratorConstraints> generatorConstraints;
 
     @BeforeEach
     void setUp() {
@@ -43,23 +43,26 @@ void setUp() {
         timestamp2 = OffsetDateTime.of(2024, 12, 10, 17, 21, 0, 0, ZoneOffset.UTC);
         timestamp3 = OffsetDateTime.of(2024, 12, 10, 18, 21, 0, 0, ZoneOffset.UTC);
         temporalData = new TemporalDataImpl<>(Map.of(timestamp1, raoInput1, timestamp2, raoInput2, timestamp3, raoInput3));
-        powerGradients = Set.of(PowerGradient.builder().withNetworkElementId("generator-1").withMaxValue(200.0).build(), PowerGradient.builder().withNetworkElementId("generator-2").withMinValue(-50.0).build());
+        generatorConstraints = Set.of(
+            GeneratorConstraints.create().withGeneratorId("generator-1").withLeadTime(0.0).withLagTime(0.0).withPMin(400.0).withPMax(1000.0).withUpwardPowerGradient(200.0).build(),
+            GeneratorConstraints.create().withGeneratorId("generator-2").withLeadTime(0.0).withLagTime(0.0).withPMin(400.0).withPMax(1000.0).withDownwardPowerGradient(-50.0).build()
+        );
     }
 
     @Test
     void testInstantiateInterTemporalRaoInput() {
-        InterTemporalRaoInput input = new InterTemporalRaoInput(temporalData, Set.of(timestamp1, timestamp3), powerGradients);
+        InterTemporalRaoInput input = new InterTemporalRaoInput(temporalData, Set.of(timestamp1, timestamp3), generatorConstraints);
         assertEquals(temporalData, input.getRaoInputs());
         assertEquals(Set.of(timestamp1, timestamp3), input.getTimestampsToRun());
-        assertEquals(powerGradients, input.getPowerGradients());
+        assertEquals(generatorConstraints, input.getGeneratorConstraints());
     }
 
     @Test
     void testInstantiateInterTemporalRaoInputAllTimestamps() {
-        InterTemporalRaoInput input = new InterTemporalRaoInput(temporalData, powerGradients);
+        InterTemporalRaoInput input = new InterTemporalRaoInput(temporalData, generatorConstraints);
         assertEquals(temporalData, input.getRaoInputs());
         assertEquals(Set.of(timestamp1, timestamp2, timestamp3), input.getTimestampsToRun());
-        assertEquals(powerGradients, input.getPowerGradients());
+        assertEquals(generatorConstraints, input.getGeneratorConstraints());
     }
 
     @Test