Skip to content

allow to create equipment with wrong position #132

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
EtienneLt merged 3 commits into from
Dec 4, 2025
Merged

allow to create equipment with wrong position #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9fb5f53
allow to create equipment with wrong position
EtienneLt Dec 2, 2025
44e8816
Merge branch 'main' into allow-to-create-equipment-with-wrong-position
EtienneLt Dec 2, 2025
eb21a06
Merge branch 'main' into allow-to-create-equipment-with-wrong-position
EtienneLt Dec 4, 2025
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
2 changes: 0 additions & 2 deletions src/main/java/org/gridsuite/modification/NetworkModificationException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ public enum Type {
TWO_WINDINGS_TRANSFORMER_CREATION_ERROR(HttpStatus.BAD_REQUEST),
BRANCH_MODIFICATION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR),
INJECTION_MODIFICATION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR),
CONNECTION_POSITION_ERROR(HttpStatus.BAD_REQUEST),
MODIFY_BATTERY_ERROR(HttpStatus.INTERNAL_SERVER_ERROR),
OPERATING_STATUS_MODIFICATION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR),
OPERATING_ACTION_TYPE_EMPTY(HttpStatus.BAD_REQUEST, "Empty operating action type"),
Expand All @@ -95,7 +94,6 @@ public enum Type {
TYPE_MISMATCH(HttpStatus.BAD_REQUEST),
MISSING_MODIFICATION_DESCRIPTION(HttpStatus.BAD_REQUEST),
MODIFICATION_OUT_OF_RANGE(HttpStatus.BAD_REQUEST),
POSITION_ORDER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR),
DELETE_VOLTAGE_LEVEL_ON_LINE_ERROR(HttpStatus.INTERNAL_SERVER_ERROR),
DELETE_VOLTAGE_LEVEL_ON_LINE_NOT_FOUND(HttpStatus.NOT_FOUND),
EQUIPMENT_ATTRIBUTE_NAME_ERROR(HttpStatus.BAD_REQUEST),
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/gridsuite/modification/modifications/BatteryCreation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public void check(Network network) throws NetworkModificationException {
// check connectivity
ModificationUtils.getInstance()
.controlConnectivity(network, modificationInfos.getVoltageLevelId(),
modificationInfos.getBusOrBusbarSectionId(), modificationInfos.getConnectionPosition());
modificationInfos.getBusOrBusbarSectionId());

