From 1f8fda1e08050a051d56dac483595a7664cf0bdb Mon Sep 17 00:00:00 2001 From: jeandemanged <33569483+jeandemanged@users.noreply.github.com> Date: Mon, 22 Jan 2024 09:42:33 +0100 Subject: [PATCH] Fix OLF boolean parameters getters (#962) Signed-off-by: Damien Jeandemange --- .../openloadflow/OpenLoadFlowParameters.java | 16 ++++++++-------- .../sensi/AcSensitivityAnalysis.java | 4 ++-- .../openloadflow/OpenLoadFlowParametersTest.java | 14 +++++++------- .../openloadflow/OpenLoadFlowProviderTest.java | 2 +- src/test/resources/debug-parameters.json | 2 ++ 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java b/src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java index e922215c81..e83a11fd13 100644 --- a/src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java +++ b/src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java @@ -506,7 +506,7 @@ public OpenLoadFlowParameters setSlackDistributionFailureBehavior(SlackDistribut return this; } - public boolean hasVoltageRemoteControl() { + public boolean isVoltageRemoteControl() { return voltageRemoteControl; } @@ -565,7 +565,7 @@ public OpenLoadFlowParameters setVoltagePerReactivePowerControl(boolean voltageP return this; } - public boolean hasGeneratorReactivePowerRemoteControl() { + public boolean isGeneratorReactivePowerRemoteControl() { return generatorReactivePowerRemoteControl; } @@ -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) @@ -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()) @@ -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() && @@ -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()) diff --git a/src/main/java/com/powsybl/openloadflow/sensi/AcSensitivityAnalysis.java b/src/main/java/com/powsybl/openloadflow/sensi/AcSensitivityAnalysis.java index fd0d4531bb..a6790b0a68 100644 --- a/src/main/java/com/powsybl/openloadflow/sensi/AcSensitivityAnalysis.java +++ b/src/main/java/com/powsybl/openloadflow/sensi/AcSensitivityAnalysis.java @@ -200,7 +200,7 @@ public void analyse(Network network, List contingencies, LfNetworkParameters lfNetworkParameters = new LfNetworkParameters() .setSlackBusSelector(slackBusSelector) .setConnectivityFactory(connectivityFactory) - .setGeneratorVoltageRemoteControl(lfParametersExt.hasVoltageRemoteControl()) + .setGeneratorVoltageRemoteControl(lfParametersExt.isVoltageRemoteControl()) .setMinImpedance(true) .setTwtSplitShuntAdmittance(lfParameters.isTwtSplitShuntAdmittance()) .setBreakers(breakers) @@ -211,7 +211,7 @@ public void analyse(Network network, List 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()) diff --git a/src/test/java/com/powsybl/openloadflow/OpenLoadFlowParametersTest.java b/src/test/java/com/powsybl/openloadflow/OpenLoadFlowParametersTest.java index 0cbed48f36..324e410e57 100644 --- a/src/test/java/com/powsybl/openloadflow/OpenLoadFlowParametersTest.java +++ b/src/test/java/com/powsybl/openloadflow/OpenLoadFlowParametersTest.java @@ -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()); @@ -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 @@ -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 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 diff --git a/src/test/java/com/powsybl/openloadflow/OpenLoadFlowProviderTest.java b/src/test/java/com/powsybl/openloadflow/OpenLoadFlowProviderTest.java index d908e7a00a..ae243e27eb 100644 --- a/src/test/java/com/powsybl/openloadflow/OpenLoadFlowProviderTest.java +++ b/src/test/java/com/powsybl/openloadflow/OpenLoadFlowProviderTest.java @@ -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 diff --git a/src/test/resources/debug-parameters.json b/src/test/resources/debug-parameters.json index b179188616..023c8b8d37 100644 --- a/src/test/resources/debug-parameters.json +++ b/src/test/resources/debug-parameters.json @@ -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, @@ -35,6 +36,7 @@ "maxSusceptanceMismatch" : 1.0E-4, "slackBusPMaxMismatch" : 1.0, "voltagePerReactivePowerControl" : false, + "generatorReactivePowerRemoteControl" : false, "transformerReactivePowerControl" : false, "maxNewtonRaphsonIterations" : 15, "maxOuterLoopIterations" : 20,