Skip to content

Commit

Permalink
Fix OLF boolean parameters getters (#962)
Browse files Browse the repository at this point in the history 
Signed-off-by: Damien Jeandemange <damien.jeandemange@artelys.com>
  • Loading branch information
@jeandemanged
jeandemanged authored Jan 22, 2024
1 parent b518a4d commit 1f8fda1
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 18 deletions.
16 changes: 8 additions & 8 deletions src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ public OpenLoadFlowParameters setSlackDistributionFailureBehavior(SlackDistribut
return this;
}

public boolean hasVoltageRemoteControl() {
public boolean isVoltageRemoteControl() {
return voltageRemoteControl;
}

Expand Down Expand Up @@ -565,7 +565,7 @@ public OpenLoadFlowParameters setVoltagePerReactivePowerControl(boolean voltageP
return this;
}

public boolean hasGeneratorReactivePowerRemoteControl() {
public boolean isGeneratorReactivePowerRemoteControl() {
return generatorReactivePowerRemoteControl;
}

Expand Down Expand Up @@ -1429,7 +1429,7 @@ static LfNetworkParameters getNetworkParameters(LoadFlowParameters parameters, O
return new LfNetworkParameters()
.setSlackBusSelector(slackBusSelector)
.setConnectivityFactory(connectivityFactory)
.setGeneratorVoltageRemoteControl(parametersExt.hasVoltageRemoteControl())
.setGeneratorVoltageRemoteControl(parametersExt.isVoltageRemoteControl())
.setMinImpedance(parametersExt.getLowImpedanceBranchMode() == OpenLoadFlowParameters.LowImpedanceBranchMode.REPLACE_BY_MIN_IMPEDANCE_LINE)
.setTwtSplitShuntAdmittance(parameters.isTwtSplitShuntAdmittance())
.setBreakers(breakers)
Expand All @@ -1441,7 +1441,7 @@ static LfNetworkParameters getNetworkParameters(LoadFlowParameters parameters, O
.setPhaseControl(parameters.isPhaseShifterRegulationOn())
.setTransformerVoltageControl(parameters.isTransformerVoltageControlOn())
.setVoltagePerReactivePowerControl(parametersExt.isVoltagePerReactivePowerControl())
.setGeneratorReactivePowerRemoteControl(parametersExt.hasGeneratorReactivePowerRemoteControl())
.setGeneratorReactivePowerRemoteControl(parametersExt.isGeneratorReactivePowerRemoteControl())
.setTransformerReactivePowerControl(parametersExt.isTransformerReactivePowerControl())
.setLoadFlowModel(parameters.isDc() ? LoadFlowModel.DC : LoadFlowModel.AC)
.setShuntVoltageControl(parameters.isShuntCompensatorVoltageControlOn())
Expand Down Expand Up @@ -1645,13 +1645,13 @@ public static boolean equals(LoadFlowParameters parameters1, LoadFlowParameters
return extension1.getSlackBusSelectionMode() == extension2.getSlackBusSelectionMode() &&
extension1.getSlackBusesIds().equals(extension2.getSlackBusesIds()) &&
extension1.getSlackDistributionFailureBehavior() == extension2.getSlackDistributionFailureBehavior() &&
extension1.hasVoltageRemoteControl() == extension2.hasVoltageRemoteControl() &&
extension1.isVoltageRemoteControl() == extension2.isVoltageRemoteControl() &&
extension1.getLowImpedanceBranchMode() == extension2.getLowImpedanceBranchMode() &&
extension1.isLoadPowerFactorConstant() == extension2.isLoadPowerFactorConstant() &&
extension1.getPlausibleActivePowerLimit() == extension2.getPlausibleActivePowerLimit() &&
extension1.getSlackBusPMaxMismatch() == extension2.getSlackBusPMaxMismatch() &&
extension1.isVoltagePerReactivePowerControl() == extension2.isVoltagePerReactivePowerControl() &&
extension1.hasGeneratorReactivePowerRemoteControl() == extension2.hasGeneratorReactivePowerRemoteControl() &&
extension1.isGeneratorReactivePowerRemoteControl() == extension2.isGeneratorReactivePowerRemoteControl() &&
extension1.isTransformerReactivePowerControl() == extension2.isTransformerReactivePowerControl() &&
extension1.getMaxNewtonRaphsonIterations() == extension2.getMaxNewtonRaphsonIterations() &&
extension1.getMaxOuterLoopIterations() == extension2.getMaxOuterLoopIterations() &&
Expand Down Expand Up @@ -1722,13 +1722,13 @@ public static LoadFlowParameters clone(LoadFlowParameters parameters) {
.setSlackBusSelectionMode(extension.getSlackBusSelectionMode())
.setSlackBusesIds(new ArrayList<>(extension.getSlackBusesIds()))
.setSlackDistributionFailureBehavior(extension.getSlackDistributionFailureBehavior())
.setVoltageRemoteControl(extension.hasVoltageRemoteControl())
.setVoltageRemoteControl(extension.isVoltageRemoteControl())
.setLowImpedanceBranchMode(extension.getLowImpedanceBranchMode())
.setLoadPowerFactorConstant(extension.isLoadPowerFactorConstant())
.setPlausibleActivePowerLimit(extension.getPlausibleActivePowerLimit())
.setSlackBusPMaxMismatch(extension.getSlackBusPMaxMismatch())
.setVoltagePerReactivePowerControl(extension.isVoltagePerReactivePowerControl())
.setGeneratorReactivePowerRemoteControl(extension.hasGeneratorReactivePowerRemoteControl())
.setGeneratorReactivePowerRemoteControl(extension.isGeneratorReactivePowerRemoteControl())
.setTransformerReactivePowerControl(extension.isTransformerReactivePowerControl())
.setMaxNewtonRaphsonIterations(extension.getMaxNewtonRaphsonIterations())
.setMaxOuterLoopIterations(extension.getMaxOuterLoopIterations())
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/powsybl/openloadflow/sensi/AcSensitivityAnalysis.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ public void analyse(Network network, List<PropagatedContingency> contingencies,
LfNetworkParameters lfNetworkParameters = new LfNetworkParameters()
.setSlackBusSelector(slackBusSelector)
.setConnectivityFactory(connectivityFactory)
.setGeneratorVoltageRemoteControl(lfParametersExt.hasVoltageRemoteControl())
.setGeneratorVoltageRemoteControl(lfParametersExt.isVoltageRemoteControl())
.setMinImpedance(true)
.setTwtSplitShuntAdmittance(lfParameters.isTwtSplitShuntAdmittance())
.setBreakers(breakers)
Expand All @@ -211,7 +211,7 @@ public void analyse(Network network, List<PropagatedContingency> contingencies,
.setPhaseControl(lfParameters.isPhaseShifterRegulationOn())
.setTransformerVoltageControl(lfParameters.isTransformerVoltageControlOn())
.setVoltagePerReactivePowerControl(lfParametersExt.isVoltagePerReactivePowerControl())
.setGeneratorReactivePowerRemoteControl(lfParametersExt.hasGeneratorReactivePowerRemoteControl())
.setGeneratorReactivePowerRemoteControl(lfParametersExt.isGeneratorReactivePowerRemoteControl())
.setTransformerReactivePowerControl(lfParametersExt.isTransformerReactivePowerControl())
.setLoadFlowModel(lfParameters.isDc() ? LoadFlowModel.DC : LoadFlowModel.AC)
.setShuntVoltageControl(lfParameters.isShuntCompensatorVoltageControlOn())
Expand Down
14 changes: 7 additions & 7 deletions src/test/java/com/powsybl/openloadflow/OpenLoadFlowParametersTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ void testConfig() {
OpenLoadFlowParameters olfParameters = parameters.getExtension(OpenLoadFlowParameters.class);
assertEquals(SlackBusSelectionMode.FIRST, olfParameters.getSlackBusSelectionMode());
assertEquals(OpenLoadFlowParameters.SLACK_DISTRIBUTION_FAILURE_BEHAVIOR_DEFAULT_VALUE, olfParameters.getSlackDistributionFailureBehavior());
assertTrue(olfParameters.hasVoltageRemoteControl());
assertTrue(olfParameters.isVoltageRemoteControl());
assertEquals(OpenLoadFlowParameters.LOW_IMPEDANCE_BRANCH_MODE_DEFAULT_VALUE, olfParameters.getLowImpedanceBranchMode());
assertEquals(LfNetworkParameters.MIN_PLAUSIBLE_TARGET_VOLTAGE_DEFAULT_VALUE, olfParameters.getMinPlausibleTargetVoltage());
assertEquals(LfNetworkParameters.MAX_PLAUSIBLE_TARGET_VOLTAGE_DEFAULT_VALUE, olfParameters.getMaxPlausibleTargetVoltage());
Expand All @@ -102,11 +102,11 @@ void testDefaultOpenLoadflowConfig() {

OpenLoadFlowParameters olfParameters = parameters.getExtension(OpenLoadFlowParameters.class);
assertEquals(OpenLoadFlowParameters.SLACK_BUS_SELECTION_MODE_DEFAULT_VALUE, olfParameters.getSlackBusSelectionMode());
assertEquals(OpenLoadFlowParameters.VOLTAGE_REMOTE_CONTROL_DEFAULT_VALUE, olfParameters.hasVoltageRemoteControl());
assertEquals(OpenLoadFlowParameters.VOLTAGE_REMOTE_CONTROL_DEFAULT_VALUE, olfParameters.isVoltageRemoteControl());
assertEquals(OpenLoadFlowParameters.LOW_IMPEDANCE_BRANCH_MODE_DEFAULT_VALUE, olfParameters.getLowImpedanceBranchMode());
assertEquals(OpenLoadFlowParameters.SLACK_DISTRIBUTION_FAILURE_BEHAVIOR_DEFAULT_VALUE, olfParameters.getSlackDistributionFailureBehavior());
assertEquals(OpenLoadFlowParameters.SLACK_BUS_P_MAX_MISMATCH_DEFAULT_VALUE, olfParameters.getSlackBusPMaxMismatch(), 0.0);
assertEquals(OpenLoadFlowParameters.GENERATOR_REACTIVE_POWER_REMOTE_CONTROL_DEFAULT_VALUE, olfParameters.hasGeneratorReactivePowerRemoteControl());
assertEquals(OpenLoadFlowParameters.GENERATOR_REACTIVE_POWER_REMOTE_CONTROL_DEFAULT_VALUE, olfParameters.isGeneratorReactivePowerRemoteControl());
}

@Test
Expand Down Expand Up @@ -278,17 +278,17 @@ void testUpdateParameters() {
parametersMap.put("reactivePowerRemoteControl", "false");
OpenLoadFlowParameters parameters = OpenLoadFlowParameters.load(parametersMap);
assertEquals(SlackBusSelectionMode.FIRST, parameters.getSlackBusSelectionMode());
assertTrue(parameters.hasVoltageRemoteControl());
assertFalse(parameters.hasGeneratorReactivePowerRemoteControl());
assertTrue(parameters.isVoltageRemoteControl());
assertFalse(parameters.isGeneratorReactivePowerRemoteControl());
Map<String, String> updateParametersMap = new HashMap<>();
updateParametersMap.put("slackBusSelectionMode", "MOST_MESHED");
updateParametersMap.put("voltageRemoteControl", "false");
updateParametersMap.put("maxNewtonRaphsonIterations", "10");
parameters.update(updateParametersMap);
assertEquals(SlackBusSelectionMode.MOST_MESHED, parameters.getSlackBusSelectionMode());
assertFalse(parameters.hasVoltageRemoteControl());
assertFalse(parameters.isVoltageRemoteControl());
assertEquals(10, parameters.getMaxNewtonRaphsonIterations());
assertFalse(parameters.hasGeneratorReactivePowerRemoteControl());
assertFalse(parameters.isGeneratorReactivePowerRemoteControl());
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/powsybl/openloadflow/OpenLoadFlowProviderTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ void specificParametersTest() {
updateParametersMap.put("voltageRemoteControl", "false");
provider.updateSpecificParameters(parameters.getExtension(OpenLoadFlowParameters.class), updateParametersMap);
assertEquals(SlackBusSelectionMode.MOST_MESHED, parameters.getExtension(OpenLoadFlowParameters.class).getSlackBusSelectionMode());
assertFalse(parameters.getExtension(OpenLoadFlowParameters.class).hasVoltageRemoteControl());
assertFalse(parameters.getExtension(OpenLoadFlowParameters.class).isVoltageRemoteControl());
}

@Test
Expand Down
2 changes: 2 additions & 0 deletions src/test/resources/debug-parameters.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"slackBusSelectionMode" : "NAME",
"slackBusesIds" : [ "b1_vl_0" ],
"slackDistributionFailureBehavior" : "LEAVE_ON_SLACK_BUS",
"voltageRemoteControl" : true,
"lowImpedanceBranchMode" : "REPLACE_BY_ZERO_IMPEDANCE_LINE",
"loadPowerFactorConstant" : false,
"plausibleActivePowerLimit" : 5000.0,
Expand All @@ -35,6 +36,7 @@
"maxSusceptanceMismatch" : 1.0E-4,
"slackBusPMaxMismatch" : 1.0,
"voltagePerReactivePowerControl" : false,
"generatorReactivePowerRemoteControl" : false,
"transformerReactivePowerControl" : false,
"maxNewtonRaphsonIterations" : 15,
"maxOuterLoopIterations" : 20,
Expand Down

0 comments on commit 1f8fda1

Please sign in to comment.