feat(time coupled): Change lead and lag time handling (#1681)

* stop forcing P to go through Pmin for generators with lead/lag going through startup/shutdown


Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>

Author: RoxaneChen02

docs/algorithms/castor/linear-problem/time-coupled-constraints/generator-constraints-filler.md

@@ -151,15 +151,6 @@ $$- \epsilon_{P}^{\text{OFF}} T_{\textcolor{red}{\text{OFF}} \to \textcolor{red}
 
 #### OFF to ON transition
 
-##### With lead time
-
-With a lead time, the generator must first step up to $P_{\min}$ before to be operated between $P_{\min}$ and $P_{\max}$
-under the power gradient constraints.
-
-$$\left ( P_{\min}(g, t + \Delta_{\tau}) - \epsilon_{P}^{\text{OFF}} \right ) T_{\textcolor{red}{\text{OFF}} \to \textcolor{green}{\text{ON}}}(g,s,t) \leq P(g,s,t + \Delta_{\tau}) - P(g,s,t) \leq P_{\min}(g, t + \Delta_{\tau}) T_{\textcolor{red}{\text{OFF}} \to \textcolor{green}{\text{ON}}}(g,s,t)$$
-
-##### Without lead time
-
 $$\left ( P_{\min}(g, t + \Delta_{\tau}) - \epsilon_{P}^{\text{OFF}} \right ) T_{\textcolor{red}{\text{OFF}} \to \textcolor{green}{\text{ON}}}(g,s,t) \leq P(g,s,t + \Delta_{\tau}) - P(g,s,t) \leq \left ( P_{\min}(g, t + \Delta_{\tau}) + \nabla^{+}(g) \Delta_{\tau} \right ) T_{\textcolor{red}{\text{OFF}} \to \textcolor{green}{\text{ON}}}(g,s,t)$$
 
 #### ON to ON transition
@@ -168,15 +159,6 @@ $$\nabla^{-}(g) \Delta_{\tau} T_{\textcolor{green}{\text{ON}} \to \textcolor{gre
 
 #### ON to OFF transition
 
-##### With lag time
-
-With a lag time, the generator must step down from $P_{\min}$ to 0 instead of being shut down from any power value above
-$P_{\min}$.
-
-$$- P_{\min}(g, t) T_{\textcolor{green}{\text{ON}} \to \textcolor{red}{\text{OFF}}}(g,s,t) \leq P(g,s,t + \Delta_{\tau}) - P(g,s,t) \leq - \left ( P_{\min}(g, t) - \epsilon_{P}^{\text{OFF}} \right ) T_{\textcolor{green}{\text{ON}} \to \textcolor{red}{\text{OFF}}}(g,s,t)$$
-
-##### Without lag time
-
 $$- \left ( P_{\min}(g, t) - \nabla^{-}(g) \Delta_{\tau} \right) T_{\textcolor{green}{\text{ON}} \to \textcolor{red}{\text{OFF}}}(g,s,t) \leq P(g,s,t + \Delta_{\tau}) - P(g,s,t) \leq - \left ( P_{\min}(g, t) - \epsilon_{P}^{\text{OFF}} \right ) T_{\textcolor{green}{\text{ON}} \to \textcolor{red}{\text{OFF}}}(g,s,t)$$
 
 ### C8 - Shut down prohibited

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

@@ -325,25 +325,14 @@ private void addPowerVariationConstraints(LinearProblem linearProblem,
             generatorConstraints.getGeneratorId(), timestamp, LinearProblem.GeneratorState.OFF, LinearProblem.GeneratorState.ON
         );
         powerTransitionConstraintInf.setCoefficient(offOnTransitionVariable, -(nextPMin - OFF_POWER_THRESHOLD));
-        if (generatorConstraints.getLeadTime().isPresent()) {
-            // if the generator has a lead time, ON state starts at Pmin on a timestamp before power increases
-            powerTransitionConstraintSup.setCoefficient(offOnTransitionVariable, -nextPMin);
-        } else {
-            // otherwise the power is simply constrained by the power gradient
-            powerTransitionConstraintSup.setCoefficient(offOnTransitionVariable, -nextPMin - upwardPowerGradient * timestampDuration);
-        }
+        powerTransitionConstraintSup.setCoefficient(offOnTransitionVariable, -nextPMin - upwardPowerGradient * timestampDuration);
 
         // ON -> OFF
         OpenRaoMPVariable onOffTransitionVariable = linearProblem.getGeneratorStateTransitionVariable(
             generatorConstraints.getGeneratorId(), timestamp, LinearProblem.GeneratorState.ON, LinearProblem.GeneratorState.OFF
         );
-        if (lagTimeWithLeadTime.isPresent()) {
-            // if the generator has a lag time, ON state finishes at Pmin on a timestamp before power decreases
-            powerTransitionConstraintInf.setCoefficient(onOffTransitionVariable, pMin);
-        } else {
-            // otherwise the power is simply constrained by the power gradient
-            powerTransitionConstraintInf.setCoefficient(onOffTransitionVariable, pMin - downwardPowerGradient * timestampDuration);
-        }
+
+        powerTransitionConstraintInf.setCoefficient(onOffTransitionVariable, pMin - downwardPowerGradient * timestampDuration);
         powerTransitionConstraintSup.setCoefficient(onOffTransitionVariable, pMin - OFF_POWER_THRESHOLD);
     }
 

ra-optimisation/search-tree-rao/src/test/java/com/powsybl/openrao/searchtreerao/linearoptimisation/algorithms/fillers/GeneratorConstraintsFillerTest.java

@@ -7,7 +7,7 @@
                     <iidm:property name="geographicalName" value="BE1"/>
                 </iidm:bus>
             </iidm:busBreakerTopology>
-            <iidm:generator id="BBE1AA1 _generator" energySource="OTHER" minP="-9000.0" maxP="9000.0" voltageRegulatorOn="true" targetP="0.0" targetV="400.0" targetQ="0.0" bus="BBE1AA1 " connectableBus="BBE1AA1 ">
+            <iidm:generator id="BBE1AA1 _generator" energySource="OTHER" minP="100.0" maxP="9000.0" voltageRegulatorOn="true" targetP="0.0" targetV="400.0" targetQ="0.0" bus="BBE1AA1 " connectableBus="BBE1AA1 ">
                 <iidm:minMaxReactiveLimits minQ="-9000.0" maxQ="9000.0"/>
             </iidm:generator>
         </iidm:voltageLevel>

ra-optimisation/search-tree-rao/src/test/resources/network/6Nodes.xiidm

@@ -227,41 +227,9 @@ Feature: 4.1: Time-coupled generator constraints with MARMOT with ICS files
     Then the functional cost for all timestamps is 3960
     Then the total cost for all timestamps is 26890.25
 
-  @fast @rao @dc @redispatching @marmot @costly
-  Scenario: 4.1.6: Lead time and Pmin.
-  The generator involved in the Belgian redispatching action has a 15 min lead time and must be operated at 1000 MW at
-  2:30. Because of its lead time, it must be switched on at 1:30 and operated at its Pmin (100 MW), leading to a
-  supplementary expense of 1000 in remedial actions for this generator. For grid balancing reasons, the French
-  generator must be switched off thus doubling the expenses.
-  StartUp is allowed for BBE2, Shutdown is allowed for FFR1.
-    Given network files are in folder "epic93/TestCases_93_2_6"
-    Given crac file is "epic93/cbcora_93_2_6.xml"
-    Given ics static file is "epic93/static_93_2_6.csv"
-    Given ics series file is "epic93/series_93_2_6.csv"
-    Given configuration file is "epic93/RaoParameters_minCost_megawatt_dc.json"
-    Given time-coupled rao inputs for CORE are:
-      | Timestamp        | Network         |
-      | 2019-01-08 00:30 | 2Nodes_0030.uct |
-      | 2019-01-08 01:30 | 2Nodes_0130.uct |
-      | 2019-01-08 02:30 | 2Nodes_0230.uct |
-    When I launch marmot
-    # Timestamp 00:30:
-    Then the functional cost for timestamp "2019-01-08 00:30" is 0.0
-    Then the preventive power of generator "RD_RA_BE_BBE2AA1_GENERATOR" at timestamp "2019-01-08 00:30" is 0.0 MW
-    Then the preventive power of generator "RD_RA_FR_FFR1AA1_GENERATOR" at timestamp "2019-01-08 00:30" is 1000.0 MW
-    # Timestamp 01:30: 10 * 1000 MW * 2 generators
-    Then the functional cost for timestamp "2019-01-08 01:30" is 2000.0
-    Then the preventive power of generator "RD_RA_BE_BBE2AA1_GENERATOR" at timestamp "2019-01-08 01:30" is 100.0 MW
-    Then the preventive power of generator "RD_RA_FR_FFR1AA1_GENERATOR" at timestamp "2019-01-08 01:30" is 900.0 MW
-    # Timestamp 02:30: 10 * 1000 MW * 2 generators
-    Then the functional cost for timestamp "2019-01-08 02:30" is 20000.0
-    Then the functional cost for all timestamps is 22000.0
-    Then the preventive power of generator "RD_RA_BE_BBE2AA1_GENERATOR" at timestamp "2019-01-08 02:30" is 1000.0 MW
-    Then the preventive power of generator "RD_RA_FR_FFR1AA1_GENERATOR" at timestamp "2019-01-08 02:30" is 0.0 MW
-
     # TODO to be modified when check on generator constraint is performed at import
   @fast @rao @dc @redispatching @marmot @costly
-  Scenario: 4.1.7: Inconsistent data : BE generator's program shuts down even though shutDown is not allowed,
+  Scenario: 4.1.6: Inconsistent data : BE generator's program shuts down even though shutDown is not allowed,
     FR generator's program starts up even though startUp is not allowed.
     Given network files are in folder "epic93/TestCases_93_2_6"
     Given crac file is "epic93/cbcora_93_2_6.xml"