// check reactive limits
ModificationUtils.getInstance().checkReactiveLimitsCreation(modificationInfos,
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/gridsuite/modification/modifications/GeneratorCreation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public void check(Network network) throws NetworkModificationException {

// check connectivity
ModificationUtils.getInstance().controlConnectivity(network, modificationInfos.getVoltageLevelId(),
modificationInfos.getBusOrBusbarSectionId(), modificationInfos.getConnectionPosition());
modificationInfos.getBusOrBusbarSectionId());

// check reactive limits
ModificationUtils.getInstance().checkReactiveLimitsCreation(modificationInfos,
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/gridsuite/modification/modifications/LccCreation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ private void checkLccConverterStation(Network network, LccConverterStationCreati
// check connectivity
ModificationUtils.getInstance().controlConnectivity(network,
converterStation.getVoltageLevelId(),
converterStation.getBusOrBusbarSectionId(),
converterStation.getConnectionPosition());
converterStation.getBusOrBusbarSectionId()
);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/gridsuite/modification/modifications/LineCreation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ public void check(Network network) throws NetworkModificationException {
}
String errorMessage = "Line '" + modificationInfos.getEquipmentId() + "' : ";
ModificationUtils.getInstance().controlBranchCreation(network,
modificationInfos.getVoltageLevelId1(), modificationInfos.getBusOrBusbarSectionId1(), modificationInfos.getConnectionPosition1(),
modificationInfos.getVoltageLevelId2(), modificationInfos.getBusOrBusbarSectionId2(), modificationInfos.getConnectionPosition2());
modificationInfos.getVoltageLevelId1(), modificationInfos.getBusOrBusbarSectionId1(),
modificationInfos.getVoltageLevelId2(), modificationInfos.getBusOrBusbarSectionId2());
checkIsNotNegativeValue(errorMessage, modificationInfos.getR(), CREATE_LINE_ERROR, "Resistance R");
checkIsNotNegativeValue(errorMessage, modificationInfos.getG1(), CREATE_LINE_ERROR, "Conductance on side 1 G1");
checkIsNotNegativeValue(errorMessage, modificationInfos.getG2(), CREATE_LINE_ERROR, "Conductance on side 2 G2");
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/gridsuite/modification/modifications/LoadCreation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public void check(Network network) throws NetworkModificationException {
throw new NetworkModificationException(LOAD_ALREADY_EXISTS, modificationInfos.getEquipmentId());
}
ModificationUtils.getInstance().controlConnectivity(network, modificationInfos.getVoltageLevelId(),
modificationInfos.getBusOrBusbarSectionId(), modificationInfos.getConnectionPosition());
modificationInfos.getBusOrBusbarSectionId());
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/gridsuite/modification/modifications/ShuntCompensatorCreation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public void check(Network network) throws NetworkModificationException {
modificationInfos.getSectionCount()));
}
ModificationUtils.getInstance().controlConnectivity(network, modificationInfos.getVoltageLevelId(),
modificationInfos.getBusOrBusbarSectionId(), modificationInfos.getConnectionPosition());
modificationInfos.getBusOrBusbarSectionId());
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/gridsuite/modification/modifications/StaticVarCompensatorCreation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public void check(Network network) throws NetworkModificationException {
// check connectivity
ModificationUtils.getInstance()
.controlConnectivity(network, modificationInfos.getVoltageLevelId(),
modificationInfos.getBusOrBusbarSectionId(), modificationInfos.getConnectionPosition());
modificationInfos.getBusOrBusbarSectionId());

// check reactive power limits and set points
ModificationUtils.getInstance().checkReactivePowerLimitsAndSetPointsCreation(modificationInfos);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/gridsuite/modification/modifications/TwoWindingsTransformerCreation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ public void check(Network network) throws NetworkModificationException {
}
String errorMessage = "Two windings transformer '" + modificationInfos.getEquipmentId() + "' : ";
getInstance().controlBranchCreation(network,
modificationInfos.getVoltageLevelId1(), modificationInfos.getBusOrBusbarSectionId1(), modificationInfos.getConnectionPosition1(),
modificationInfos.getVoltageLevelId2(), modificationInfos.getBusOrBusbarSectionId2(), modificationInfos.getConnectionPosition2());
modificationInfos.getVoltageLevelId1(), modificationInfos.getBusOrBusbarSectionId1(),
modificationInfos.getVoltageLevelId2(), modificationInfos.getBusOrBusbarSectionId2());
checkIsNotNegativeValue(errorMessage, modificationInfos.getR(), CREATE_TWO_WINDINGS_TRANSFORMER_ERROR, "Resistance R");
checkIsNotNegativeValue(errorMessage, modificationInfos.getG(), CREATE_TWO_WINDINGS_TRANSFORMER_ERROR, "Conductance G");
checkIsNotNegativeValue(errorMessage, modificationInfos.getRatedU1(), CREATE_TWO_WINDINGS_TRANSFORMER_ERROR, "Rated Voltage on side 1");
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/gridsuite/modification/modifications/VscCreation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ private void checkConverterStation(Network network,
// check connectivity
ModificationUtils.getInstance().controlConnectivity(network,
converterStation.getVoltageLevelId(),
converterStation.getBusOrBusbarSectionId(),
converterStation.getConnectionPosition());
converterStation.getBusOrBusbarSectionId()
);

