Skip to content

Commit 0c143d0

Browse files
committed
fix serialization of new parameter
Signed-off-by: Didier Vidal <didier.vidal_externe@rte-france.com>
1 parent f107f3e commit 0c143d0

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ public enum ReactiveRangeCheckMode {
605605

606606
private double areaInterchangePMaxMismatch = AREA_INTERCHANGE_P_MAX_MISMATCH_DEFAULT_VALUE;
607607

608-
private boolean remoteVoltageControlIgnoreQpercent = REMOTE_VOLTAGE_CONTROL_IGNORE_QPERCENT_DEFAULT_VALUE;
608+
private boolean remoteVoltageControlIgnoreQPercent = REMOTE_VOLTAGE_CONTROL_IGNORE_QPERCENT_DEFAULT_VALUE;
609609

610610
public static double checkParameterValue(double parameterValue, boolean condition, String parameterName) {
611611
if (!condition) {
@@ -1332,12 +1332,12 @@ public OpenLoadFlowParameters setAreaInterchangePMaxMismatch(double areaIntercha
13321332
return this;
13331333
}
13341334

1335-
public boolean isRemoteVoltageControlIgnoreQpercent() {
1336-
return remoteVoltageControlIgnoreQpercent;
1335+
public boolean isRemoteVoltageControlIgnoreQPercent() {
1336+
return remoteVoltageControlIgnoreQPercent;
13371337
}
13381338

1339-
public OpenLoadFlowParameters setRemoteVoltageControlIgnoreQpercent(boolean remoteVoltageControlIgnoreQpercent) {
1340-
this.remoteVoltageControlIgnoreQpercent = remoteVoltageControlIgnoreQpercent;
1339+
public OpenLoadFlowParameters setRemoteVoltageControlIgnoreQPercent(boolean remoteVoltageControlIgnoreQPercent) {
1340+
this.remoteVoltageControlIgnoreQPercent = remoteVoltageControlIgnoreQPercent;
13411341
return this;
13421342
}
13431343

@@ -1420,7 +1420,7 @@ public static OpenLoadFlowParameters load(PlatformConfig platformConfig) {
14201420
.setAreaInterchangeControl(config.getBooleanProperty(AREA_INTERCHANGE_CONTROL_PARAM_NAME, AREA_INTERCHANGE_CONTROL_DEFAULT_VALUE))
14211421
.setAreaInterchangeControlAreaType(config.getStringProperty(AREA_INTERCHANGE_CONTROL_AREA_TYPE_PARAM_NAME, LfNetworkParameters.AREA_INTERCHANGE_CONTROL_AREA_TYPE_DEFAULT_VALUE))
14221422
.setAreaInterchangePMaxMismatch(config.getDoubleProperty(AREA_INTERCHANGE_P_MAX_MISMATCH_PARAM_NAME, AREA_INTERCHANGE_P_MAX_MISMATCH_DEFAULT_VALUE))
1423-
.setRemoteVoltageControlIgnoreQpercent(config.getBooleanProperty(REMOTE_VOLTAGE_CONTROL_IGNORE_QPERCENT_PARAM_NAME, REMOTE_VOLTAGE_CONTROL_IGNORE_QPERCENT_DEFAULT_VALUE)));
1423+
.setRemoteVoltageControlIgnoreQPercent(config.getBooleanProperty(REMOTE_VOLTAGE_CONTROL_IGNORE_QPERCENT_PARAM_NAME, REMOTE_VOLTAGE_CONTROL_IGNORE_QPERCENT_DEFAULT_VALUE)));
14241424
return parameters;
14251425
}
14261426

@@ -1582,7 +1582,7 @@ public OpenLoadFlowParameters update(Map<String, String> properties) {
15821582
Optional.ofNullable(properties.get(AREA_INTERCHANGE_P_MAX_MISMATCH_PARAM_NAME))
15831583
.ifPresent(prop -> this.setAreaInterchangePMaxMismatch(Double.parseDouble(prop)));
15841584
Optional.ofNullable(properties.get(REMOTE_VOLTAGE_CONTROL_IGNORE_QPERCENT_PARAM_NAME))
1585-
.ifPresent(prop -> this.setRemoteVoltageControlIgnoreQpercent(Boolean.parseBoolean(prop)));
1585+
.ifPresent(prop -> this.setRemoteVoltageControlIgnoreQPercent(Boolean.parseBoolean(prop)));
15861586
return this;
15871587
}
15881588

@@ -1659,7 +1659,7 @@ public Map<String, Object> toMap() {
16591659
map.put(AREA_INTERCHANGE_CONTROL_PARAM_NAME, areaInterchangeControl);
16601660
map.put(AREA_INTERCHANGE_CONTROL_AREA_TYPE_PARAM_NAME, areaInterchangeControlAreaType);
16611661
map.put(AREA_INTERCHANGE_P_MAX_MISMATCH_PARAM_NAME, areaInterchangePMaxMismatch);
1662-
map.put(REMOTE_VOLTAGE_CONTROL_IGNORE_QPERCENT_PARAM_NAME, remoteVoltageControlIgnoreQpercent);
1662+
map.put(REMOTE_VOLTAGE_CONTROL_IGNORE_QPERCENT_PARAM_NAME, remoteVoltageControlIgnoreQPercent);
16631663
return map;
16641664
}
16651665

@@ -1817,7 +1817,7 @@ static LfNetworkParameters getNetworkParameters(LoadFlowParameters parameters, O
18171817
.setFictitiousGeneratorVoltageControlCheckMode(parametersExt.getFictitiousGeneratorVoltageControlCheckMode())
18181818
.setAreaInterchangeControl(parametersExt.isAreaInterchangeControl())
18191819
.setAreaInterchangeControlAreaType(parametersExt.getAreaInterchangeControlAreaType())
1820-
.setRemoteVoltageControlIgnoreQPercent(parametersExt.isRemoteVoltageControlIgnoreQpercent());
1820+
.setRemoteVoltageControlIgnoreQPercent(parametersExt.isRemoteVoltageControlIgnoreQPercent());
18211821
}
18221822

18231823
public static AcLoadFlowParameters createAcParameters(Network network, LoadFlowParameters parameters, OpenLoadFlowParameters parametersExt,
@@ -1917,7 +1917,7 @@ public static DcLoadFlowParameters createDcParameters(LoadFlowParameters paramet
19171917
.setReferenceBusSelector(ReferenceBusSelector.fromMode(parametersExt.getReferenceBusSelectionMode()))
19181918
.setAreaInterchangeControl(parametersExt.isAreaInterchangeControl())
19191919
.setAreaInterchangeControlAreaType(parametersExt.getAreaInterchangeControlAreaType())
1920-
.setRemoteVoltageControlIgnoreQPercent(parametersExt.isRemoteVoltageControlIgnoreQpercent());
1920+
.setRemoteVoltageControlIgnoreQPercent(parametersExt.isRemoteVoltageControlIgnoreQPercent());
19211921

19221922
var equationSystemCreationParameters = new DcEquationSystemCreationParameters()
19231923
.setUpdateFlows(true)
@@ -2046,7 +2046,7 @@ public static boolean equals(LoadFlowParameters parameters1, LoadFlowParameters
20462046
extension1.isAreaInterchangeControl() == extension2.isAreaInterchangeControl() &&
20472047
Objects.equals(extension1.getAreaInterchangeControlAreaType(), extension2.getAreaInterchangeControlAreaType()) &&
20482048
extension1.getAreaInterchangePMaxMismatch() == extension2.getAreaInterchangePMaxMismatch() &&
2049-
extension1.isRemoteVoltageControlIgnoreQpercent() == extension2.isRemoteVoltageControlIgnoreQpercent();
2049+
extension1.isRemoteVoltageControlIgnoreQPercent() == extension2.isRemoteVoltageControlIgnoreQPercent();
20502050
}
20512051

20522052
public static LoadFlowParameters clone(LoadFlowParameters parameters) {
@@ -2143,7 +2143,7 @@ public static LoadFlowParameters clone(LoadFlowParameters parameters) {
21432143
.setAreaInterchangeControl(extension.isAreaInterchangeControl())
21442144
.setAreaInterchangeControlAreaType(extension.getAreaInterchangeControlAreaType())
21452145
.setAreaInterchangePMaxMismatch(extension.getAreaInterchangePMaxMismatch())
2146-
.setRemoteVoltageControlIgnoreQpercent(extension.isRemoteVoltageControlIgnoreQpercent());
2146+
.setRemoteVoltageControlIgnoreQPercent(extension.isRemoteVoltageControlIgnoreQPercent());
21472147

21482148
if (extension2 != null) {
21492149
parameters2.addExtension(OpenLoadFlowParameters.class, extension2);

src/main/java/com/powsybl/openloadflow/sensi/AcSensitivityAnalysis.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ public void analyse(Network network, List<PropagatedContingency> contingencies,
226226
.setReferenceBusSelector(ReferenceBusSelector.DEFAULT_SELECTOR) // not supported yet
227227
.setAreaInterchangeControl(lfParametersExt.isAreaInterchangeControl())
228228
.setAreaInterchangeControlAreaType(lfParametersExt.getAreaInterchangeControlAreaType())
229-
.setRemoteVoltageControlIgnoreQPercent(lfParametersExt.isRemoteVoltageControlIgnoreQpercent());
229+
.setRemoteVoltageControlIgnoreQPercent(lfParametersExt.isRemoteVoltageControlIgnoreQPercent());
230230

231231
// create networks including all necessary switches
232232
try (LfNetworkList lfNetworks = Networks.load(network, lfNetworkParameters, topoConfig, reportNode)) {

src/test/java/com/powsybl/openloadflow/ac/GeneratorRemoteControlTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ void testWith3GeneratorsAndCoordinatedReactiveControlExtensions() {
195195
assertReactivePowerEquals(-63.07, g2.getTerminal());
196196
assertReactivePowerEquals(-21.023, g3.getTerminal());
197197

198-
parametersExt.setRemoteVoltageControlIgnoreQpercent(true);
198+
parametersExt.setRemoteVoltageControlIgnoreQPercent(true);
199199
g1.newMinMaxReactiveLimits().setMaxQ(100).setMinQ(-100).add();
200200
g2.newMinMaxReactiveLimits().setMaxQ(100).setMinQ(-100).add();
201201
g3.newMinMaxReactiveLimits().setMaxQ(200).setMinQ(-200).add();

src/test/resources/debug-parameters.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
"areaInterchangeControl" : false,
9292
"areaInterchangeControlAreaType" : "ControlArea",
9393
"areaInterchangePMaxMismatch" : 2.0,
94-
"remoteVoltageControlIgnoreQpercent" : false
94+
"remoteVoltageControlIgnoreQPercent" : false
9595
}
9696
}
9797
},

0 commit comments

Comments
 (0)