stores and apply several limit sets in the branch creation #9
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| /* | ||
| Copyright (c) 2024, RTE (http://www.rte-france.com) | ||
| This Source Code Form is subject to the terms of the Mozilla Public | ||
| License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
| */ | ||
| package org.gridsuite.modification.dto; | ||
|
|
||
| import io.swagger.v3.oas.annotations.media.Schema; | ||
| import lombok.Getter; | ||
| import lombok.NoArgsConstructor; | ||
| import lombok.Setter; | ||
| import lombok.ToString; | ||
| import lombok.experimental.SuperBuilder; | ||
|
|
||
| @SuperBuilder | ||
| @NoArgsConstructor | ||
| @Getter | ||
| @Setter | ||
| @ToString | ||
| @Schema(description = "Operational limits group") | ||
| public class OperationalLimitsGroupInfos { | ||
| @Schema(description = "Operational limit group id") | ||
| private String id; | ||
|
|
||
| @Schema(description = "Current limits") | ||
| private CurrentLimitsInfos currentLimits; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,11 +11,13 @@ | |
| import com.powsybl.iidm.modification.topology.CreateBranchFeederBays; | ||
| import com.powsybl.iidm.modification.topology.CreateBranchFeederBaysBuilder; | ||
| import com.powsybl.iidm.network.*; | ||
| import org.apache.commons.collections4.CollectionUtils; | ||
| import org.gridsuite.modification.NetworkModificationException; | ||
| import org.gridsuite.modification.dto.*; | ||
| import org.gridsuite.modification.utils.ModificationUtils; | ||
| import org.gridsuite.modification.utils.PropertiesUtils; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Optional; | ||
|
|
||
| import static org.gridsuite.modification.NetworkModificationException.Type.*; | ||
|
|
@@ -53,11 +55,19 @@ public void apply(Network network, ReportNode subReportNode) { | |
| } | ||
|
|
||
| // Set permanent and temporary current limits | ||
| List<OperationalLimitsGroupInfos> opLimitsGroupSide1 = modificationInfos.getOperationalLimitsGroups1(); | ||
| List<OperationalLimitsGroupInfos> opLimitsGroupSide2 = modificationInfos.getOperationalLimitsGroups2(); | ||
| if (!CollectionUtils.isEmpty(opLimitsGroupSide1)) { | ||
| ModificationUtils.getInstance().setCurrentLimitsOnASide(opLimitsGroupSide1, twoWindingsTransformer, TwoSides.ONE); | ||
| } | ||
| if (!CollectionUtils.isEmpty(opLimitsGroupSide2)) { | ||
| ModificationUtils.getInstance().setCurrentLimitsOnASide(opLimitsGroupSide2, twoWindingsTransformer, TwoSides.TWO); | ||
| } | ||
| if (modificationInfos.getSelectedOperationalLimitsGroupId1() != null) { | ||
| twoWindingsTransformer.setSelectedOperationalLimitsGroup1(modificationInfos.getSelectedOperationalLimitsGroupId1()); | ||
| } | ||
| if (modificationInfos.getSelectedOperationalLimitsGroupId2() != null) { | ||
| twoWindingsTransformer.setSelectedOperationalLimitsGroup2(modificationInfos.getSelectedOperationalLimitsGroupId2()); | ||
| } | ||
|
|
||
| ModificationUtils.getInstance().disconnectBranch(modificationInfos, network.getTwoWindingsTransformer(modificationInfos.getEquipmentId()), subReportNode); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,6 +34,7 @@ | |
|
|
||
| import javax.annotation.Nullable; | ||
|
|
||
| import static com.powsybl.iidm.network.TwoSides.ONE; | ||
| import static org.gridsuite.modification.NetworkModificationException.Type.*; | ||
|
|
||
| /** | ||
|
|
@@ -440,15 +441,15 @@ public LineAdder createLineAdder(Network network, VoltageLevel voltageLevel1, Vo | |
| .setB2(lineCreationInfos.getB2() != null ? lineCreationInfos.getB2() : 0.0); | ||
|
|
||
| // lineAdder completion by topology | ||
| setBranchAdderNodeOrBus(lineAdder, voltageLevel1, lineCreationInfos, ONE, withSwitch1); | ||
| setBranchAdderNodeOrBus(lineAdder, voltageLevel2, lineCreationInfos, TwoSides.TWO, withSwitch2); | ||
|
|
||
| return lineAdder; | ||
| } | ||
|
|
||
| public void setBranchAdderNodeOrBus(BranchAdder<?, ?> branchAdder, VoltageLevel voltageLevel, BranchCreationInfos branchCreationInfos, | ||
| TwoSides side, boolean withSwitch) { | ||
| String busOrBusbarSectionId = (side == ONE) ? branchCreationInfos.getBusOrBusbarSectionId1() : branchCreationInfos.getBusOrBusbarSectionId2(); | ||
| if (voltageLevel.getTopologyKind() == TopologyKind.BUS_BREAKER) { | ||
| setBranchAdderBusBreaker(branchAdder, voltageLevel, side, busOrBusbarSectionId); | ||
| } else { | ||
|
|
@@ -462,7 +463,7 @@ private void setBranchAdderBusBreaker(BranchAdder<?, ?> branchAdder, VoltageLeve | |
| Bus bus = getBusBreakerBus(voltageLevel, busId); | ||
|
|
||
| // complete the lineAdder | ||
| if (side == ONE) { | ||
| branchAdder.setBus1(bus.getId()).setConnectableBus1(bus.getId()); | ||
| } else { | ||
| branchAdder.setBus2(bus.getId()).setConnectableBus2(bus.getId()); | ||
|
|
@@ -481,7 +482,7 @@ private void setBranchAdderNodeBreaker(BranchAdder<?, ?> branchAdder, VoltageLev | |
| sideSuffix); | ||
|
|
||
| // complete the lineAdder | ||
| if (side == ONE) { | ||
| branchAdder.setNode1(nodeNum); | ||
| } else { | ||
| branchAdder.setNode2(nodeNum); | ||
|
|
@@ -1010,24 +1011,34 @@ public Identifiable<?> getEquipmentByIdentifiableType(Network network, Identifia | |
| }; | ||
| } | ||
|
|
||
| /** | ||
| * @param opLimitGroups added current limits | ||
| * @param branch branch to which limits are going to be added | ||
| * @param side which side of the branch receives the limits | ||
| */ | ||
| public void setCurrentLimitsOnASide(List<OperationalLimitsGroupInfos> opLimitGroups, Branch<?> branch, TwoSides side) { | ||
|
There was a problem hiding this comment. setCurrentLimitsOnSide (don't like the LimitsOnASide) There was a problem hiding this comment. Why ? I think this is more precise with "A" given that "side" also means "secondary" or "in the same time" in english. |
||
| for (OperationalLimitsGroupInfos opLimitsGroup : opLimitGroups) { | ||
| boolean hasPermanent = opLimitsGroup.getCurrentLimits().getPermanentLimit() != null; | ||
| boolean hasTemporary = !CollectionUtils.isEmpty(opLimitsGroup.getCurrentLimits().getTemporaryLimits()); | ||
| boolean hasLimits = hasPermanent || hasTemporary; | ||
| if (hasLimits) { | ||
basseche marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| OperationalLimitsGroup opGroup = side == ONE | ||
| ? branch.newOperationalLimitsGroup1(opLimitsGroup.getId()) | ||
| : branch.newOperationalLimitsGroup2(opLimitsGroup.getId()); | ||
| CurrentLimitsAdder limitsAdder = opGroup.newCurrentLimits(); | ||
| if (hasPermanent) { | ||
| limitsAdder.setPermanentLimit(opLimitsGroup.getCurrentLimits().getPermanentLimit()); | ||
| } | ||
| if (hasTemporary) { | ||
| for (CurrentTemporaryLimitCreationInfos limit : opLimitsGroup.getCurrentLimits().getTemporaryLimits()) { | ||
| limitsAdder | ||
| .beginTemporaryLimit() | ||
| .setName(limit.getName()) | ||
| .setValue(limit.getValue() == null ? Double.MAX_VALUE : limit.getValue()) | ||
| .setAcceptableDuration(limit.getAcceptableDuration() == null ? Integer.MAX_VALUE : limit.getAcceptableDuration()) | ||
| .endTemporaryLimit(); | ||
| } | ||
|
There was a problem hiding this comment. I can suggest here to use the functional approach (with forEach) There was a problem hiding this comment. OK done. And it reduces cognitive complexity. Nice. |
||
| } | ||
| limitsAdder.add(); | ||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,10 +11,7 @@ | |
| import com.powsybl.iidm.network.ValidationException; | ||
|
|
||
| import org.gridsuite.modification.NetworkModificationException; | ||
| import org.gridsuite.modification.dto.*; | ||
| import org.gridsuite.modification.utils.NetworkCreation; | ||
| import org.junit.jupiter.api.Test; | ||
| import java.util.Collections; | ||
|
|
@@ -54,7 +51,16 @@ void testCreateLineOptionalParameters5() throws Exception { | |
| .busOrBusbarSectionId1("bus1") | ||
| .voltageLevelId2("v2") | ||
| .busOrBusbarSectionId2("bus2") | ||
| .operationalLimitsGroups1( | ||
| List.of( | ||
| OperationalLimitsGroupInfos.builder() | ||
| .id("limiSet1") | ||
| .currentLimits( | ||
| CurrentLimitsInfos.builder().permanentLimit(-1.0).build() | ||
| ).build() | ||
| ) | ||
| ) | ||
| .selectedOperationalLimitsGroupId1("limiSet1") | ||
| .build(); | ||
| ValidationException exception = assertThrows(ValidationException.class, () -> lineCreationInfosPermanentLimitNOK.toModification().apply(getNetwork())); | ||
| assertEquals("AC Line 'idLine2': permanent limit must be >= 0", exception.getMessage()); | ||
|
|
@@ -82,8 +88,26 @@ protected ModificationInfos buildModification() { | |
| .b2(20.0) | ||
| .voltageLevelId1("v1") | ||
| .busOrBusbarSectionId1("bus1") | ||
| .operationalLimitsGroups1( | ||
| List.of( | ||
| OperationalLimitsGroupInfos.builder() | ||
| .id("limitSet1") | ||
| .currentLimits( | ||
| CurrentLimitsInfos.builder().permanentLimit(5.).temporaryLimits(Collections.emptyList()).build() | ||
| ).build() | ||
| ) | ||
| ) | ||
| .operationalLimitsGroups2( | ||
| List.of( | ||
| OperationalLimitsGroupInfos.builder() | ||
| .id("limitSet2") | ||
| .currentLimits( | ||
| CurrentLimitsInfos.builder().permanentLimit(5.).temporaryLimits(Collections.emptyList()).build() | ||
| ).build() | ||
| ) | ||
| ) | ||
| .selectedOperationalLimitsGroupId1("limitSet1") | ||
| .selectedOperationalLimitsGroupId2("limitSet2") | ||
| .voltageLevelId2("v2") | ||
| .busOrBusbarSectionId2("bus2") | ||
| .properties(List.of(FreePropertyInfos.builder().name(PROPERTY_NAME).value(PROPERTY_VALUE).build())) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -52,8 +52,34 @@ protected ModificationInfos buildModification() { | |
| .voltageLevelId2("v12") | ||
| .busOrBusbarSectionId2("bus12") | ||
| .connected2(true) | ||
| .operationalLimitsGroups1( | ||
| List.of( | ||
| OperationalLimitsGroupInfos.builder() | ||
| .id("limitSet1") | ||
| .currentLimits( | ||
| CurrentLimitsInfos.builder() | ||
| .permanentLimit(3.) | ||
| .temporaryLimits( | ||
| List.of(CurrentTemporaryLimitCreationInfos.builder().name("IT5").acceptableDuration(98647).value(45.).build()) | ||
| ).build() | ||
| ).build() | ||
| ) | ||
| ) | ||
| .operationalLimitsGroups2( | ||
| List.of( | ||
| OperationalLimitsGroupInfos.builder() | ||
| .id("limitSet2") | ||
| .currentLimits( | ||
| CurrentLimitsInfos.builder() | ||
| .permanentLimit(2.) | ||
| .temporaryLimits( | ||
| List.of(CurrentTemporaryLimitCreationInfos.builder().name("IT10").acceptableDuration(683647).value(791.).build()) | ||
| ).build()) | ||
| .build() | ||
| ) | ||
| ) | ||
| .selectedOperationalLimitsGroupId1("limitSet1") | ||
| .selectedOperationalLimitsGroupId2("limitSet2") | ||
| .connectionName1("cn201") | ||
| .connectionDirection1(ConnectablePosition.Direction.TOP) | ||
| .connectionName2("cn202") | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
private String selectedOperationalLimitsGroup1;
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK done.