Skip to content

Commit 086328b

Browse files
bqth29phiedw
andauthored
Update ra-optimisation/search-tree-rao/src/main/java/com/powsybl/openrao/searchtreerao/marmot/Marmot.java
Co-authored-by: phiedw <philippe.edwards@rte-france.com> Signed-off-by: Thomas Bouquet <63302082+bqth29@users.noreply.github.com>
1 parent 0b3e907 commit 086328b

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,8 @@ private ObjectiveFunctionResult getInitialObjectiveFunctionResult(TemporalData<P
222222
return new GlobalLinearOptimizationResult(prePerimeterResults.map(PrePerimeterResult::getFlowResult), prePerimeterResults.map(PrePerimeterResult::getSensitivityResult), prePerimeterResults.map(RangeActionActivationResultImpl::new), new TemporalDataImpl<>(), objectiveFunction, LinearProblemStatus.OPTIMAL);
223223
}
224224

225-
private LinearOptimizationResult getPostTopologicalOptimizationResult(TemporalData<PrePerimeterResult> prePerimeterResults, TemporalData<NetworkActionsResult> preventiveTopologicalActions, ObjectiveFunction objectiveFunction) {
226-
return new GlobalLinearOptimizationResult(prePerimeterResults.map(PrePerimeterResult::getFlowResult), prePerimeterResults.map(PrePerimeterResult::getSensitivityResult), prePerimeterResults.map(RangeActionActivationResultImpl::new), preventiveTopologicalActions, objectiveFunction, LinearProblemStatus.OPTIMAL);
225+
private LinearOptimizationResult getPostTopologicalOptimizationResult(TemporalData<PrePerimeterResult> postTopologicalActionsResults, TemporalData<NetworkActionsResult> preventiveTopologicalActions, ObjectiveFunction objectiveFunction) {
226+
return new GlobalLinearOptimizationResult(postTopologicalActionsResults.map(PrePerimeterResult::getFlowResult), postTopologicalActionsResults.map(PrePerimeterResult::getSensitivityResult), postTopologicalActionsResults.map(RangeActionActivationResultImpl::new), preventiveTopologicalActions, objectiveFunction, LinearProblemStatus.OPTIMAL);
227227
}
228228

229229
@Override

0 commit comments

Comments
 (0)