made some changes for setpoint results to get from postTopo rather than initial (which was failing)

Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>

Author: phiedw

ra-optimisation/search-tree-rao/src/main/java/com/powsybl/openrao/searchtreerao/marmot/Marmot.java

@@ -402,7 +402,8 @@ private static LinearOptimizationResult optimizeLinearRemedialActions(
         ObjectiveFunction objectiveFunction) {
 
         // -- Build IteratingLinearOptimizerInterTemporalInput
-        TemporalData<OptimizationPerimeter> optimizationPerimeterPerTimestamp = computeOptimizationPerimetersPerTimestamp(raoInput.getRaoInputs().map(RaoInput::getCrac), initialResults, consideredCnecs);
+        // Need to use postTopoResults to build perimeter because initialResults does not contain range action setpoints
+        TemporalData<OptimizationPerimeter> optimizationPerimeterPerTimestamp = computeOptimizationPerimetersPerTimestamp(raoInput.getRaoInputs().map(RaoInput::getCrac), postTopoResults, consideredCnecs);
         // no objective function defined in individual IteratingLinearOptimizerInputs as it is global
         Map<OffsetDateTime, IteratingLinearOptimizerInput> linearOptimizerInputPerTimestamp = new HashMap<>();
         raoInput.getRaoInputs().getTimestamps().forEach(timestamp -> linearOptimizerInputPerTimestamp.put(timestamp, IteratingLinearOptimizerInput.create()
@@ -411,7 +412,7 @@ private static LinearOptimizationResult optimizeLinearRemedialActions(
             .withInitialFlowResult(initialResults.getData(timestamp).orElseThrow())
             .withPrePerimeterFlowResult(initialResults.getData(timestamp).orElseThrow())
             .withPreOptimizationFlowResult(postTopoResults.getData(timestamp).orElseThrow())
-            .withPrePerimeterSetpoints(initialResults.getData(timestamp).orElseThrow())
+            .withPrePerimeterSetpoints(postTopoResults.getData(timestamp).orElseThrow()) //use postTopoResults because initial does not contain setpoints
             .withPreOptimizationSensitivityResult(postTopoResults.getData(timestamp).orElseThrow())
             .withPreOptimizationAppliedRemedialActions(curativeRemedialActions.getData(timestamp).orElseThrow())
             .withToolProvider(ToolProvider.buildFromRaoInputAndParameters(raoInput.getRaoInputs().getData(timestamp).orElseThrow(), parameters))
@@ -454,17 +455,17 @@ private static boolean doesPrePerimeterSetpointRespectRange(RangeAction<?> range
         }
     }
 
-    private static TemporalData<OptimizationPerimeter> computeOptimizationPerimetersPerTimestamp(TemporalData<Crac> cracs, TemporalData<PrePerimeterResult> prePerimeterResults, TemporalData<Set<String>> consideredCnecs) {
+    private static TemporalData<OptimizationPerimeter> computeOptimizationPerimetersPerTimestamp(TemporalData<Crac> cracs, TemporalData<? extends RangeActionSetpointResult> prePerimeterSetpointResults, TemporalData<Set<String>> consideredCnecs) {
         TemporalData<OptimizationPerimeter> optimizationPerimeters = new TemporalDataImpl<>();
         cracs.getTimestamps().forEach(timestamp -> {
             Crac crac = cracs.getData(timestamp).orElseThrow();
-            PrePerimeterResult prePerimeterResult = prePerimeterResults.getData(timestamp).orElseThrow();
+            RangeActionSetpointResult prePerimeterSetpointResult = prePerimeterSetpointResults.getData(timestamp).orElseThrow();
             optimizationPerimeters.add(timestamp, new PreventiveOptimizationPerimeter(
                 crac.getPreventiveState(),
                 MarmotUtils.getFilteredCnecs(crac, consideredCnecs.getData(timestamp).orElseThrow()),
                 new HashSet<>(),
                 new HashSet<>(),
-                crac.getRangeActions(crac.getPreventiveState(), UsageMethod.AVAILABLE).stream().filter(rangeAction -> doesPrePerimeterSetpointRespectRange(rangeAction, prePerimeterResult)).collect(Collectors.toSet())
+                crac.getRangeActions(crac.getPreventiveState(), UsageMethod.AVAILABLE).stream().filter(rangeAction -> doesPrePerimeterSetpointRespectRange(rangeAction, prePerimeterSetpointResult)).collect(Collectors.toSet())
             ));
         });
         return optimizationPerimeters;

tests/src/test/resources/com/powsybl/openrao/tests/features/epic93_redispatching/US93_2.feature

@@ -56,7 +56,7 @@ Feature: US 93.1: power gradient constraints
     When I launch marmot
 
   @fast @rao @dc @redispatching @preventive-only
-  Scenario: US 93.2.2: Test for CORE IDCC 3
+  Scenario: US 93.2.3: Test for CORE IDCC 3
     Given network files are in folder "20240926-FID2-620-v4-10V1001C--00264T-to-10V1001C--00085T"
     Given crac file is "20240926-FSC-ID2-CB-v1-10V1001C--00264T-to-10XFR-RTE------Q.xml"
     Given ics static file is "_10V1001C–00275O_CSA-COMRA-RDSTATIC-D_CORE-20240926-V001_.csv"
@@ -70,6 +70,20 @@ Feature: US 93.1: power gradient constraints
       | 2024-09-26 02:30 | 20240926_0230_2D4_UX0_FEXPORTGRIDMODEL_CGM_10V1001C--00264T.uct |
     When I launch marmot
 
+
+  @fast @rao @dc @redispatching @preventive-only
+  Scenario: US 93.2.2: Test for CORE IDCC 1 TS
+    Given network files are in folder "20240926-FID2-620-v4-10V1001C--00264T-to-10V1001C--00085T"
+    Given crac file is "20240926-FSC-ID2-CB-v1-10V1001C--00264T-to-10XFR-RTE------Q.xml"
+    Given ics static file is "_10V1001C–00275O_CSA-COMRA-RDSTATIC-D_CORE-20240926-V001_.csv"
+    Given ics series file is "_10V1001C–00275O_CSA-COMRA-RDSERIES-D_CORE-20240926-V001_.csv"
+    Given ics gsk file is "_10V1001C--00275O_CSA-INDRA-GSK-D_D2-20240602-V004_.csv"
+    Given configuration file is "epic93/RaoParameters_minCost_megawatt_dc.json"
+    Given intertemporal rao inputs are:
+      | Timestamp        | Network                                                         |
+      | 2024-09-26 00:30 | 20240926_0030_2D4_UX0_FEXPORTGRIDMODEL_CGM_10V1001C--00264T.uct |
+    When I launch marmot
+
   @fast @rao @dc @redispatching @preventive-only
   Scenario: US 93.2.4: Test for core idcc 0602
     Given network files are in folder "20240602-FID2-620-v4-10V1001C--00264T-to-10V1001C--00085T"