Skip to content
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

fix return impacts when active power control modification #378

Merged
merged 9 commits into from
Dec 1, 2023
Merged

fix return impacts when active power control modification #378

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
12a2b1a
fix return impacts when active power control modification
achour94 Nov 22, 2023
940c1dc
Merge remote-tracking branch 'origin/main' into fix_battery_modificat…
achour94 Nov 27, 2023
ad760f2
refactor the code
achour94 Nov 27, 2023
ca106b6
Merge branch 'main' into fix_battery_modification_update
achour94 Nov 28, 2023
b890363
Creating modifications should now impact ES index (#365)
klesaulnier Dec 1, 2023
e7df7ef
fix return impacts when active power control modification
achour94 Nov 22, 2023
128d73a
refactor the code
achour94 Nov 27, 2023
940af09
Merge remote-tracking branch 'origin/fix_battery_modification_update'…
achour94 Dec 1, 2023
4f85d56
update network store dependency version
achour94 Dec 1, 2023
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
65 changes: 37 additions & 28 deletions src/main/java/org/gridsuite/modification/server/modifications/ModificationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,44 +780,53 @@ public void modifyMinMaxReactiveLimits(MinMaxReactiveLimits minMaxReactiveLimits
reportModifications(subReporterReactiveLimits, reports, "minMaxReactiveLimitsModified", "By range");
}

private void modifyExistingActivePowerControl(ActivePowerControl<?> activePowerControl,
AttributeModification<Boolean> participateInfo,
AttributeModification<Float> droopInfo,
List<Report> reports) {
double oldDroop = activePowerControl.getDroop();
boolean oldParticipate = activePowerControl.isParticipate();

Optional.ofNullable(participateInfo).ifPresent(info -> {
activePowerControl.setParticipate(info.getValue());
reports.add(buildModificationReport(oldParticipate, info.getValue(), "Participate"));
});

Optional.ofNullable(droopInfo).ifPresent(info -> {
activePowerControl.setDroop(info.getValue());
reports.add(buildModificationReport(oldDroop, info.getValue(), "Droop"));
});
}

private void createNewActivePowerControl(ActivePowerControlAdder<?> adder,
AttributeModification<Boolean> participateInfo,
AttributeModification<Float> droopInfo,
List<Report> reports) {
boolean participate = participateInfo != null ? participateInfo.getValue() : false;
adder.withParticipate(participate);
if (participateInfo != null) {
reports.add(buildModificationReport(null, participate, "Participate"));
}
double droop = droopInfo != null ? droopInfo.getValue() : Double.NaN;
adder.withDroop(droop);
if (droopInfo != null) {
reports.add(buildModificationReport(Double.NaN, droop, "Droop"));
}
adder.add();
}

public Reporter modifyActivePowerControlAttributes(ActivePowerControl<?> activePowerControl,
ActivePowerControlAdder<?> activePowerControlAdder,
AttributeModification<Boolean> participateInfo,
AttributeModification<Float> droopInfo,
Reporter subReporter,
Reporter subReporterSetpoints) {
List<Report> reports = new ArrayList<>();
double oldDroop = Double.NaN;
boolean oldParticipate = false;
double droop = droopInfo != null ? droopInfo.getValue() : Double.NaN;
if (activePowerControl != null) {
oldDroop = activePowerControl.getDroop();
oldParticipate = activePowerControl.isParticipate();
}

if (participateInfo != null) {
activePowerControlAdder
.withParticipate(participateInfo.getValue());
reports.add(ModificationUtils.getInstance().buildModificationReport(activePowerControl != null ? activePowerControl.isParticipate() : null,
participateInfo.getValue(),
"Participate"));
} else {
activePowerControlAdder
.withParticipate(oldParticipate);
}

if (droopInfo != null) {
activePowerControlAdder
.withDroop(droop);
reports.add(ModificationUtils.getInstance().buildModificationReport(oldDroop,
droop,
"Droop"));
modifyExistingActivePowerControl(activePowerControl, participateInfo, droopInfo, reports);
} else {
activePowerControlAdder
.withDroop(oldDroop);
createNewActivePowerControl(activePowerControlAdder, participateInfo, droopInfo, reports);
}
activePowerControlAdder
.add();

Reporter subReporterSetpoints2 = subReporterSetpoints;
if (subReporterSetpoints == null && !reports.isEmpty()) {
Expand Down
35 changes: 35 additions & 0 deletions src/test/java/org/gridsuite/modification/server/modifications/BatteryModificationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import org.junit.Test;
import org.junit.jupiter.api.Tag;
import org.springframework.http.MediaType;
import org.springframework.test.web.servlet.MvcResult;
import org.springframework.util.CollectionUtils;

import java.util.*;
Expand Down Expand Up @@ -217,6 +218,40 @@ public void testDroopUnchanged() throws Exception {
assertEquals(18f, createdModification.getDroop().getValue());
}

@Test
public void testImpactsAfterActivePowerControlModifications() throws Exception {
BatteryModificationInfos batteryModificationInfos = (BatteryModificationInfos) buildModification();
String modificationToCreateJson = mapper.writeValueAsString(batteryModificationInfos);
mockMvc.perform(post(getNetworkModificationUri()).content(modificationToCreateJson).contentType(MediaType.APPLICATION_JSON))
.andExpect(status().isOk()).andReturn();
Battery battery = getNetwork().getBattery("v3Battery");
assertEquals(0.1f, battery.getExtension(ActivePowerControl.class).getDroop());
assertEquals(true, battery.getExtension(ActivePowerControl.class).isParticipate());
//modify only droop
batteryModificationInfos.setDroop(new AttributeModification<>(0.5f, OperationType.SET));
modificationToCreateJson = mapper.writeValueAsString(batteryModificationInfos);
MvcResult mvcResult = mockMvc.perform(post(getNetworkModificationUri()).content(modificationToCreateJson).contentType(MediaType.APPLICATION_JSON))
.andExpect(status().isOk()).andReturn();
//check impacts
String resultAsString = mvcResult.getResponse().getContentAsString();
NetworkModificationResult networkModificationResult = mapper.readValue(resultAsString, NetworkModificationResult.class);
assertEquals(1, networkModificationResult.getNetworkImpacts().size());
assertEquals(1, networkModificationResult.getImpactedSubstationsIds().size());
assertEquals("[s2]", networkModificationResult.getImpactedSubstationsIds().toString());
//modify only participate
batteryModificationInfos.setParticipate(new AttributeModification<>(false, OperationType.SET));
modificationToCreateJson = mapper.writeValueAsString(batteryModificationInfos);
mvcResult = mockMvc.perform(post(getNetworkModificationUri()).content(modificationToCreateJson).contentType(MediaType.APPLICATION_JSON))
.andExpect(status().isOk()).andReturn();
//check impacts
resultAsString = mvcResult.getResponse().getContentAsString();
networkModificationResult = mapper.readValue(resultAsString, NetworkModificationResult.class);
assertEquals(1, networkModificationResult.getNetworkImpacts().size());
assertEquals(1, networkModificationResult.getImpactedSubstationsIds().size());
assertEquals("[s2]", networkModificationResult.getImpactedSubstationsIds().toString());

Meklo marked this conversation as resolved.
Show resolved Hide resolved
}

@Test
public void testMinQGreaterThanMaxQ() throws Exception {
BatteryModificationInfos batteryModificationInfos = (BatteryModificationInfos) buildModification();
Expand Down
Loading