Skip to content

add detail attachment point for line attached to vl modification #128

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 7 commits into from
Dec 5, 2025
Merged

add detail attachment point for line attached to vl modification #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
be7022f
add detail attachment point for line attached to vl modification
EtienneLt Nov 28, 2025
3b5d027
add asserts
EtienneLt Nov 28, 2025
12b178a
try to fix sonar
EtienneLt Nov 28, 2025
65045d6
Merge branch 'main' into add-attachment-point-for-modification
Mathieu-Deharbe Dec 1, 2025
7908e8f
review
EtienneLt Dec 3, 2025
af5d9da
Merge branch 'main' into add-attachment-point-for-modification
EtienneLt Dec 3, 2025
9eee066
Merge branch 'main' into add-attachment-point-for-modification
EtienneLt Dec 5, 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
3 changes: 3 additions & 0 deletions src/main/java/org/gridsuite/modification/dto/LineAttachToVoltageLevelInfos.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ public class LineAttachToVoltageLevelInfos extends ModificationInfos {
@Schema(description = "attachment point name")
private String attachmentPointName;

@Schema(description = "details about attachment point, may be null")
private VoltageLevelCreationInfos attachmentPointDetailInformation;

@Schema(description = "possible new voltage level to create before inserting it, may be null")
private VoltageLevelCreationInfos mayNewVoltageLevelInfos;

Expand Down
53 changes: 51 additions & 2 deletions src/main/java/org/gridsuite/modification/modifications/LineAttachToVoltageLevel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,15 @@
import com.powsybl.iidm.modification.topology.CreateLineOnLine;
import com.powsybl.iidm.modification.topology.CreateLineOnLineBuilder;
import com.powsybl.iidm.network.*;
import com.powsybl.iidm.network.extensions.IdentifiableShortCircuitAdder;
import groovyjarjarantlr4.v4.runtime.misc.NotNull;
import org.gridsuite.modification.NetworkModificationException;
import org.gridsuite.modification.dto.LineAttachToVoltageLevelInfos;
import org.gridsuite.modification.dto.LineCreationInfos;
import org.gridsuite.modification.dto.SubstationCreationInfos;
import org.gridsuite.modification.dto.VoltageLevelCreationInfos;
import org.gridsuite.modification.utils.ModificationUtils;
import org.gridsuite.modification.utils.PropertiesUtils;

import static org.gridsuite.modification.NetworkModificationException.Type.*;

Expand Down Expand Up @@ -58,6 +62,9 @@ public void apply(Network network, ReportNode subReportNode) {
VoltageLevelCreationInfos mayNewVL = modificationInfos.getMayNewVoltageLevelInfos();
if (mayNewVL != null) {
ModificationUtils.getInstance().createVoltageLevel(mayNewVL, subReportNode, network);
// properties
VoltageLevel voltageLevel = network.getVoltageLevel(mayNewVL.getEquipmentId());
PropertiesUtils.applyProperties(voltageLevel, null, mayNewVL.getProperties(), null);
}

LineCreationInfos attachmentLineInfos = modificationInfos.getAttachmentLine();
Expand All @@ -70,14 +77,16 @@ public void apply(Network network, ReportNode subReportNode) {
.setB1(ModificationUtils.getInstance().zeroIfNull(attachmentLineInfos.getB1()))
.setG2(ModificationUtils.getInstance().zeroIfNull(attachmentLineInfos.getG2()))
.setB2(ModificationUtils.getInstance().zeroIfNull(attachmentLineInfos.getB2()));

String newSubstationId = modificationInfos.getAttachmentPointDetailInformation() != null ?
modificationInfos.getAttachmentPointDetailInformation().getSubstationCreation().getEquipmentId() :
modificationInfos.getAttachmentPointId() + "_substation";
CreateLineOnLine algo = new CreateLineOnLineBuilder()
.withPositionPercent(modificationInfos.getPercent())
.withBusbarSectionOrBusId(modificationInfos.getBbsOrBusId())
.withFictitiousVoltageLevelId(modificationInfos.getAttachmentPointId())
.withFictitiousVoltageLevelName(modificationInfos.getAttachmentPointName())
.withCreateFictitiousSubstation(true)
.withFictitiousSubstationId(modificationInfos.getAttachmentPointId() + "_substation")
.withFictitiousSubstationId(newSubstationId)
.withLine1Id(modificationInfos.getNewLine1Id())
.withLine1Name(modificationInfos.getNewLine1Name())
.withLine2Id(modificationInfos.getNewLine2Id())
Expand All @@ -87,6 +96,46 @@ public void apply(Network network, ReportNode subReportNode) {
.build();

algo.apply(network, true, subReportNode);
// override attachment point
if (modificationInfos.getAttachmentPointDetailInformation() != null) {
// override voltage level
updateAttachmentVoltageLevel(network, modificationInfos.getAttachmentPointDetailInformation());
}
}

private void updateAttachmentVoltageLevel(Network network, @NotNull VoltageLevelCreationInfos attachmentPointDetailInformation) {
VoltageLevel voltageLevel = network.getVoltageLevel(modificationInfos.getAttachmentPointId());
if (attachmentPointDetailInformation.getHighVoltageLimit() != null) {
voltageLevel.setHighVoltageLimit(attachmentPointDetailInformation.getHighVoltageLimit());
}
if (attachmentPointDetailInformation.getLowVoltageLimit() != null) {
voltageLevel.setLowVoltageLimit(attachmentPointDetailInformation.getLowVoltageLimit());
}
if (attachmentPointDetailInformation.getIpMax() != null || attachmentPointDetailInformation.getIpMin() != null) {
IdentifiableShortCircuitAdder<VoltageLevel> adder = voltageLevel.newExtension(IdentifiableShortCircuitAdder.class);
if (attachmentPointDetailInformation.getIpMax() != null) {
adder.withIpMax(attachmentPointDetailInformation.getIpMax());
}
if (attachmentPointDetailInformation.getIpMin() != null) {
adder.withIpMin(attachmentPointDetailInformation.getIpMin());
}
adder.add();
}
PropertiesUtils.applyProperties(voltageLevel, attachmentPointDetailInformation.getProperties());
// override substation
SubstationCreationInfos substationCreationInfos = attachmentPointDetailInformation.getSubstationCreation();
updateAttachmentSubstation(network, substationCreationInfos);
}

private void updateAttachmentSubstation(Network network, @NotNull SubstationCreationInfos substationCreationInfos) {
final Substation substation = network.getSubstation(substationCreationInfos.getEquipmentId());
if (substationCreationInfos.getEquipmentName() != null) {
substation.setName(substationCreationInfos.getEquipmentName());
}
if (substationCreationInfos.getCountry() != null) {
substation.setCountry(substationCreationInfos.getCountry());
}
PropertiesUtils.applyProperties(substation, substationCreationInfos.getProperties());
}

@Override
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/org/gridsuite/modification/utils/PropertiesUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ private PropertiesUtils() {
// Should not be instantiated
}

public static void applyProperties(Identifiable<?> identifiable, @Nullable List<FreePropertyInfos> properties) {
applyProperties(identifiable, null, properties, null);
}

public static void applyProperties(Identifiable<?> identifiable, ReportNode subReportNode, @Nullable List<FreePropertyInfos> properties, String propertiesLabelKey) {
List<ReportNode> reportNodes = new ArrayList<>();
Optional.ofNullable(properties).ifPresent(props ->
Expand All @@ -29,7 +33,7 @@ public static void applyProperties(Identifiable<?> identifiable, ReportNode subR
.ifPresent(reportNodes::add)
)
);
if (!reportNodes.isEmpty()) {
if (subReportNode != null && !reportNodes.isEmpty()) {
ModificationUtils.getInstance().reportModifications(subReportNode, reportNodes, propertiesLabelKey);
}
}
Expand Down
77 changes: 69 additions & 8 deletions src/test/java/org/gridsuite/modification/modifications/LineAttachToNewVoltageLevelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,12 @@
package org.gridsuite.modification.modifications;

import com.fasterxml.jackson.core.type.TypeReference;
import com.powsybl.iidm.network.Network;
import com.powsybl.iidm.network.SwitchKind;
import com.powsybl.iidm.network.*;
import com.powsybl.iidm.network.extensions.IdentifiableShortCircuit;
import org.gridsuite.modification.dto.*;
import org.gridsuite.modification.utils.NetworkCreation;

import java.util.Arrays;
import java.util.Map;
import java.util.UUID;
import java.util.*;

import static org.junit.jupiter.api.Assertions.*;

Expand All @@ -32,6 +30,35 @@ private static LineCreationInfos getAttachmentLine() {
.build();
}

private static VoltageLevelCreationInfos getAttachmentPoint() {
return VoltageLevelCreationInfos.builder()
.equipmentId("AttPointId")
.stashed(false)
.nominalV(0)
.substationCreation(SubstationCreationInfos.builder().stashed(false)
.equipmentId("attachmentPointSubstation")
.equipmentName("attachmentPointSubstationName")
.country(Country.FR)
.properties(List.of(FreePropertyInfos.builder()
.added(true)
.name("substationProp")
.value("valueSubstation")
.build()))
.build())
.lowVoltageLimit(50.0)
.highVoltageLimit(100.0)
.ipMin(5.0)
.ipMax(20.0)
.busbarCount(1)
.sectionCount(1)
.properties(List.of(FreePropertyInfos.builder()
.added(true)
.name("voltageLevelProp")
.value("valueVoltageLevel")
.build()))
.build();
}

private static VoltageLevelCreationInfos getNewVoltageLevel() {
return VoltageLevelCreationInfos.builder()
.stashed(false)
Expand All @@ -45,8 +72,13 @@ private static VoltageLevelCreationInfos getNewVoltageLevel() {
.ipMax(10.0)
.busbarCount(2)
.sectionCount(2)
.switchKinds(Arrays.asList(SwitchKind.BREAKER))
.couplingDevices(Arrays.asList(CouplingDeviceInfos.builder().busbarSectionId1("1A").busbarSectionId2("1B").build()))
.switchKinds(List.of(SwitchKind.BREAKER))
.couplingDevices(Collections.singletonList(CouplingDeviceInfos.builder().busbarSectionId1("1A").busbarSectionId2("1B").build()))
.properties(List.of(FreePropertyInfos.builder()
.added(true)
.name("newVoltageLevelProp")
.value("newVoltageLevelValue")
.build()))
.build();
}

Expand All @@ -63,6 +95,7 @@ protected ModificationInfos buildModification() {
.percent(20.0)
.attachmentPointId("AttPointId")
.attachmentPointName("attPointName")
.attachmentPointDetailInformation(getAttachmentPoint())
.mayNewVoltageLevelInfos(getNewVoltageLevel()) // create another new VL
.existingVoltageLevelId(null)
.bbsOrBusId("1.A")
Expand All @@ -81,9 +114,37 @@ protected void assertAfterNetworkModificationApplication() {
assertNotNull(getNetwork().getLine("nl1"));
assertNotNull(getNetwork().getLine("nl2"));
assertNotNull(getNetwork().getVoltageLevel("AttPointId"));
assertNotNull(getNetwork().getVoltageLevel("newVoltageLevel"));

VoltageLevel newVoltageLevel = getNetwork().getVoltageLevel("newVoltageLevel");
assertNotNull(newVoltageLevel);
assertEquals("newVoltageLevelValue", newVoltageLevel.getProperty("newVoltageLevelProp"));

// replaced line is gone
assertNull(getNetwork().getLine("line3"));

// attachment point substation
Substation attachmentPointSubstation = getNetwork().getSubstation("attachmentPointSubstation");
assertNotNull(attachmentPointSubstation);
assertTrue(attachmentPointSubstation.getOptionalName().isPresent());
assertEquals("attachmentPointSubstationName", attachmentPointSubstation.getOptionalName().get());
assertEquals("valueSubstation", attachmentPointSubstation.getProperty("substationProp"));
assertTrue(attachmentPointSubstation.getCountry().isPresent());
assertEquals(Country.FR, attachmentPointSubstation.getCountry().get());
assertTrue(attachmentPointSubstation.isFictitious());

// attachment point voltage level
VoltageLevel attachmentPointVoltageLevel = getNetwork().getVoltageLevel("AttPointId");
assertNotNull(attachmentPointVoltageLevel);
assertEquals("valueVoltageLevel", attachmentPointVoltageLevel.getProperty("voltageLevelProp"));
assertEquals(380.0, attachmentPointVoltageLevel.getNominalV(), 0.001);
assertEquals(50.0, attachmentPointVoltageLevel.getLowVoltageLimit(), 0.001);
assertEquals(100.0, attachmentPointVoltageLevel.getHighVoltageLimit(), 0.001);
assertTrue(attachmentPointVoltageLevel.isFictitious());

IdentifiableShortCircuit<VoltageLevel> identifiableShortCircuit = attachmentPointVoltageLevel.getExtension(IdentifiableShortCircuit.class);
assertNotNull(identifiableShortCircuit);
assertEquals(5.0, identifiableShortCircuit.getIpMin(), 0.001);
assertEquals(20.0, identifiableShortCircuit.getIpMax(), 0.001);
}

@Override
Expand Down
9 changes: 4 additions & 5 deletions src/test/java/org/gridsuite/modification/modifications/LineAttachToVoltageLevelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@
import org.gridsuite.modification.dto.*;
import org.gridsuite.modification.utils.NetworkCreation;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
import java.util.Map;
import java.util.UUID;

import java.util.*;

import static org.gridsuite.modification.NetworkModificationException.Type.*;
import static org.junit.jupiter.api.Assertions.*;
Expand Down Expand Up @@ -47,8 +46,8 @@ private static VoltageLevelCreationInfos getNewVoltageLevel() {
.ipMax(10.0)
.busbarCount(2)
.sectionCount(2)
.switchKinds(Arrays.asList(SwitchKind.BREAKER))
.couplingDevices(Arrays.asList(CouplingDeviceInfos.builder().busbarSectionId1("bbs.nw").busbarSectionId2("bbs.ne").build()))
.switchKinds(List.of(SwitchKind.BREAKER))
.couplingDevices(Collections.singletonList(CouplingDeviceInfos.builder().busbarSectionId1("bbs.nw").busbarSectionId2("bbs.ne").build()))
.build();
}

Expand Down