Skip to content

Commit 4a640aa

Browse files
Mathieu-Deharbebasseche
Mathieu-Deharbe
and
basseche
authored
edit olg switch (adds editedOperationalLimitsGroups) (#691)
Signed-off-by: Mathieu DEHARBE <[email protected]> Signed-off-by: basseche <[email protected]> Co-authored-by: basseche <[email protected]>
1 parent f22d24d commit 4a640aa

File tree

10 files changed

+52
-15
lines changed

10 files changed

+52
-15
lines changed

‎pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -207,11 +207,6 @@
207207
<artifactId>powsybl-open-loadflow</artifactId>
208208
<scope>runtime</scope>
209209
</dependency>
210-
<dependency>
211-
<groupId>com.powsybl</groupId>
212-
<artifactId>powsybl-config-classic</artifactId>
213-
<scope>runtime</scope>
214-
</dependency>
215210

216211
<!-- Test dependencies -->
217212
<dependency>

‎src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BranchModificationEntity.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ public class BranchModificationEntity extends BasicEquipmentModificationEntity {
4747
@OrderColumn(name = "pos_operationalLimitsGroups")
4848
private List<OperationalLimitsGroupModificationEntity> operationalLimitsGroups;
4949

50+
@Column(name = "enable_olg_modification", columnDefinition = "boolean default true")
51+
private Boolean enableOLGModification;
52+
5053
@Embedded
5154
@AttributeOverrides(value = {
5255
@AttributeOverride(name = "value", column = @Column(name = "selectedOperationalLimitsGroupId1")),
@@ -217,6 +220,7 @@ private void assignAttributes(BranchModificationInfos branchModificationInfos) {
217220
x = new DoubleModificationEmbedded(branchModificationInfos.getX());
218221
r = new DoubleModificationEmbedded(branchModificationInfos.getR());
219222
this.operationalLimitsGroups = assignOperationalLimitsGroups(branchModificationInfos.getOperationalLimitsGroups(), operationalLimitsGroups);
223+
this.enableOLGModification = branchModificationInfos.getEnableOLGModification() == null || branchModificationInfos.getEnableOLGModification();
220224
this.voltageLevelId1 = branchModificationInfos.getVoltageLevelId1() != null ? new StringModificationEmbedded(branchModificationInfos.getVoltageLevelId1()) : null;
221225
this.voltageLevelId2 = branchModificationInfos.getVoltageLevelId2() != null ? new StringModificationEmbedded(branchModificationInfos.getVoltageLevelId2()) : null;
222226
this.busOrBusbarSectionId1 = branchModificationInfos.getBusOrBusbarSectionId1() != null ? new StringModificationEmbedded(branchModificationInfos.getBusOrBusbarSectionId1()) : null;

‎src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LineModificationEntity.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ public LineModificationInfos toModificationInfos() {
9696
.connectionName2(toAttributeModification(getConnectionName2()))
9797
.selectedOperationalLimitsGroup1(toAttributeModification(getSelectedOperationalLimitsGroupId1()))
9898
.selectedOperationalLimitsGroup2(toAttributeModification(getSelectedOperationalLimitsGroupId2()))
99+
.enableOLGModification(getEnableOLGModification())
99100
.connectionDirection1(toAttributeModification(getConnectionDirection1()))
100101
.connectionDirection2(toAttributeModification(getConnectionDirection2()))
101102
.connectionPosition1(toAttributeModification(getConnectionPosition1()))

‎src/main/java/org/gridsuite/modification/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,7 @@ public TwoWindingsTransformerModificationInfos toModificationInfos() {
397397
.connectionName2(toAttributeModification(getConnectionName2()))
398398
.selectedOperationalLimitsGroup1(toAttributeModification(getSelectedOperationalLimitsGroupId1()))
399399
.selectedOperationalLimitsGroup2(toAttributeModification(getSelectedOperationalLimitsGroupId2()))
400+
.enableOLGModification(getEnableOLGModification())
400401
.connectionDirection1(toAttributeModification(getConnectionDirection1()))
401402
.connectionDirection2(toAttributeModification(getConnectionDirection2()))
402403
.connectionPosition1(toAttributeModification(getConnectionPosition1()))

‎src/main/resources/db/changelog/changesets/changelog_20250923T141508Z.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
2+
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
3+
<changeSet author="deharbemat (generated)" id="1758636925802-35">
4+
<addColumn tableName="line_modification">
5+
<column defaultValueBoolean="true" name="enable_olg_modification" type="boolean"/>
6+
</addColumn>
7+
</changeSet>
8+
<changeSet author="deharbemat (generated)" id="1758636925802-36">
9+
<addColumn tableName="two_windings_transformer_modification">
10+
<column defaultValueBoolean="true" name="enable_olg_modification" type="boolean"/>
11+
</addColumn>
12+
</changeSet>
13+
</databaseChangeLog>

‎src/main/resources/db/changelog/db.changelog-master.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,3 +414,6 @@ databaseChangeLog:
414414
- include:
415415
file: changesets/changelog_20251003T070056Z.xml
416416
relativeToChangelogFile: true
417+
- include:
418+
file: changesets/changelog_20250923T141508Z.xml
419+
relativeToChangelogFile: true

‎src/test/java/org/gridsuite/modification/server/modifications/LineModificationTest.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ protected ModificationInfos buildModification() {
9090
.q1MeasurementValidity(new AttributeModification<>(MEASUREMENT_Q_VALID, OperationType.SET))
9191
.q2MeasurementValue(new AttributeModification<>(MEASUREMENT_Q_VALUE, OperationType.SET))
9292
.q2MeasurementValidity(new AttributeModification<>(MEASUREMENT_Q_VALID, OperationType.SET))
93+
.enableOLGModification(true)
9394
.operationalLimitsGroups(List.of(
9495
OperationalLimitsGroupModificationInfos.builder()
9596
.modificationType(OperationalLimitsGroupModificationType.ADD)
@@ -157,6 +158,7 @@ protected ModificationInfos buildModificationUpdate() {
157158
.b1(new AttributeModification<>(12.1, OperationType.SET))
158159
.g2(new AttributeModification<>(13.1, OperationType.SET))
159160
.b2(new AttributeModification<>(14.1, OperationType.SET))
161+
.enableOLGModification(true)
160162
.operationalLimitsGroups(List.of(OperationalLimitsGroupModificationInfos.builder()
161163
.id("DEFAULT")
162164
.applicability(OperationalLimitsGroupInfos.Applicability.SIDE1)
@@ -391,6 +393,7 @@ void testTemporaryLimitsModification() throws Exception {
391393
.stashed(false)
392394
.equipmentId("line1")
393395
.equipmentName(new AttributeModification<>("LineModified", OperationType.SET))
396+
.enableOLGModification(true)
394397
.build();
395398
String modificationToCreateJson = getJsonBody(lineModificationInfos, null);
396399

@@ -407,6 +410,7 @@ void testTemporaryLimitsModification() throws Exception {
407410
.stashed(false)
408411
.equipmentId("line1")
409412
.equipmentName(new AttributeModification<>("ModifiedName", OperationType.SET))
413+
.enableOLGModification(true)
410414
.build();
411415
modificationToCreateJson = getJsonBody(lineModificationInfos1, null);
412416

‎src/test/java/org/gridsuite/modification/server/modifications/TwoWindingsTransformerModificationTest.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ protected ModificationInfos buildModification() {
7070
.ratedS(new AttributeModification<>(7., OperationType.SET))
7171
.ratioTapChangerToBeEstimated(new AttributeModification<>(true, OperationType.SET))
7272
.phaseTapChangerToBeEstimated(new AttributeModification<>(false, OperationType.SET))
73+
.enableOLGModification(true)
7374
.operationalLimitsGroups(List.of(
7475
OperationalLimitsGroupModificationInfos.builder()
7576
.modificationType(OperationalLimitsGroupModificationType.ADD)
@@ -192,6 +193,7 @@ protected ModificationInfos buildModificationUpdate() {
192193
.ratedU1(new AttributeModification<>(5.1, OperationType.SET))
193194
.ratedU2(new AttributeModification<>(6.1, OperationType.SET))
194195
.ratedS(new AttributeModification<>(7.1, OperationType.SET))
196+
.enableOLGModification(true)
195197
.ratioTapChanger(RatioTapChangerModificationInfos.builder()
196198
.enabled(new AttributeModification<>(true, OperationType.SET))
197199
.loadTapChangingCapabilities(new AttributeModification<>(true, OperationType.SET))
@@ -331,6 +333,7 @@ void testRatioTapChangerModification() throws Exception {
331333
.equipmentId("trf1")
332334
.phaseTapChanger(PhaseTapChangerModificationInfos.builder()
333335
.build())
336+
.enableOLGModification(true)
334337
.operationalLimitsGroups(List.of(
335338
OperationalLimitsGroupModificationInfos.builder()
336339
.modificationType(OperationalLimitsGroupModificationType.ADD)
@@ -489,6 +492,7 @@ void testPhaseTapChangerModification() throws Exception {
489492
.equipmentId("trf2")
490493
.ratioTapChanger(RatioTapChangerModificationInfos.builder()
491494
.build())
495+
.enableOLGModification(true)
492496
.phaseTapChanger(PhaseTapChangerModificationInfos.builder()
493497
.enabled(new AttributeModification<>(true, OperationType.SET))
494498
.regulationMode(new AttributeModification<>(PhaseTapChanger.RegulationMode.CURRENT_LIMITER, OperationType.SET))

‎src/test/java/org/gridsuite/modification/server/modifications/tabularmodifications/TabularLineModificationsTest.java‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,18 @@ protected Network createNetwork(UUID networkUuid) {
4646
@Override
4747
protected ModificationInfos buildModification() {
4848
List<ModificationInfos> modifications = List.of(
49-
LineModificationInfos.builder().equipmentId("line1").r(new AttributeModification<>(10., OperationType.SET)).build(),
50-
LineModificationInfos.builder().equipmentId("line2").x(new AttributeModification<>(20., OperationType.SET)).build(),
51-
LineModificationInfos.builder().equipmentId("line3").g1(new AttributeModification<>(30., OperationType.SET)).build(),
49+
LineModificationInfos.builder().equipmentId("line1").r(new AttributeModification<>(10., OperationType.SET))
50+
.enableOLGModification(true).build(),
51+
LineModificationInfos.builder().equipmentId("line2").x(new AttributeModification<>(20., OperationType.SET))
52+
.enableOLGModification(true).build(),
53+
LineModificationInfos.builder().equipmentId("line3").g1(new AttributeModification<>(30., OperationType.SET))
54+
.enableOLGModification(true).build(),
5255
LineModificationInfos.builder().equipmentId("line3").b1(new AttributeModification<>(40., OperationType.SET))
53-
.operationalLimitsGroups(buildOperationalLimitsGroupDefaultModification())
54-
.build(),
55-
LineModificationInfos.builder().equipmentId("unknownLine").b2(new AttributeModification<>(60., OperationType.SET)).build()
56+
.enableOLGModification(true)
57+
.operationalLimitsGroups(buildOperationalLimitsGroupDefaultModification())
58+
.build(),
59+
LineModificationInfos.builder().equipmentId("unknownLine").b2(new AttributeModification<>(60., OperationType.SET))
60+
.enableOLGModification(true).build()
5661
);
5762
return TabularModificationInfos.builder()
5863
.modificationType(ModificationType.LINE_MODIFICATION)
@@ -66,12 +71,17 @@ protected ModificationInfos buildModification() {
6671
protected ModificationInfos buildModificationUpdate() {
6772
List<ModificationInfos> modifications = List.of(
6873
LineModificationInfos.builder().equipmentId("line1").r(new AttributeModification<>(1., OperationType.SET))
74+
.enableOLGModification(true)
6975
.operationalLimitsGroups(buildOperationalLimitsGroupDefaultModification())
7076
.build(),
71-
LineModificationInfos.builder().equipmentId("line2").r(new AttributeModification<>(2., OperationType.SET)).build(),
72-
LineModificationInfos.builder().equipmentId("line3").g1(new AttributeModification<>(3., OperationType.SET)).build(),
73-
LineModificationInfos.builder().equipmentId("line3").b1(new AttributeModification<>(4., OperationType.SET)).build(),
74-
LineModificationInfos.builder().equipmentId("unknownLine").b2(new AttributeModification<>(50., OperationType.SET)).build()
77+
LineModificationInfos.builder().equipmentId("line2").r(new AttributeModification<>(2., OperationType.SET))
78+
.enableOLGModification(true).build(),
79+
LineModificationInfos.builder().equipmentId("line3").g1(new AttributeModification<>(3., OperationType.SET))
80+
.enableOLGModification(true).build(),
81+
LineModificationInfos.builder().equipmentId("line3").b1(new AttributeModification<>(4., OperationType.SET))
82+
.enableOLGModification(true).build(),
83+
LineModificationInfos.builder().equipmentId("unknownLine").b2(new AttributeModification<>(50., OperationType.SET))
84+
.enableOLGModification(true).build()
7585
);
7686
return TabularModificationInfos.builder()
7787
.modificationType(ModificationType.LINE_MODIFICATION)

‎src/test/java/org/gridsuite/modification/server/modifications/tabularmodifications/TabularTwoWindingsTransformerModificationsTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ protected ModificationInfos buildModificationUpdate() {
7373
protected TwoWindingsTransformerModificationInfos buildOneModification(String equipmentId, Double seriesResistance) {
7474
return TwoWindingsTransformerModificationInfos.builder().equipmentId(equipmentId)
7575
.r(new AttributeModification<>(seriesResistance, OperationType.SET))
76+
.enableOLGModification(true)
7677
.build();
7778
}
7879

@@ -119,6 +120,7 @@ private List<ModificationInfos> createTwtModificationList(int qty) {
119120
(ModificationInfos) TwoWindingsTransformerModificationInfos.builder().equipmentId(UUID.randomUUID().toString())
120121
.x(new AttributeModification<>(1., OperationType.SET))
121122
.g(new AttributeModification<>(1., OperationType.SET))
123+
.enableOLGModification(true)
122124
.operationalLimitsGroups(TabularLineModificationsTest.buildOperationalLimitsGroupDefaultModification())
123125
.properties(List.of(
124126
ModificationCreation.getFreeProperty(),

0 commit comments

Comments
 (0)