Split NR and outer loops max iterations #730
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
Signed-off-by: Geoffroy Jamgotchian <geoffroy.jamgotchian@gmail.com>
geofjamg
changed the title
geofjamg
changed the title
geofjamg
commented
Mar 6, 2023
| @@ -146,12 +158,9 @@ public AcLoadFlowResult run() { | |||
| outerLoop.cleanup(outerLoopContext); | |||
| } | |||
|
|
|||
| int nrIterations = runningContext.lastNrResult.getIteration(); | |||
| int outerLoopIterations = runningContext.outerLoopIterationByType.values().stream().mapToInt(MutableInt::getValue).sum() + 1; | |||
|
|
|||
| AcLoadFlowResult result = new AcLoadFlowResult(context.getNetwork(), | |||
There was a problem hiding this comment.
To fix: add a status for max outer loop iterations reached.
geofjamg
changed the title
# Conflicts: # src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java
annetill
reviewed
Mar 17, 2023
annetill
reviewed
Mar 17, 2023
| @@ -54,6 +54,10 @@ private static class RunningContext { | |||
| private NewtonRaphsonResult lastNrResult; | |||
|
|
|||
| private final Map<String, MutableInt> outerLoopIterationByType = new HashMap<>(); | |||
|
|
|||
| private int cumulatedOuterLoopIterations = 0; | |||
There was a problem hiding this comment.
after discussions -> total
annetill
reviewed
Mar 17, 2023
| private NewtonRaphsonStatus runIteration(StateVectorScaling svScaling) { | ||
| LOGGER.debug("Start iteration {}", iteration); | ||
| private NewtonRaphsonStatus runIteration(StateVectorScaling svScaling, MutableInt iterations) { | ||
| LOGGER.debug("Start iteration {}/{}", iterations, parameters.getMaxIterations()); |
There was a problem hiding this comment.
This is weird: the max iterations is not always the total number of iterations.
annetill
reviewed
Mar 17, 2023
| @@ -13,23 +13,19 @@ | |||
| */ | |||
| public class NewtonRaphsonParameters { | |||
|
|
|||
| public static final int DEFAULT_MAX_ITERATION = 30; | |||
| public static final int DEFAULT_MAX_ITERATIONS = 15; | |||
There was a problem hiding this comment.
10 might be too low for very rare and difficult cases, 20 is probably too much so 15...
# Conflicts: # src/main/java/com/powsybl/openloadflow/OpenLoadFlowProvider.java # src/test/java/com/powsybl/openloadflow/OpenLoadFlowParametersTest.java # src/test/java/com/powsybl/openloadflow/OpenLoadFlowProviderTest.java
Signed-off-by: Geoffroy Jamgotchian <geoffroy.jamgotchian@rte-france.com>
# Conflicts: # src/test/java/com/powsybl/openloadflow/OpenLoadFlowParametersTest.java
annetill
reviewed
Mar 17, 2023
| // continue with outer loops only if initial Newton-Raphson succeed | ||
| if (runningContext.lastNrResult.getStatus() == NewtonRaphsonStatus.CONVERGED) { | ||
|
|
||
| // re-run all outer loops until Newton-Raphson failed or no more Newton-Raphson iterations are needed | ||
| int oldIterationCount; | ||
| int oldCumulatedNrIterations; |
There was a problem hiding this comment.
You have kept here oldCumulatedNrIterations.
|
Kudos, SonarCloud Quality Gate passed! |
annetill
reviewed
Mar 20, 2023
| } | ||
| } | ||
| throw new PowsyblException("No tap position found (should never happen)"); |
There was a problem hiding this comment.
Do we need to log an error message or not? It is the issue I met last week but I am not sure to understand why we can have no tap position...
annetill
approved these changes
Mar 20, 2023
geofjamg
added a commit
that referenced
this pull request
Mar 20, 2023
Signed-off-by: Geoffroy Jamgotchian <geoffroy.jamgotchian@rte-france.com>
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.
Signed-off-by: Geoffroy Jamgotchian geoffroy.jamgotchian@gmail.com
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 restNo
What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)
Feature
What is the current behavior? (You can also link to an open issue here)
We can only control the max number of cumulated NR iterations.
What is the new behavior (if this is a feature change)?
We can control the max number of iterations for each NR run and the max number of outer loop iterations. This will allow to better adapt the max number of outer loop iterations when more and more controls (outer loops) are added without changing the NR configuration.
Does this PR introduce a breaking change or deprecate an API? If yes, check the following:
Other information:
(if any of the questions/checkboxes don't apply, please delete them entirely)