Skip to content

Fix notifyUpdate for setTargetV/Q #4120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
olperr1 merged 5 commits into from
Oct 5, 2026
Merged

Fix notifyUpdate for setTargetV/Q #4120

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2f8f776
Add previous `notifyUpdate` calls for `setTargetQ` and `setTargetV` m…
MatthieuSAUR Sep 28, 2026
e68eb43
Fix `notifyUpdate` calls and tests for `setTargetQ/V` in GeneratorImp…
MatthieuSAUR Sep 28, 2026
981efde
Fix code reviews
MatthieuSAUR Sep 30, 2026
3133037
Add `notifyUpdate` call in `setLocalTargetV` method of ShuntCompensat…
MatthieuSAUR Sep 30, 2026
2b7b457
Merge branch 'main' into msa/fix_notifyUpdate_targetQV_generator_battery
olperr1 Oct 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/BatteryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,12 @@ public double getTargetQ() {

@Override
public Battery setTargetQ(double targetQ) {
NetworkImpl network = getNetwork();
int variantIndex = network.getVariantIndex();
double oldValue = getTargetQ();
setLocalTargetQ(targetQ);
String variantId = network.getVariantManager().getVariantId(variantIndex);
notifyUpdate("targetQ", variantId, oldValue, targetQ);
return this.setLocalTargetQ(targetQ);
Comment thread
olperr1 marked this conversation as resolved.
Outdated
}

Expand Down Expand Up @@ -123,7 +129,7 @@ public Battery setLocalTargetQ(double targetQ) {
double oldValue = this.localTargetQ.set(variantIndex, targetQ);
String variantId = network.getVariantManager().getVariantId(variantIndex);
network.invalidateValidationLevel();
notifyUpdate("targetQ", variantId, oldValue, targetQ);
notifyUpdate("localTargetQ", variantId, oldValue, targetQ);
return this;
}

Expand Down
25 changes: 13 additions & 12 deletions iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/GeneratorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,12 @@ public GeneratorImpl setLocalTargetQ(double localTargetQ) {

@Override
public GeneratorImpl setTargetQ(double targetQ) {
return this.setLocalTargetQ(targetQ);
int variantIndex = network.get().getVariantIndex();
double oldValue = getTargetQ();
setLocalTargetQ(targetQ);
String variantId = network.get().getVariantManager().getVariantId(variantIndex);
notifyUpdate("targetQ", variantId, oldValue, targetQ);
return this;
}

@Override
Expand Down Expand Up @@ -245,34 +250,31 @@ public double getLocalTargetV() {
@Override
public GeneratorImpl setTargetV(double targetV) {
ValidationUtil.checkDoublePositive(this, targetV, TARGET_V);
int variantIndex = network.get().getVariantIndex();
String variantId = network.get().getVariantManager().getVariantId(variantIndex);
double oldValueTargetV = getTargetV();
Comment thread
MatthieuSAUR marked this conversation as resolved.
if (voltageRegulation != null && hasRegulatingTerminal() && isWithMode(RegulationMode.VOLTAGE)) {
int variantIndex = network.get().getVariantIndex();
String variantId = network.get().getVariantManager().getVariantId(variantIndex);
double oldValueTargetV = getTargetV();
getVoltageRegulation().setTargetValue(targetV);
notifyUpdate(TARGET_V, variantId, oldValueTargetV, targetV);
getNetwork().invalidateValidationLevel();
} else {
setLocalTargetV(targetV);
}
notifyUpdate(TARGET_V, variantId, oldValueTargetV, targetV);
Comment thread
MatthieuSAUR marked this conversation as resolved.
return this;
}

@Override
public GeneratorImpl setTargetV(double targetV, double equivalentLocalTargetV) {
int variantIndex = network.get().getVariantIndex();
String variantId = network.get().getVariantManager().getVariantId(variantIndex);
double oldLocalTargetV = getLocalTargetV();
double oldTargetV = getTargetV();
Comment thread
MatthieuSAUR marked this conversation as resolved.
if (voltageRegulation != null) {
if (hasRegulatingTerminal() && isWithMode(RegulationMode.VOLTAGE)) {
double oldTargetV = getVoltageRegulation().getTargetValue();
oldTargetV = getVoltageRegulation().getTargetValue();
setLocalTargetV(equivalentLocalTargetV);
getVoltageRegulation().setTargetValue(targetV);
notifyUpdate(LOCAL_TARGET_V, variantId, oldTargetV, equivalentLocalTargetV);
notifyUpdate(TARGET_V, variantId, oldLocalTargetV, targetV);
} else {
setLocalTargetV(targetV);
notifyUpdate(LOCAL_TARGET_V, variantId, oldLocalTargetV, equivalentLocalTargetV);
}
} else {
newVoltageRegulation()
Expand All @@ -281,9 +283,8 @@ public GeneratorImpl setTargetV(double targetV, double equivalentLocalTargetV) {
.withRegulating(false)
.build();
setLocalTargetV(equivalentLocalTargetV);
notifyUpdate(LOCAL_TARGET_V, variantId, oldLocalTargetV, equivalentLocalTargetV);
notifyUpdate(TARGET_V, variantId, oldLocalTargetV, targetV);
}
notifyUpdate(TARGET_V, variantId, oldTargetV, targetV);
Comment thread
MatthieuSAUR marked this conversation as resolved.
getNetwork().invalidateValidationLevel();
return this;
}
Expand Down
30 changes: 30 additions & 0 deletions ...n/backward/compatibility/AbstractVoltageRegulationBackwardCompatibilityOnBatteryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@

import com.powsybl.iidm.network.Battery;
import com.powsybl.iidm.network.BatteryAdder;
import com.powsybl.iidm.network.NetworkEventRecorder;
import com.powsybl.iidm.network.events.NetworkEvent;
import com.powsybl.iidm.network.events.UpdateNetworkEvent;
import com.powsybl.iidm.network.regulation.RegulationMode;
import org.junit.jupiter.api.Test;

Expand Down Expand Up @@ -108,4 +111,31 @@ public void testBatteryFullDeprecatedMethodAndNewMethods() {
assertFalse(battery.isRegulating());
}

@Test
void testNotifyUpdateOnSetTargetQ() {
// GIVEN
Battery battery = network.getBatteryStream().toList().getFirst();
String id = battery.getId();
double newTargetQ = 123.0;
double oldTargetQ = battery.getTargetQ();
NetworkEventRecorder listener = new NetworkEventRecorder();
network.addListener(listener);
// WHEN
battery.setTargetQ(newTargetQ);
// THEN
assertEquals(2, listener.getEvents().size());
NetworkEvent firstEvent = listener.getEvents().getFirst();
assertEquals(NetworkEvent.Type.UPDATE, firstEvent.getType());
assertEquals("localTargetQ", ((UpdateNetworkEvent) firstEvent).attribute());
assertEquals(newTargetQ, ((UpdateNetworkEvent) firstEvent).newValue());
assertEquals(oldTargetQ, ((UpdateNetworkEvent) firstEvent).oldValue());
assertEquals(id, ((UpdateNetworkEvent) firstEvent).id());
NetworkEvent secondEvent = listener.getEvents().get(1);
assertEquals(NetworkEvent.Type.UPDATE, secondEvent.getType());
assertEquals("targetQ", ((UpdateNetworkEvent) secondEvent).attribute());
assertEquals(newTargetQ, ((UpdateNetworkEvent) secondEvent).newValue());
assertEquals(oldTargetQ, ((UpdateNetworkEvent) secondEvent).oldValue());
assertEquals(id, ((UpdateNetworkEvent) secondEvent).id());
}

}
92 changes: 92 additions & 0 deletions ...backward/compatibility/AbstractVoltageRegulationBackwardCompatibilityOnGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@

import com.powsybl.iidm.network.Generator;
import com.powsybl.iidm.network.GeneratorAdder;
import com.powsybl.iidm.network.NetworkEventRecorder;
import com.powsybl.iidm.network.events.NetworkEvent;
import com.powsybl.iidm.network.events.UpdateNetworkEvent;
import com.powsybl.iidm.network.regulation.RegulationMode;
import org.junit.jupiter.api.Test;

Expand Down Expand Up @@ -291,4 +294,93 @@ public void testGeneratorLocalVoltageRegulationOnWithPartialDeprecatedMethodsWit
assertTrue(generator.isVoltageRegulatorOn());
}

@Test
void testNotifyUpdateOnSetTargetQ() {
// GIVEN
Generator generator = voltageLevel.getGeneratorStream().toList().getFirst();
String id = generator.getId();
double newTargetQ = 123.0;
double oldTargetQ = generator.getTargetQ();
NetworkEventRecorder listener = new NetworkEventRecorder();
network.addListener(listener);
// WHEN
generator.setTargetQ(newTargetQ);
// THEN
assertEquals(2, listener.getEvents().size());
NetworkEvent firstEvent = listener.getEvents().getFirst();
assertEquals(NetworkEvent.Type.UPDATE, firstEvent.getType());
assertEquals("localTargetQ", ((UpdateNetworkEvent) firstEvent).attribute());
assertEquals(newTargetQ, ((UpdateNetworkEvent) firstEvent).newValue());
assertEquals(oldTargetQ, ((UpdateNetworkEvent) firstEvent).oldValue());
assertEquals(id, ((UpdateNetworkEvent) firstEvent).id());
NetworkEvent secondEvent = listener.getEvents().get(1);
assertEquals(NetworkEvent.Type.UPDATE, secondEvent.getType());
assertEquals("targetQ", ((UpdateNetworkEvent) secondEvent).attribute());
assertEquals(newTargetQ, ((UpdateNetworkEvent) secondEvent).newValue());
assertEquals(oldTargetQ, ((UpdateNetworkEvent) secondEvent).oldValue());
assertEquals(id, ((UpdateNetworkEvent) secondEvent).id());
}

@Test
void testNotifyUpdateOnSetTargetV() {
// GIVEN
Generator generator = voltageLevel.getGeneratorStream().toList().getFirst();
String id = generator.getId();
double newTargetV = 123.0;
double oldTargetV = generator.getTargetV();
NetworkEventRecorder listener = new NetworkEventRecorder();
network.addListener(listener);
// WHEN
generator.setTargetV(newTargetV);
// THEN
assertEquals(2, listener.getEvents().size());
NetworkEvent firstEvent = listener.getEvents().getFirst();
assertEquals(NetworkEvent.Type.UPDATE, firstEvent.getType());
assertEquals("localTargetV", ((UpdateNetworkEvent) firstEvent).attribute());
assertEquals(newTargetV, ((UpdateNetworkEvent) firstEvent).newValue());
assertEquals(oldTargetV, ((UpdateNetworkEvent) firstEvent).oldValue());
assertEquals(id, ((UpdateNetworkEvent) firstEvent).id());
NetworkEvent secondEvent = listener.getEvents().get(1);
assertEquals(NetworkEvent.Type.UPDATE, secondEvent.getType());
assertEquals("targetV", ((UpdateNetworkEvent) secondEvent).attribute());
assertEquals(newTargetV, ((UpdateNetworkEvent) secondEvent).newValue());
assertEquals(oldTargetV, ((UpdateNetworkEvent) secondEvent).oldValue());
assertEquals(id, ((UpdateNetworkEvent) secondEvent).id());
}

@Test
void testNotifyUpdateOnSetTargetVAndEquivalentTargetV() {
// GIVEN
Generator generator = voltageLevel.getGeneratorStream().toList().getFirst();
String id = generator.getId();
double newTargetV = 123.0;
double newEquivalentTargetV = 12.0;
double oldTargetV = generator.getTargetV();
generator.setRegulatingTerminal(remoteTerminal);
NetworkEventRecorder listener = new NetworkEventRecorder();
network.addListener(listener);
// WHEN
generator.setTargetV(newTargetV, newEquivalentTargetV);
// THEN
assertEquals(3, listener.getEvents().size());
NetworkEvent firstEvent = listener.getEvents().getFirst();
assertEquals(NetworkEvent.Type.UPDATE, firstEvent.getType());
assertEquals("localTargetV", ((UpdateNetworkEvent) firstEvent).attribute());
assertEquals(newEquivalentTargetV, ((UpdateNetworkEvent) firstEvent).newValue());
assertEquals(oldTargetV, ((UpdateNetworkEvent) firstEvent).oldValue());
assertEquals(id, ((UpdateNetworkEvent) firstEvent).id());
NetworkEvent secondEvent = listener.getEvents().get(1);
assertEquals(NetworkEvent.Type.UPDATE, secondEvent.getType());
assertEquals("VoltageRegulation.TargetValue", ((UpdateNetworkEvent) secondEvent).attribute());
assertEquals(newTargetV, ((UpdateNetworkEvent) secondEvent).newValue());
assertEquals(oldTargetV, ((UpdateNetworkEvent) secondEvent).oldValue());
assertEquals(id, ((UpdateNetworkEvent) secondEvent).id());
NetworkEvent thirdEvent = listener.getEvents().get(2);
assertEquals(NetworkEvent.Type.UPDATE, thirdEvent.getType());
assertEquals("targetV", ((UpdateNetworkEvent) thirdEvent).attribute());
assertEquals(newTargetV, ((UpdateNetworkEvent) thirdEvent).newValue());
assertEquals(oldTargetV, ((UpdateNetworkEvent) thirdEvent).oldValue());
assertEquals(id, ((UpdateNetworkEvent) thirdEvent).id());
}

}
Loading