Discrete control optional #319
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
flo-dup
force-pushed
the
issue-discrete-control
branch
2 times, most recently
from
308216f to
92ff1f7
Compare
flo-dup
force-pushed
the
discrete-control-optional
branch
from
80f12a6 to
e93032e
Compare
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
flo-dup
force-pushed
the
discrete-control-optional
branch
from
e93032e to
6e8e01a
Compare
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
annetill
reviewed
Jun 16, 2021
| @@ -35,11 +37,12 @@ public OuterLoopStatus check(OuterLoopContext context, Reporter reporter) { | |||
|
|
|||
| if (context.getIteration() == 0) { | |||
| for (LfBus bus : context.getNetwork().getBuses()) { | |||
| if (bus.isDiscreteVoltageControlled()) { | |||
| Optional<DiscreteVoltageControl> dvc = bus.getDiscreteVoltageControl().filter(dvc0 -> bus.isDiscreteVoltageControlled()); | |||
| if (dvc.isPresent()) { | |||
There was a problem hiding this comment.
Can you hare change for a more explicit name such as voltageControl because you use it during several lines? And keep dvc for the filter?
There was a problem hiding this comment.
in fact I changed the code to have something similar to PhaseControlOuterLoop, which is clearer at the cost of creating a list of enabled voltage controls.
annetill
reviewed
Jun 16, 2021
| EquationTerm vTerm = EquationTerm.createVariableTerm(bus, VariableType.BUS_V, variableSet, bus.getV().eval()); | ||
| equationSystem.createEquation(bus.getNum(), EquationType.BUS_V).addTerm(vTerm); | ||
| bus.setV(vTerm); | ||
| bus.getDiscreteVoltageControl() |
annetill
reviewed
Jun 16, 2021
| return bus.getDiscreteVoltageControl().filter(dvc -> bus.isDiscreteVoltageControlled()) | ||
| .map(DiscreteVoltageControl::getTargetValue) | ||
| .orElse(getVoltageControlledTargetValue(bus) | ||
| .orElse(Double.NaN)); |
There was a problem hiding this comment.
No, but it's a bit unclear, so I changed it to
.orElse(
getVoltageControlledTargetValue(bus).orElse(Double.NaN)
);
annetill
reviewed
Jun 16, 2021
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Signed-off-by: Anne Tilloy <anne.tilloy@rte-france.com>
annetill
approved these changes
Jun 17, 2021
|
Kudos, SonarCloud Quality Gate passed! |
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 ?
No
What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)
Refactor
What is the current behavior? (You can also link to an open issue here)
LfBus::getDiscreteVoltageControlandLfBranch::getDiscreteVoltageControlreturnnullif no controlWhat is the new behavior (if this is a feature change)?
the
getDiscreteVoltageControlreturn anOptional<DiscreteVoltageControl>Does this PR introduce a breaking change or deprecate an API?
No
Other information:
Done to have something similar to VoltageControl