stores and apply several limit sets in the branch creation #9

Mathieu-Deharbe · 2024-12-10T14:21:58Z

Adds the selected operational limit groups to the quad creation. And turn the current limits on side1 and 2 into lists (containing the currently selected but also others).

Signed-off-by: Mathieu DEHARBE <[email protected]>

ghazwarhili · 2024-12-17T08:01:56Z

src/main/java/org/gridsuite/modification/dto/CurrentLimitsInfos.java

 import lombok.experimental.SuperBuilder;

 import java.util.List;

 /**
 * @author Sylvain Bouzols <sylvain.bouzols at rte-france.com>
+ * ~= environ operational limit group, ~= limit set


to be removed

Done. I instead createa an OperationalLimitsGroup class to be closer to IIDM.

ghazwarhili · 2024-12-17T08:02:18Z

src/main/java/org/gridsuite/modification/dto/CurrentLimitsInfos.java

@@ -27,6 +25,9 @@
 @Schema(description = "Current Limits")
 public class CurrentLimitsInfos {

+    @Schema(description = "Operational limit group name")
+    private String operationalLimitGroupId;


operationalLimitsGroupId ?

also change the description

This class member has been removed. But yep the 's' was missing.

ghazwarhili · 2024-12-17T08:03:20Z

src/main/java/org/gridsuite/modification/utils/ModificationUtils.java

@@ -43,6 +43,11 @@
 // TODO remove public qualifier for all methods
 public final class ModificationUtils {

+    public enum Side {


you don't need this
you can use enum Side of powsyble

True. I changed it, thank you.

src/main/java/org/gridsuite/modification/modifications/TwoWindingsTransformerCreation.java

Signed-off-by: Mathieu DEHARBE <[email protected]>

src/main/java/org/gridsuite/modification/dto/CurrentLimitsInfos.java

src/main/java/org/gridsuite/modification/modifications/LineCreation.java

src/main/java/org/gridsuite/modification/utils/ModificationUtils.java

ghazwarhili · 2025-01-03T16:00:35Z

src/main/java/org/gridsuite/modification/dto/BranchCreationInfos.java


-    @Schema(description = "Current limits Side 2")
-    private CurrentLimitsInfos currentLimits2;
+    @Schema(description = "Selected operational limits group id on Side 2")


Selected operational limits group on Side 2

OK why not.

ghazwarhili · 2025-01-03T16:04:40Z

src/main/java/org/gridsuite/modification/modifications/LineCreation.java

+        List<OperationalLimitsGroupInfos> opLimitsGroupSide1 = modificationInfos.getOperationalLimitsGroups1();
+        List<OperationalLimitsGroupInfos> opLimitsGroupSide2 = modificationInfos.getOperationalLimitsGroups2();
+        if (!CollectionUtils.isEmpty(opLimitsGroupSide1)) {
+            var line = ModificationUtils.getInstance().getLine(network, modificationInfos.getEquipmentId());


Suggested change

var line = ModificationUtils.getInstance().getLine(network, modificationInfos.getEquipmentId());

Line line = ModificationUtils.getInstance().getLine(network, modificationInfos.getEquipmentId());

ghazwarhili · 2025-01-06T11:57:51Z

src/main/java/org/gridsuite/modification/dto/BranchCreationInfos.java

+    private List<OperationalLimitsGroupInfos> operationalLimitsGroups2;
+
+    @Schema(description = "Selected operational limits group id on Side 1")
+    private String selectedOperationalLimitsGroupId1;


private String selectedOperationalLimitsGroup1;

ghazwarhili · 2025-01-06T14:31:33Z

src/main/java/org/gridsuite/modification/utils/ModificationUtils.java

+                                .setValue(limit.getValue() == null ? Double.MAX_VALUE : limit.getValue())
+                                .setAcceptableDuration(limit.getAcceptableDuration() == null ? Integer.MAX_VALUE : limit.getAcceptableDuration())
+                                .endTemporaryLimit();
+                    }


I can suggest here to use the functional approach (with forEach)

.forEach(limit -> { double value = limit.getValue() != null ? limit.getValue() : Double.MAX_VALUE; int duration = limit.getAcceptableDuration() != null ? limit.getAcceptableDuration() : Integer.MAX_VALUE; limitsAdder.beginTemporaryLimit() .setName(limit.getName()) .setValue(value) .setAcceptableDuration(duration) .endTemporaryLimit(); }); }

OK done. And it reduces cognitive complexity. Nice.

ghazwarhili · 2025-01-06T14:33:25Z

src/main/java/org/gridsuite/modification/utils/ModificationUtils.java

+     * @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) {


setCurrentLimitsOnSide (don't like the LimitsOnASide)

Why ? I think this is more precise with "A" given that "side" also means "secondary" or "in the same time" in english.
At least here we know this is a noun.

ghazwarhili · 2025-01-06T14:44:28Z

src/main/java/org/gridsuite/modification/modifications/LineCreation.java

            var line = ModificationUtils.getInstance().getLine(network, modificationInfos.getEquipmentId());
-            ModificationUtils.getInstance().setCurrentLimits(currentLimitsInfos1, line.newCurrentLimits1());
-            ModificationUtils.getInstance().setCurrentLimits(currentLimitsInfos2, line.newCurrentLimits2());
+            ModificationUtils.getInstance().setCurrentLimitsOnASide(opLimitsGroupSide2, line, TWO);
        }
        ModificationUtils.getInstance().disconnectBranch(modificationInfos, network.getLine(modificationInfos.getEquipmentId()), subReportNode);
        // properties
        Line line = network.getLine(modificationInfos.getEquipmentId());


We can place this line before (for example, line 74) to avoid calling getLine three times and
extract the code of // Set permanent and temporary current limits... shared between line and twt into a common funct (the second remarq is a suggestion not mandatory)

Yes I thought about this but didn't dare because it looks like whoever wrote this like this did it on purpose. And I didn't want to take the risk.

But ok you look motivated I did it !

Signed-off-by: Mathieu DEHARBE <[email protected]>

sonarqubecloud · 2025-01-16T10:33:35Z

Quality Gate passed

Issues
1 New issue
0 Accepted issues

Measures
0 Security Hotspots
89.3% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

stores and apply several limit sets in the branch creation

a6634b6

Signed-off-by: Mathieu DEHARBE <[email protected]>

Mathieu-Deharbe mentioned this pull request Dec 10, 2024

complete limits in branch creation gridsuite/network-modification-server#572

Open

Mathieu-Deharbe and others added 7 commits December 12, 2024 11:26

back to CurrentLimitsEntity + update application

28ad43f

Signed-off-by: Mathieu DEHARBE <[email protected]>

renaming

1f00dc0

Signed-off-by: Mathieu DEHARBE <[email protected]>

TUs

58a77ef

Signed-off-by: Mathieu DEHARBE <[email protected]>

cleans

0c57651

Signed-off-by: Mathieu DEHARBE <[email protected]>

simplify

eccbc5e

Signed-off-by: Mathieu DEHARBE <[email protected]>

correction

d05d9be

Signed-off-by: Mathieu DEHARBE <[email protected]>

Merge branch 'main' into complete-limits-in-branch-creation

e0942a2

Mathieu-Deharbe requested a review from ghazwarhili December 16, 2024 12:13

ghazwarhili reviewed Dec 17, 2024

View reviewed changes

Merge branch 'main' into complete-limits-in-branch-creation

4ede9ef

basseche reviewed Dec 18, 2024

View reviewed changes

src/main/java/org/gridsuite/modification/modifications/TwoWindingsTransformerCreation.java Outdated Show resolved Hide resolved

basseche reviewed Dec 18, 2024

View reviewed changes

src/main/java/org/gridsuite/modification/modifications/TwoWindingsTransformerCreation.java Outdated Show resolved Hide resolved

Mathieu-Deharbe added 3 commits December 18, 2024 15:16

adds OperationalLimitsGroupInfos

5eae6c8

Signed-off-by: Mathieu DEHARBE <[email protected]>

!CollectionUtils.isEmpty(

ad86424

Signed-off-by: Mathieu DEHARBE <[email protected]>

OperationalLimitsGroupEntity and everything that uses it

13d096f

Signed-off-by: Mathieu DEHARBE <[email protected]>

Mathieu-Deharbe requested review from ghazwarhili and basseche December 19, 2024 11:31

basseche reviewed Jan 2, 2025

View reviewed changes

Merge branch 'main' into complete-limits-in-branch-creation

c20b3a8

ghazwarhili reviewed Jan 6, 2025

View reviewed changes

Mathieu-Deharbe and others added 6 commits January 6, 2025 18:26

post review 1

a52072a

Signed-off-by: Mathieu DEHARBE <[email protected]>

TU

1c71d77

Signed-off-by: Mathieu DEHARBE <[email protected]>

reduce cognitive complexity

e5e03d9

Signed-off-by: Mathieu DEHARBE <[email protected]>

comply with build requirements

2e16fd5

Signed-off-by: Mathieu DEHARBE <[email protected]>

post review 2

6e93a4a

Signed-off-by: Mathieu DEHARBE <[email protected]>

Merge branch 'main' into complete-limits-in-branch-creation

ba0de6a

Mathieu-Deharbe requested review from ghazwarhili and basseche January 13, 2025 09:05

Mathieu-Deharbe added 2 commits January 14, 2025 16:14

Merge branch 'main' into complete-limits-in-branch-creation

d080a43

Merge branch 'main' into complete-limits-in-branch-creation

a07090d

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

stores and apply several limit sets in the branch creation #9

stores and apply several limit sets in the branch creation #9

Mathieu-Deharbe commented Dec 10, 2024 •

edited

Loading

ghazwarhili Dec 17, 2024

Mathieu-Deharbe Dec 18, 2024 •

edited

Loading

ghazwarhili Dec 17, 2024

basseche Dec 18, 2024

Mathieu-Deharbe Dec 18, 2024

ghazwarhili Dec 17, 2024

Mathieu-Deharbe Dec 18, 2024

ghazwarhili Jan 3, 2025

Mathieu-Deharbe Jan 6, 2025

ghazwarhili Jan 3, 2025

Mathieu-Deharbe Jan 6, 2025

ghazwarhili Jan 6, 2025

Mathieu-Deharbe Jan 6, 2025

ghazwarhili Jan 6, 2025

Mathieu-Deharbe Jan 7, 2025

ghazwarhili Jan 6, 2025

Mathieu-Deharbe Jan 7, 2025

ghazwarhili Jan 6, 2025

Mathieu-Deharbe Jan 7, 2025 •

edited

Loading

sonarqubecloud bot commented Jan 16, 2025

	var line = ModificationUtils.getInstance().getLine(network, modificationInfos.getEquipmentId());
	Line line = ModificationUtils.getInstance().getLine(network, modificationInfos.getEquipmentId());

stores and apply several limit sets in the branch creation #9

Are you sure you want to change the base?

stores and apply several limit sets in the branch creation #9

Conversation

Mathieu-Deharbe commented Dec 10, 2024 • edited Loading

Choose a reason for hiding this comment

Mathieu-Deharbe Dec 18, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Mathieu-Deharbe Jan 7, 2025 • edited Loading

Choose a reason for hiding this comment

sonarqubecloud bot commented Jan 16, 2025

Quality Gate passed

Mathieu-Deharbe commented Dec 10, 2024 •

edited

Loading

Mathieu-Deharbe Dec 18, 2024 •

edited

Loading

Mathieu-Deharbe Jan 7, 2025 •

edited

Loading