// check reactive limits
ModificationUtils.getInstance().checkReactiveLimitsCreation(converterStation,
Expand Down
26 changes: 7 additions & 19 deletions src/main/java/org/gridsuite/modification/utils/ModificationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,20 +167,9 @@ public StaticVarCompensator getStaticVarCompensator(Network network, String stat
return staticVarCompensator;
}

public void controlConnectivity(Network network, String voltageLevelId, String busOrBusbarSectionId, Integer connectionPosition) {
public void controlConnectivity(Network network, String voltageLevelId, String busOrBusbarSectionId) {
VoltageLevel voltageLevel = getVoltageLevel(network, voltageLevelId);
if (voltageLevel.getTopologyKind() == TopologyKind.NODE_BREAKER) {
// bus bar section must exist
controlBus(voltageLevel, busOrBusbarSectionId);
// check if position is free
Set<Integer> takenFeederPositions = TopologyModificationUtils.getFeederPositions(voltageLevel);
if (takenFeederPositions.contains(connectionPosition)) {
throw new NetworkModificationException(CONNECTION_POSITION_ERROR, "PositionOrder '" + connectionPosition + "' already taken");
}
} else {
// bus breaker must exist
controlBus(voltageLevel, busOrBusbarSectionId);
}
controlBus(voltageLevel, busOrBusbarSectionId);
}

public void controlBus(VoltageLevel voltageLevel, String busOrBusbarSectionId) {
Expand All @@ -191,16 +180,16 @@ public void controlBus(VoltageLevel voltageLevel, String busOrBusbarSectionId) {
}
}

public void controlBranchCreation(Network network, String voltageLevelId1, String busOrBusbarSectionId1, Integer connectionPosition1,
String voltageLevelId2, String busOrBusbarSectionId2, Integer connectionPosition2) {
public void controlBranchCreation(Network network, String voltageLevelId1, String busOrBusbarSectionId1,
String voltageLevelId2, String busOrBusbarSectionId2) {
VoltageLevel voltageLevel1 = getVoltageLevel(network, voltageLevelId1);
VoltageLevel voltageLevel2 = getVoltageLevel(network, voltageLevelId2);
if (voltageLevel1.getTopologyKind() == TopologyKind.NODE_BREAKER &&
voltageLevel2.getTopologyKind() == TopologyKind.NODE_BREAKER) {
controlConnectivity(network, voltageLevelId1,
busOrBusbarSectionId1, connectionPosition1);
busOrBusbarSectionId1);
controlConnectivity(network, voltageLevelId2,
busOrBusbarSectionId2, connectionPosition2);
busOrBusbarSectionId2);
} else {
// bus or mixed mode
controlBus(voltageLevel1, busOrBusbarSectionId1);
Expand Down Expand Up @@ -234,8 +223,6 @@ public int getPosition(String busOrBusbarSectionId, Network network, VoltageLeve
var leftRange = TopologyModificationUtils.getUnusedOrderPositionsBefore(bbs);
if (leftRange.isPresent()) {
position = leftRange.get().getMaximum();
} else {
throw new NetworkModificationException(POSITION_ORDER_ERROR, "no available position");
}
}
}
Expand Down Expand Up @@ -1766,6 +1753,7 @@ public static void createInjectionInNodeBreaker(VoltageLevel voltageLevel, Injec
: injectionCreationInfos.getEquipmentId())
.withInjectionPositionOrder(position)
.withInjectionAdder(injectionAdder)
.withLogOrThrowIfIncorrectPositionOrder(false)
.build();
algo.apply(network, true, subReportNode);
}
Expand Down
6 changes: 0 additions & 6 deletions ...a/org/gridsuite/modification/modifications/ShuntCompensatorCreationInNodeBreakerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,6 @@ protected void checkModification() {
modificationToCreate.setSectionCount(3);
exception = assertThrows(NetworkModificationException.class, () -> modificationToCreate.toModification().check(getNetwork()));
assertEquals("CREATE_SHUNT_COMPENSATOR_ERROR : Section count should be between 0 and Maximum section count (2), actual : 3", exception.getMessage());

// CreateWithExistingConnectionPosition
ShuntCompensatorCreationInfos dto = (ShuntCompensatorCreationInfos) buildModification();
dto.setConnectionPosition(2);
exception = assertThrows(NetworkModificationException.class, () -> dto.toModification().check(getNetwork()));
assertEquals("CONNECTION_POSITION_ERROR : PositionOrder '2' already taken", exception.getMessage());
}

@Override
Expand Down