Fix 2P ARA skipped opt #777
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pet-mit
requested changes
Aug 31, 2023
| // ---- only RAs from perimeters that haven't failed are included in appliedArasAndCras | ||
| // ---- this check is only performed here because SkippedOptimizationResultImpl with appliedRas can only be generated for AUTO instant | ||
| newPostContingencyResults.forEach((state, optResult) -> { | ||
| if (!(optResult instanceof SkippedOptimizationResultImpl)) { |
There was a problem hiding this comment.
can this work?
Suggested change
| if (!(optResult instanceof SkippedOptimizationResultImpl)) { | |
| if (!optResult.getSensitivityStatus().equals(FAILURE)) { |
There was a problem hiding this comment.
normalement c'est bien la même chose oui. mais un SkippedOpt n'a pas forcément un computationStatus failed (à sa création c'set bien le cas, et donc ici aussi). Je trouve ça plus clair en tout cas d'avoir la même écriture que plus loin (l518)
| addAppliedRangeActionsPostContingency(com.farao_community.farao.data.crac_api.Instant.AUTO, appliedArasAndCras, newPostContingencyResults); | ||
| // ---- only RAs from perimeters that haven't failed are included in appliedArasAndCras | ||
| // ---- this check is only performed here because SkippedOptimizationResultImpl with appliedRas can only be generated for AUTO instant | ||
| newPostContingencyResults.forEach((state, optResult) -> { |
There was a problem hiding this comment.
can you use stream / filter ?
Comment on lines
116
to
125
| public AppliedRemedialActions copyNetworkActionsAndAutomaticRangeActions() { | ||
| AppliedRemedialActions ara = new AppliedRemedialActions(); | ||
| appliedRa.forEach((state, appliedRaOnState) -> ara.addAppliedNetworkActions(state, appliedRaOnState.networkActions)); | ||
| appliedRa.forEach((state, appliedRaOnState) -> { | ||
| if (state.getInstant().equals(Instant.AUTO)) { | ||
| ara.addAppliedRangeActions(state, appliedRaOnState.rangeActions); | ||
| } | ||
| }); | ||
| return ara; | ||
| } |
| // if an elementary result is defined for the network element and state, return it | ||
| // else find a previous state with an elementary result | ||
| // if none are found, return reference setpoint | ||
| if (setPointPerState.containsKey(state)) { |
There was a problem hiding this comment.
can you create a recursive method instead? something like:
Suggested change
| if (setPointPerState.containsKey(state)) { | |
| Double lastSetpoint = getLastSetpoint(setPointPerState, state); | |
| if (lastSetPoint != null) { | |
| return lastSetPoint; | |
| } | |
| ... | |
| Double getLastSetpoint(Map setPointPerState, State state) { | |
| if (state == null) { | |
| return null; | |
| } | |
| if (setPointPerState.containsKey(state)) { | |
| return setPointPerState.get(state); | |
| } | |
| return getLastSetpoint(setPointPerState, getPreviousState(state).orElse(null)); | |
| } | |
pet-mit
approved these changes
Aug 31, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please check if the PR fulfills these requirements (please use
'[x]'to check the checkboxes, or submit the PR and then click the checkboxes)Does this PR already have an issue describing the problem ? If so, link to this issue using
'#XXX'and skip the restWhat 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)