refacto: PostPerimeterSensitivityAnalysis remove unecessary future (#1585)

* refacto simple

Signed-off-by: CHEN Roxane <roxane.chen@rte-france.com>
Co-authored-by: Godelaine <godelaine.demontmorillon@rte-france.com>

Author: RoxaneChen02

ra-optimisation/search-tree-rao/src/main/java/com/powsybl/openrao/searchtreerao/castor/algorithm/CastorContingencyScenarios.java

@@ -205,18 +205,15 @@ private PostPerimeterResult getResultPostState(State state, Network networkClone
             .filter(s -> s.getInstant().comesAfter(state.getInstant()))
             .forEach(statesToConsider::add);
         PostPerimeterSensitivityAnalysis postPerimeterSensitivityAnalysis = new PostPerimeterSensitivityAnalysis(crac, statesToConsider, raoParameters, toolProvider);
-        try {
-            return postPerimeterSensitivityAnalysis.runBasedOnInitialPreviousAndOptimizationResults(
-                networkClone,
-                initialSensitivityOutput,
-                CompletableFuture.completedFuture(prePerimeterSensitivityOutput),
-                stateTree.getOperatorsNotSharingCras(),
-                optimizationResult,
-                new AppliedRemedialActions()).get();
-        } catch (InterruptedException | ExecutionException e) {
-            Thread.currentThread().interrupt();
-            throw new OpenRaoException(String.format("Error while running sensi after state %s", state.getId()), e);
-        }
+
+        return postPerimeterSensitivityAnalysis.runBasedOnInitialPreviousAndOptimizationResults(
+            networkClone,
+            initialSensitivityOutput,
+            prePerimeterSensitivityOutput,
+            stateTree.getOperatorsNotSharingCras(),
+            optimizationResult,
+            new AppliedRemedialActions());
+
     }
 
     private PrePerimeterSensitivityAnalysis getPreCurativePerimeterSensitivityAnalysis(Perimeter curativePerimeter) {

ra-optimisation/search-tree-rao/src/main/java/com/powsybl/openrao/searchtreerao/castor/algorithm/CastorFullOptimization.java

@@ -7,7 +7,6 @@
 
 package com.powsybl.openrao.searchtreerao.castor.algorithm;
 
-import com.powsybl.openrao.commons.OpenRaoException;
 import com.powsybl.openrao.data.crac.api.Crac;
 import com.powsybl.openrao.data.crac.api.Instant;
 import com.powsybl.openrao.data.crac.api.State;
@@ -278,14 +277,8 @@ public CompletableFuture<RaoResult> run() {
 
     private PostPerimeterResult computePostPreventiveResult(ToolProvider toolProvider, PrePerimeterResult initialOutput, OptimizationResult preventiveResult) {
         PostPerimeterResult postPreventiveResult;
-        try {
-            postPreventiveResult = new PostPerimeterSensitivityAnalysis(crac, crac.getFlowCnecs(), crac.getRangeActions(), raoParameters, toolProvider)
-                .runBasedOnInitialPreviousAndOptimizationResults(network, initialOutput, CompletableFuture.completedFuture(initialOutput), Collections.emptySet(), preventiveResult, null)
-                .get();
-        } catch (InterruptedException | ExecutionException e) {
-            Thread.currentThread().interrupt();
-            throw new OpenRaoException("Exception during post preventive sensitivity analysis", e);
-        }
+        postPreventiveResult = new PostPerimeterSensitivityAnalysis(crac, crac.getFlowCnecs(), crac.getRangeActions(), raoParameters, toolProvider)
+            .runBasedOnInitialPreviousAndOptimizationResults(network, initialOutput, initialOutput, Collections.emptySet(), preventiveResult, null);
         return postPreventiveResult;
     }
 

ra-optimisation/search-tree-rao/src/main/java/com/powsybl/openrao/searchtreerao/castor/algorithm/PostPerimeterSensitivityAnalysis.java

@@ -25,8 +25,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicReference;
 
 import static com.powsybl.openrao.commons.logs.OpenRaoLoggerProvider.TECHNICAL_LOGS;
@@ -62,9 +60,9 @@ public PostPerimeterSensitivityAnalysis(Crac crac,
      *     <li> the optimizationResult of the given perimeter for action cost </li>
      * </ul>
      */
-    public Future<PostPerimeterResult> runBasedOnInitialPreviousAndOptimizationResults(Network network,
+    public PostPerimeterResult runBasedOnInitialPreviousAndOptimizationResults(Network network,
                                                                                        FlowResult initialFlowResult,
-                                                                                       Future<PrePerimeterResult> previousResultsFuture,
+                                                                                       PrePerimeterResult previousResultsFuture,
                                                                                        Set<String> operatorsNotSharingCras,
                                                                                        OptimizationResult optimizationResult,
                                                                                        AppliedRemedialActions appliedCurativeRemedialActions) {
@@ -78,36 +76,32 @@ public Future<PostPerimeterResult> runBasedOnInitialPreviousAndOptimizationResul
             sensitivityComputer.compute(network);
             flowResult.set(sensitivityComputer.getBranchResult(network));
             sensitivityResult.set(sensitivityComputer.getSensitivityResult());
+        } else {
+            flowResult.set(previousResultsFuture);
+            sensitivityResult.set(previousResultsFuture);
         }
 
-        // Thread is executed once previousResultsFuture is fetched
-        return Executors.newSingleThreadExecutor().submit(() -> {
-            if (!actionWasTaken) {
-                flowResult.set(previousResultsFuture.get());
-                sensitivityResult.set(previousResultsFuture.get());
-            }
-            ObjectiveFunction objectiveFunction = ObjectiveFunction.build(
-                flowCnecs,
-                toolProvider.getLoopFlowCnecs(flowCnecs),
-                initialFlowResult,
-                previousResultsFuture.get(),
-                operatorsNotSharingCras,
-                raoParameters,
-                optimizationResult.getActivatedRangeActionsPerState().keySet()
-            );
-
-            ObjectiveFunctionResult objectiveFunctionResult = objectiveFunction.evaluate(
-                flowResult.get(),
-                new RemedialActionActivationResultImpl(optimizationResult, optimizationResult)
-            );
-
-            return new PostPerimeterResult(optimizationResult, new PrePerimeterSensitivityResultImpl(
-                flowResult.get(),
-                sensitivityResult.get(),
-                RangeActionSetpointResultImpl.buildWithSetpointsFromNetwork(network, rangeActions),
-                objectiveFunctionResult
-            ));
-        });
+        ObjectiveFunction objectiveFunction = ObjectiveFunction.build(
+            flowCnecs,
+            toolProvider.getLoopFlowCnecs(flowCnecs),
+            initialFlowResult,
+            previousResultsFuture,
+            operatorsNotSharingCras,
+            raoParameters,
+            optimizationResult.getActivatedRangeActionsPerState().keySet()
+        );
+
+        ObjectiveFunctionResult objectiveFunctionResult = objectiveFunction.evaluate(
+            flowResult.get(),
+            new RemedialActionActivationResultImpl(optimizationResult, optimizationResult)
+        );
+
+        return new PostPerimeterResult(optimizationResult, new PrePerimeterSensitivityResultImpl(
+            flowResult.get(),
+            sensitivityResult.get(),
+            RangeActionSetpointResultImpl.buildWithSetpointsFromNetwork(network, rangeActions),
+            objectiveFunctionResult
+        ));
     }
 
     /**