Skip to content

Commit

Permalink
handle connectablePosition extension in modification network (#539)
Browse files Browse the repository at this point in the history 
Signed-off-by: REHILI Ghazwa <[email protected]>
  • Loading branch information
@ghazwarhili
ghazwarhili authored Oct 3, 2024
1 parent 977b4d1 commit 049ebae
Show file tree
Hide file tree
Showing 4 changed files with 152 additions and 52 deletions.
160 changes: 110 additions & 50 deletions src/main/java/org/gridsuite/modification/server/modifications/ModificationUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ public ReportNode modifyInjectionConnectivityAttributes(ConnectablePosition<?> c
if (isVoltageOrBusbarIdMissing(modificationInfos.getVoltageLevelId(), modificationInfos.getBusOrBusbarSectionId(), modificationInfos.getEquipmentId(), reports)) {
return reports.get(0);
}
processConnectivityPosition(connectablePosition, connectablePositionAdder, modificationInfos, reports, false);
processConnectivityPosition(connectablePosition, connectablePositionAdder, modificationInfos, injection.getNetwork(), reports, false);
modifyConnection(modificationInfos.getTerminalConnected(), injection, injection.getTerminal(), reports);

return reportModifications(connectivityReports, reports, "ConnectivityModified", CONNECTIVITY);
Expand All @@ -626,7 +626,7 @@ public ReportNode modifyBranchConnectivityAttributes(ConnectablePosition<?> conn
return reports.get(0);
}

processConnectivityPosition(connectablePosition, connectablePositionAdder, modificationInfos, reports, true);
processConnectivityPosition(connectablePosition, connectablePositionAdder, modificationInfos, branch.getNetwork(), reports, true);
modifyConnection(modificationInfos.getTerminal1Connected(), branch, branch.getTerminal1(), reports);
modifyConnection(modificationInfos.getTerminal2Connected(), branch, branch.getTerminal2(), reports);

Expand All @@ -648,53 +648,54 @@ private boolean isVoltageOrBusbarIdMissing(AttributeModification<String> voltage

private void processConnectivityPosition(ConnectablePosition<?> connectablePosition,
ConnectablePositionAdder<?> connectablePositionAdder,
Object modificationInfos,
BasicEquipmentModificationInfos modificationInfos,
Network network,
List<ReportNode> reports,
boolean isBranch) {
if (connectablePosition != null) {
modifyExistingConnectivityPosition(connectablePosition, modificationInfos, reports, isBranch);
} else {
createNewConnectivityPosition(connectablePositionAdder, modificationInfos, reports, isBranch);
createNewConnectivityPosition(connectablePositionAdder, modificationInfos, network, reports, isBranch);
}
}

private void modifyExistingConnectivityPosition(ConnectablePosition<?> connectablePosition,
Object modificationInfos,
BasicEquipmentModificationInfos modificationInfos,
List<ReportNode> reports,
boolean isBranch) {
if (isBranch) {
modifyFeeder(connectablePosition.getFeeder1(), modificationInfos, reports, 1);
modifyFeeder(connectablePosition.getFeeder2(), modificationInfos, reports, 2);
modifyConnectablePosition(connectablePosition.getFeeder1(), modificationInfos, reports, 1);
modifyConnectablePosition(connectablePosition.getFeeder2(), modificationInfos, reports, 2);
} else {
modifyFeeder(connectablePosition.getFeeder(), modificationInfos, reports, 0);
modifyConnectablePosition(connectablePosition.getFeeder(), modificationInfos, reports, 0);
}
}

private void createNewConnectivityPosition(ConnectablePositionAdder<?> adder,
Object modificationInfos,
BasicEquipmentModificationInfos modificationInfos,
Network network,
List<ReportNode> reports,
boolean isBranch) {
if (isBranch) {
ConnectablePositionAdder.FeederAdder<?> feeder1 = adder.newFeeder1();
ConnectablePositionAdder.FeederAdder<?> feeder2 = adder.newFeeder2();
modifyFeederAdder(feeder1, modificationInfos, reports, 1);
modifyFeederAdder(feeder2, modificationInfos, reports, 2);
ConnectablePositionAdder.FeederAdder<?> feederAdder1 = adder.newFeeder1();
ConnectablePositionAdder.FeederAdder<?> feederAdder2 = adder.newFeeder2();
addConnectablePosition(adder, feederAdder1, modificationInfos, network, reports, 1);
addConnectablePosition(adder, feederAdder2, modificationInfos, network, reports, 2);
} else {
ConnectablePositionAdder.FeederAdder<?> feeder = adder.newFeeder();
modifyFeederAdder(feeder, modificationInfos, reports, 0);
ConnectablePositionAdder.FeederAdder<?> feederAdder = adder.newFeeder();
addConnectablePosition(adder, feederAdder, modificationInfos, network, reports, 0);
}
adder.add();
}

private void modifyFeeder(ConnectablePosition.Feeder feeder,
Object modificationInfos,
List<ReportNode> reports,
int feederNumber) {
private void modifyConnectablePosition(ConnectablePosition.Feeder feeder,
BasicEquipmentModificationInfos modificationInfos,
List<ReportNode> reports,
int feederNumber) {
applyModifications(feeder, modificationInfos, reports, feederNumber);
}

private void applyModifications(ConnectablePosition.Feeder feeder,
Object modificationInfos,
BasicEquipmentModificationInfos modificationInfos,
List<ReportNode> reports,
int feederNumber) {
ReportNode connectionNameReport = applyElementaryModificationsAndReturnReport(feeder::setName,
Expand All @@ -720,37 +721,68 @@ private void applyModifications(ConnectablePosition.Feeder feeder,
}
}

private void modifyFeederAdder(ConnectablePositionAdder.FeederAdder<?> feeder,
Object modificationInfos,
List<ReportNode> reports,
int feederNumber) {
ReportNode connectionNameReport = applyElementaryModificationsAndReturnReport(feeder::withName,
() -> null,
getConnectionName(modificationInfos, feederNumber),
getConnectionNameField(feederNumber));
if (connectionNameReport != null) {
reports.add(connectionNameReport);
}
ReportNode connectionDirectionReport = applyElementaryModificationsAndReturnReport(feeder::withDirection,
() -> null,
getConnectionDirection(modificationInfos, feederNumber),
getConnectionDirectionField(feederNumber));
if (connectionDirectionReport != null) {
reports.add(connectionDirectionReport);
}
ReportNode connectionPositionReport = applyElementaryModificationsAndReturnReport(feeder::withOrder,
() -> null,
getConnectionPosition(modificationInfos, feederNumber),
getConnectionPositionField(feederNumber));
if (connectionPositionReport != null) {
reports.add(connectionPositionReport);
}
private void addConnectablePosition(ConnectablePositionAdder<?> adder,
ConnectablePositionAdder.FeederAdder<?> feeder,
BasicEquipmentModificationInfos modificationInfos,
Network network,
List<ReportNode> reports,
int feederNumber) {
AttributeModification<String> connectionName = getConnectionName(modificationInfos, feederNumber);
AttributeModification<ConnectablePosition.Direction> connectionDirection = getConnectionDirection(modificationInfos, feederNumber);
AttributeModification<Integer> connectionPosition = getConnectionPosition(modificationInfos, feederNumber);
AttributeModification<String> equipmentId = getEquipmentId(modificationInfos);
AttributeModification<String> voltageLevelId = getVoltageLevelId(modificationInfos, feederNumber);
AttributeModification<String> busOrBusbarSectionId = getBusOrBusbarSectionId(modificationInfos, feederNumber);
int position = getPosition(connectionPosition, busOrBusbarSectionId, network, voltageLevelId);

ReportNode connectionNameReport = applyConnectablePositionAttribute(
feeder::withName, connectionName, equipmentId, reports,
getConnectionNameField(feederNumber), connectionDirection, connectionPosition
);

ReportNode connectionDirectionReport = applyConnectablePositionAttribute(
feeder::withDirection, connectionDirection,
new AttributeModification<>(ConnectablePosition.Direction.UNDEFINED, OperationType.SET),
reports, getConnectionDirectionField(feederNumber),
connectionName, connectionPosition
);

ReportNode connectionPositionReport = applyConnectablePositionAttribute(
feeder::withOrder, connectionPosition,
new AttributeModification<>(position, OperationType.SET),
reports, getConnectionPositionField(feederNumber),
connectionName, connectionDirection
);

if (connectionNameReport != null || connectionDirectionReport != null || connectionPositionReport != null) {
feeder.add();
adder.add();
}
}

private <T> T getConnectionDetail(Object modificationInfos, int feederNumber,
private <T> ReportNode applyConnectablePositionAttribute(Consumer<T> setter,
AttributeModification<T> newValue,
AttributeModification<T> defaultValue,
List<ReportNode> reports,
String fieldName,
AttributeModification<?>... dependentAttributes) {

AttributeModification<T> finalModification = (newValue == null && isAnyAttributesNonNull(dependentAttributes))
? defaultValue
: newValue;

ReportNode report = applyElementaryModificationsAndReturnReport(setter, () -> null, finalModification, fieldName);
if (report != null) {
reports.add(report);
}
return report;
}

private boolean isAnyAttributesNonNull(AttributeModification<?>... attributes) {
return Arrays.stream(attributes).anyMatch(Objects::nonNull);
}

private <T> T getConnectionDetail(BasicEquipmentModificationInfos modificationInfos, int feederNumber,
Function<BranchModificationInfos, T> branchFunc1,
Function<BranchModificationInfos, T> branchFunc2,
Function<InjectionModificationInfos, T> injectionFunc) {
Expand All @@ -771,7 +803,23 @@ private String getConnectionFieldName(int feederNumber, String baseFieldName) {
};
}

private AttributeModification<String> getConnectionName(Object modificationInfos, int feederNumber) {
private AttributeModification<String> getVoltageLevelId(BasicEquipmentModificationInfos modificationInfos, int feederNumber) {
return getConnectionDetail(modificationInfos, feederNumber,
BranchModificationInfos::getVoltageLevelId1, BranchModificationInfos::getVoltageLevelId2,
InjectionModificationInfos::getVoltageLevelId);
}

private AttributeModification<String> getBusOrBusbarSectionId(BasicEquipmentModificationInfos modificationInfos, int feederNumber) {
return getConnectionDetail(modificationInfos, feederNumber,
BranchModificationInfos::getBusOrBusbarSectionId1, BranchModificationInfos::getBusOrBusbarSectionId2,
InjectionModificationInfos::getBusOrBusbarSectionId);
}

private AttributeModification<String> getEquipmentId(BasicEquipmentModificationInfos modificationInfos) {
return AttributeModification.toAttributeModification(modificationInfos.getEquipmentId(), OperationType.SET);
}

private AttributeModification<String> getConnectionName(BasicEquipmentModificationInfos modificationInfos, int feederNumber) {
return getConnectionDetail(modificationInfos, feederNumber,
BranchModificationInfos::getConnectionName1, BranchModificationInfos::getConnectionName2,
InjectionModificationInfos::getConnectionName);
Expand All @@ -789,18 +837,30 @@ private String getConnectionPositionField(int feederNumber) {
return getConnectionFieldName(feederNumber, CONNECTION_POSITION_FIELD_NAME);
}

private AttributeModification<ConnectablePosition.Direction> getConnectionDirection(Object modificationInfos, int feederNumber) {
private AttributeModification<ConnectablePosition.Direction> getConnectionDirection(BasicEquipmentModificationInfos modificationInfos, int feederNumber) {
return getConnectionDetail(modificationInfos, feederNumber,
BranchModificationInfos::getConnectionDirection1, BranchModificationInfos::getConnectionDirection2,
InjectionModificationInfos::getConnectionDirection);
}

private AttributeModification<Integer> getConnectionPosition(Object modificationInfos, int feederNumber) {
private AttributeModification<Integer> getConnectionPosition(BasicEquipmentModificationInfos modificationInfos, int feederNumber) {
return getConnectionDetail(modificationInfos, feederNumber,
BranchModificationInfos::getConnectionPosition1, BranchModificationInfos::getConnectionPosition2,
InjectionModificationInfos::getConnectionPosition);
}

private int getPosition(AttributeModification<Integer> connectionPosition,
AttributeModification<String> busOrBusbarSectionId,
Network network,
AttributeModification<String> voltageLevelId) {
return getPosition(
connectionPosition == null ? null : connectionPosition.getValue(),
busOrBusbarSectionId == null ? null : busOrBusbarSectionId.getValue(),
network,
getVoltageLevel(network, voltageLevelId == null ? null : voltageLevelId.getValue())
);
}

private void modifyConnection(AttributeModification<Boolean> terminalConnected, Identifiable<?> equipment, Terminal terminal, List<ReportNode> reports) {
if (terminalConnected == null || equipment == null) {
return;
Expand Down
22 changes: 22 additions & 0 deletions src/test/java/org/gridsuite/modification/server/modifications/LineModificationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,4 +423,26 @@ private void changeLineConnectionState(Line existingEquipment, boolean expectedS
assertThat(existingEquipment.getTerminal1().isConnected()).isEqualTo(expectedState);
assertThat(existingEquipment.getTerminal2().isConnected()).isEqualTo(expectedState);
}

@Test
public void changeLineConnectablePosition() throws Exception {
LineModificationInfos lineModificationInfos = LineModificationInfos.builder()
.stashed(false)
.equipmentId("line3")
.equipmentName(new AttributeModification<>("LineModified", OperationType.SET))
.voltageLevelId1(new AttributeModification<>("v1", OperationType.SET))
.voltageLevelId2(new AttributeModification<>("v3", OperationType.SET))
.busOrBusbarSectionId1(new AttributeModification<>("1B", OperationType.SET))
.busOrBusbarSectionId2(new AttributeModification<>("2B", OperationType.SET))
.connectionPosition1(new AttributeModification<>(1, OperationType.SET))
.connectionPosition2(new AttributeModification<>(1, OperationType.SET))
.build();
String modificationInfosJson = mapper.writeValueAsString(lineModificationInfos);
mockMvc.perform(post(getNetworkModificationUri()).content(modificationInfosJson).contentType(MediaType.APPLICATION_JSON))
.andExpect(status().isOk());
LineModificationInfos createdModification = (LineModificationInfos) modificationRepository.getModifications(getGroupId(), false, true).get(0);
assertEquals(1, createdModification.getConnectionPosition1().getValue());
assertEquals(1, createdModification.getConnectionPosition2().getValue());

}
}
2 changes: 1 addition & 1 deletion src/test/java/org/gridsuite/modification/server/utils/NetworkCreation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ public static Network create(UUID uuid, boolean createHvdcLine, NetworkFactory n
createSwitch(v3, "v3dl2", "v3dl2", SwitchKind.DISCONNECTOR, true, false, false, 0, 30);
createSwitch(v3, "v3bl2", "v3bl2", SwitchKind.BREAKER, true, false, false, 30, 31);

createLine(network, "line3", "line3", "v1", "v3", 10, 12, 12.0, 7.0, 5.5, 7.5, 6.5, 8.5, "cn1line3", 3, ConnectablePosition.Direction.TOP, "cn2line3", 3, ConnectablePosition.Direction.TOP);
createLineWithoutConnectivity(network, "line3", "line3", "v1", "v3", 10, 12, 12.0, 7.0, 5.5, 7.5, 6.5, 8.5);
createSwitch(v1, "v1dl3", "v1dl3", SwitchKind.DISCONNECTOR, true, false, false, 0, 9);
createSwitch(v1, "v1bl3", "v1bl3", SwitchKind.BREAKER, true, false, true, 9, 10);
createSwitch(v3, "v3dl3", "v3dl3", SwitchKind.DISCONNECTOR, true, false, false, 0, 11);
Expand Down
20 changes: 19 additions & 1 deletion src/test/java/org/gridsuite/modification/server/utils/NetworkUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,24 @@ public static void createLine(Network network, String id, String name, String vo
.add();
}

public static void createLineWithoutConnectivity(Network network, String id, String name, String voltageLevel1, String voltageLevel2, int node1, int node2,
double r, double x, double g1, double g2, double b1, double b2) {
network.newLine()
.setId(id)
.setName(name)
.setR(r)
.setX(x)
.setG1(g1)
.setG2(g2)
.setB1(b1)
.setB2(b2)
.setVoltageLevel1(voltageLevel1)
.setVoltageLevel2(voltageLevel2)
.setNode1(node1)
.setNode2(node2)
.add();
}

@SuppressWarnings("SameParameterValue")
public static void createLoad(VoltageLevel vl, String id, String name,
int node, double p0, double q0, String feederName, int feederOrder, ConnectablePosition.Direction direction) {
Expand Down Expand Up @@ -160,7 +178,7 @@ public static void createGenerator(VoltageLevel vl, String id, int node, double
}

public static void createGeneratorOnBus(VoltageLevel vl, String id, String busId, double targetP, double targetQ) {
var g = vl.newGenerator()
vl.newGenerator()
.setId(id)
.setName(id)
.setTargetP(targetP)
Expand Down

0 comments on commit 049ebae

Please sign in to comment.