Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2P condition #708

Merged
merged 5 commits into from
Jan 9, 2023
Merged

2P condition #708

merged 5 commits into from
Jan 9, 2023

Conversation

Godelaine
Copy link
Collaborator

Please check if the PR fulfills these requirements (please use '[x]' to check the checkboxes, or submit the PR and then click the checkboxes)

  • The commit message follows our guidelines
  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been added / updated (for bug fixes / features)

Does this PR already have an issue describing the problem ? If so, link to this issue using '#XXX' and skip the rest

What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)

What is the current behavior? (You can also link to an open issue here)

What is the new behavior (if this is a feature change)?

Does this PR introduce a breaking change? (What changes might users need to make in their application due to this PR?)

Other information:

(if any of the questions/checkboxes don't apply, please delete them entirely)

@@ -164,7 +164,10 @@ public CompletableFuture<RaoResult> run() {

mergedRaoResults = new PreventiveAndCurativesRaoResultImpl(stateTree, initialOutput, preventiveResult, preCurativeSensitivityAnalysisOutput, postContingencyResults);
if (shouldRunSecondPreventiveRao(raoParameters, preventiveResult, postContingencyResults.values(), mergedRaoResults, targetEndInstant, preventiveRaoTime)) {
mergedRaoResults = runSecondPreventiveAndAutoRao(raoInput, raoParameters, stateTree, toolProvider, prePerimeterSensitivityAnalysis, initialOutput, preventiveResult, postContingencyResults);
BUSINESS_LOGS.info("Results without 2P would have been:");
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2P => second preventive optimization

@pet-mit
Copy link
Collaborator

pet-mit commented Jan 9, 2023

can you create cucumber tests please?

@Godelaine Godelaine added PR: ready-to-be-merged This PR is waiting to be merged and removed PR: WIP labels Jan 9, 2023
@pet-mit pet-mit merged commit 01697ab into master Jan 9, 2023
@pet-mit pet-mit deleted the postCheck2P branch January 9, 2023 13:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR: ready-to-be-merged This PR is waiting to be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants