Skip to content

Commit 127153c

Browse files
anas-drissijonenst
authored andcommitted
removal of references to fields q0 and p0
Signed-off-by: anas-drissi <[email protected]>
1 parent 7496573 commit 127153c

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

network-store-iidm-impl/src/main/java/com/powsybl/network/store/iidm/impl/BatteryImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public double getMaxP() {
9696
public Battery setMaxP(double maxP) {
9797
var resource = checkResource();
9898
ValidationUtil.checkMaxP(this, maxP);
99-
ValidationUtil.checkActivePowerLimits(this, getMinP(), maxP, getP0());
99+
ValidationUtil.checkActivePowerLimits(this, getMinP(), maxP, getTargetP());
100100
double oldValue = resource.getAttributes().getMaxP();
101101
resource.getAttributes().setMaxP(maxP);
102102
updateResource();

network-store-iidm-impl/src/test/java/com/powsybl/network/store/iidm/impl/CreateNetworksUtil.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ private static Network createNetwokWithMultipleEquipments(TopologyKind topologyK
223223
invalidNode = initAdder(adder, topologyKind, invalidNode);
224224
Battery battery = ((BatteryAdder) adder)
225225
.setId("battery")
226-
.setP0(50)
227-
.setQ0(10)
226+
.setTargetP(50)
227+
.setTargetQ(10)
228228
.setMinP(40)
229229
.setMaxP(70)
230230
.add();

network-store-integration-test/src/test/java/com/powsybl/network/store/integration/NetworkStorageTestCaseFactory.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -505,8 +505,8 @@ public static Network create(NetworkFactory networkFactory) {
505505
Battery battery = vl1.newBattery()
506506
.setId("battery")
507507
.setNode(4)
508-
.setP0(50)
509-
.setQ0(10)
508+
.setTargetP(50)
509+
.setTargetQ(10)
510510
.setMinP(40)
511511
.setMaxP(70)
512512
.add();

network-store-integration-test/src/test/java/com/powsybl/network/store/integration/NetworkStoreIT.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -923,27 +923,27 @@ public void batteryTest() {
923923
.setId("battery")
924924
.setConnectableBus("b1")
925925
.setBus("b1")
926-
.setP0(50)
927-
.setQ0(10)
926+
.setTargetP(50)
927+
.setTargetQ(10)
928928
.setMinP(40)
929929
.setMaxP(70)
930930
.add();
931931

932932
verify(mockedListener, times(1)).onCreation(battery);
933933

934934
assertTrue(battery.isFictitious());
935-
assertEquals(50, battery.getP0(), 0.1);
936-
assertEquals(10, battery.getQ0(), 0.1);
935+
assertEquals(50, battery.getTargetP(), 0.1);
936+
assertEquals(10, battery.getTargetQ(), 0.1);
937937
assertEquals(40, battery.getMinP(), 0.1);
938938
assertEquals(70, battery.getMaxP(), 0.1);
939939

940940
battery.setFictitious(false);
941-
battery.setP0(65);
942-
battery.setQ0(20);
941+
battery.setTargetP(65);
942+
battery.setTargetQ(20);
943943

944944
assertFalse(battery.isFictitious());
945-
assertEquals(65, battery.getP0(), 0.1);
946-
assertEquals(20, battery.getQ0(), 0.1);
945+
assertEquals(65, battery.getTargetP(), 0.1);
946+
assertEquals(20, battery.getTargetQ(), 0.1);
947947

948948
verify(mockedListener, times(1)).onUpdate(battery, "targetP", INITIAL_VARIANT_ID, 50d, 65d);
949949
verify(mockedListener, times(1)).onUpdate(battery, "targetQ", INITIAL_VARIANT_ID, 10d, 20d);

0 commit comments

Comments
 (0)