Skip to content

Fix create busbar #100

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix create busbar #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef049aa
fix create busbar
EtienneLt Oct 1, 2025
67b4442
fix tests
EtienneLt Oct 1, 2025
44f92ce
remove print
EtienneLt Oct 1, 2025
e5bffd7
Merge branch 'main' into fix-create-busbar
EtienneLt Nov 3, 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
25 changes: 4 additions & 21 deletions src/main/java/org/gridsuite/modification/modifications/CreateVoltageLevelTopology.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
import com.powsybl.commons.PowsyblException;
import com.powsybl.commons.report.ReportNode;
import com.powsybl.iidm.modification.topology.DefaultNamingStrategy;
import com.powsybl.iidm.modification.topology.MoveFeederBayBuilder;
import com.powsybl.iidm.modification.topology.NamingStrategy;
import com.powsybl.iidm.network.*;
import com.powsybl.iidm.network.BusbarSection;
import com.powsybl.iidm.network.Network;
import com.powsybl.iidm.network.VoltageLevel;
import com.powsybl.iidm.network.extensions.BusbarSectionPosition;
import org.gridsuite.modification.ModificationType;
import org.gridsuite.modification.NetworkModificationException;
import org.gridsuite.modification.dto.CreateVoltageLevelTopologyInfos;
import org.gridsuite.modification.utils.ModificationUtils;

import java.util.Comparator;
import java.util.List;
Expand Down Expand Up @@ -62,7 +62,6 @@ public void apply(Network network, ReportNode subReportNode) {
public void apply(Network network, NamingStrategy namingStrategy, ReportNode subReportNode) {
VoltageLevel voltageLevel = network.getVoltageLevel(createVoltageLevelTopologyInfos.getVoltageLevelId());
createVoltageLevelBusBarSection(network, namingStrategy, subReportNode, voltageLevel);
moveConnectableToAddSwitchesOnTheNewBar(network, voltageLevel);
}

private void createVoltageLevelBusBarSection(Network network, NamingStrategy namingStrategy, ReportNode subReportNode, VoltageLevel voltageLevel) {
Expand All @@ -73,26 +72,10 @@ private void createVoltageLevelBusBarSection(Network network, NamingStrategy nam
.withAlignedBusesOrBusbarCount(1)
.withLowBusOrBusbarIndex(lowBusOrBusbarIndex)
.withSwitchKinds(createVoltageLevelTopologyInfos.getSwitchKinds())
.withConnectExistingConnectables(true)
.build().apply(network, namingStrategy, true, subReportNode);
}

private void moveConnectableToAddSwitchesOnTheNewBar(Network network, VoltageLevel voltageLevel) {
String voltageLevelId = voltageLevel.getId();
voltageLevel.getConnectableStream().filter(connectable -> connectable.getType() != IdentifiableType.BUSBAR_SECTION).forEach(conn -> {
Optional<Terminal> terminalConnectedToVl = conn.getTerminals().stream()
.filter(terminal -> ((Terminal) terminal).getVoltageLevel().getId().equals(voltageLevelId))
.findFirst();
if (terminalConnectedToVl.isPresent()) {
String busbarSectionId = ModificationUtils.getInstance().getBusOrBusbarSection(terminalConnectedToVl.get());
new MoveFeederBayBuilder().withConnectableId(conn.getId())
.withTargetVoltageLevelId(voltageLevelId)
.withTerminal(terminalConnectedToVl.get())
.withTargetBusOrBusBarSectionId(busbarSectionId)
.build().apply(network, false, ReportNode.NO_OP);
}
});
}

private int findLowBusOrBusbarIndex(VoltageLevel voltageLevel) {
List<BusbarSection> busbarSections = voltageLevel.getNodeBreakerView()
.getBusbarSectionStream().toList();
Expand Down
3 changes: 1 addition & 2 deletions src/test/java/org/gridsuite/modification/modifications/CreateVoltageLevelTopologyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ protected void assertAfterNetworkModificationApplication() {
Assertions.assertEquals(7, busBarIds.size());
Assertions.assertTrue(busBarIds.containsAll(List.of("v1_1_1", "v1_1_2", "v1_1_3", "bbs1", "bbs2", "bbs3", "bbs4")));
assertTrue(getNetwork().getSwitchStream().map(Switch::getId).collect(Collectors.toSet())
.containsAll(Set.of("l11_DISCONNECTOR_13_0", "v1_DISCONNECTOR_10_7", "ld1_BREAKER", "ld1_DISCONNECTOR_11_0",
"v1_DISCONNECTOR_6_9", "v1_DISCONNECTOR_7_8", "v1_BREAKER_1_1", "l11_BREAKER")));
.containsAll(Set.of("v1_DISCONNECTOR_10_7", "v1_DISCONNECTOR_6_9", "v1_DISCONNECTOR_7_8", "v1_BREAKER_1_1")));
}

@Override
Expand Down
Loading