Skip to content

Commit 6ad08ae

Browse files
authored
use postContingencyResults for previous instant results => fixes auto instant for curative cnecs (#1564)
Signed-off-by: Godelaine de Montmorillon <godelaine.demontmorillon@rte-france.com>
1 parent e2a9a68 commit 6ad08ae

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -435,10 +435,16 @@ private Map<State, PostPerimeterResult> mergeRaoAndPstRegulationResults(Set<PstR
435435
OptimizationResult newOptimizationResult = new OptimizationResultImpl(postCraSensitivityAnalysisOutput, postCraSensitivityAnalysisOutput, postCraSensitivityAnalysisOutput, new NetworkActionsResultImpl(appliedNetworkActions), postRegulationRangeActionActivationResult);
436436

437437
for (State state : postContingencyResults.keySet()) {
438-
postRegulationPostContingencyResults.put(state, new PostPerimeterResult(
439-
regulatedStates.contains(state) ? newOptimizationResult : postContingencyResults.get(state).optimizationResult(),
440-
postCraSensitivityAnalysisOutput
441-
));
438+
// For instants before pst regulation instant, keep previous results
439+
if (state.getInstant().comesBefore(crac.getLastInstant())) {
440+
postRegulationPostContingencyResults.put(state, postContingencyResults.get(state));
441+
} else {
442+
// For curative instant, update regulatedStates with newly computed sensi result
443+
postRegulationPostContingencyResults.put(state, new PostPerimeterResult(
444+
regulatedStates.contains(state) ? newOptimizationResult : postContingencyResults.get(state).optimizationResult(),
445+
postCraSensitivityAnalysisOutput
446+
));
447+
}
442448
}
443449

444450
return postRegulationPostContingencyResults;

0 commit comments

Comments
 (0)