Skip to content

Fix location id for current limit violation #181

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
merged 2 commits into from
Jun 17, 2025
Merged

Fix location id for current limit violation #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60b8809
Fix location id for current limit violation
Jun 17, 2025
9822b6a
Merge branch 'main' of https://github.com/gridsuite/security-analysis…
Jun 17, 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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<mockwebserver3.version>5.0.0-alpha.14</mockwebserver3.version>
<sonar.organization>gridsuite</sonar.organization>
<sonar.projectKey>org.gridsuite:security-analysis-server</sonar.projectKey>
<powsybl-ws-commons.version>1.25.0</powsybl-ws-commons.version><!-- should be removed once gridsuite-dependencies is upgraded-->
<powsybl-ws-commons.version>1.25.1</powsybl-ws-commons.version><!-- should be removed once gridsuite-dependencies is upgraded-->
</properties>

<build>
Expand Down
5 changes: 2 additions & 3 deletions src/test/java/org/gridsuite/securityanalysis/server/SecurityAnalysisControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ private void checkNResultEnumFilters(UUID resultUuid) throws Exception {
}

private void verifynResultsLocationId(List<PreContingencyLimitViolationResultDTO> nResults) {
Assertions.assertThat(nResults.stream().map(preContingencyLimitViolationResultDTO -> preContingencyLimitViolationResultDTO.getLimitViolation().getLocationId()).toList()).hasSameElementsAs(List.of("l3", "vl1 (VLGEN_0, VLLOAD_0)", "l6"));
Assertions.assertThat(nResults.stream().map(preContingencyLimitViolationResultDTO -> preContingencyLimitViolationResultDTO.getLimitViolation().getLocationId()).toList()).hasSameElementsAs(Arrays.asList(null, "vl1 (VLGEN_0, VLLOAD_0)", null));
}

private void checkNmKResultEnumFilters(UUID resultUuid) throws Exception {
Expand Down Expand Up @@ -510,8 +510,7 @@ private void verifyNmkContingrnciesResultLocationIds(List<ContingencyResultDTO>
.distinct()
.toList();

Assertions.assertThat(locationIds).hasSameElementsAs(List.of("l3", "vl1 (VLGEN_0, VLLOAD_0)", "l6", "vl7"));

Assertions.assertThat(locationIds).hasSameElementsAs(Arrays.asList(null, "vl1 (VLGEN_0, VLLOAD_0)", "vl7"));
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/results/n-result-en.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Equipment,Violation type,Limit name,Limit value (A or kV),Calculated value (A or kV),Load (%),Overload,Side
l3,Current,l3_name,10.0,11.0,110.0,,Side 1
l6,Current,l6_name,10.0,11.0,110.0,1200,Side 1
,Current,l3_name,10.0,11.0,110.0,,Side 1
,Current,l6_name,10.0,11.0,110.0,1200,Side 1
"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
4 changes: 2 additions & 2 deletions src/test/resources/results/n-result-fr.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Ouvrage,Type de contrainte,Nom du seuil,Valeur du seuil (A ou kV),Valeur calculée (A ou kV),Charge (%),Surcharge,Côté
l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l6,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
26 changes: 13 additions & 13 deletions src/test/resources/results/nmk-constraints-result-en.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
Constraint,Contingency ID,Status,Bus,Violation type,Limit name,Limit value (A or kV),Calculated value (A or kV),Load (%),Overload,Side
l3,l1,Converged,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
l3,l2,Converged,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
l3,l3,Converged,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
l3,l4,Converged,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
l3,l6,Converged,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
l3,l7,Converged,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
l3,l8,Converged,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
l3,l9,Converged,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
l3,la,Converged,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
l3,lb,Converged,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
l3,l1,Converged,,Current,l3_name,10.0,11.0,110.0,,Side 1
l3,l2,Converged,,Current,l3_name,10.0,11.0,110.0,,Side 1
l3,l3,Converged,,Current,l3_name,10.0,11.0,110.0,,Side 1
l3,l4,Converged,,Current,l3_name,10.0,11.0,110.0,,Side 1
l3,l6,Converged,,Current,l3_name,10.0,11.0,110.0,,Side 1
l3,l7,Converged,,Current,l3_name,10.0,11.0,110.0,,Side 1
l3,l8,Converged,,Current,l3_name,10.0,11.0,110.0,,Side 1
l3,l9,Converged,,Current,l3_name,10.0,11.0,110.0,,Side 1
l3,la,Converged,,Current,l3_name,10.0,11.0,110.0,,Side 1
l3,lb,Converged,,Current,l3_name,10.0,11.0,110.0,,Side 1
vl1,l1,Converged,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
vl1,l2,Converged,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
vl1,l3,Converged,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
Expand All @@ -19,9 +19,9 @@ vl1,l8,Converged,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
vl1,l9,Converged,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
vl1,la,Converged,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
vl1,lb,Converged,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
l6,f1,Failed,l6,Current,l6_name,10.0,11.0,110.0,1200,Side 1
l6,f2,Failed,l6,Current,l6_name,10.0,11.0,110.0,1200,Side 1
l6,f3,Failed,l6,Current,l6_name,10.0,11.0,110.0,1200,Side 1
l6,f1,Failed,,Current,l6_name,10.0,11.0,110.0,1200,Side 1
l6,f2,Failed,,Current,l6_name,10.0,11.0,110.0,1200,Side 1
l6,f3,Failed,,Current,l6_name,10.0,11.0,110.0,1200,Side 1
vl7,f1,Failed,vl7,High voltage,vl7_name,400.0,410.0,,0,
vl7,f2,Failed,vl7,High voltage,vl7_name,400.0,410.0,,0,
vl7,f3,Failed,vl7,High voltage,vl7_name,400.0,410.0,,0,
26 changes: 13 additions & 13 deletions src/test/resources/results/nmk-constraints-result-fr.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
Contrainte,ID aléa,Statut,Noeud électrique,Type de contrainte,Nom du seuil,Valeur du seuil (A ou kV),Valeur calculée (A ou kV),Charge (%),Surcharge,Côté
l3,l1,Convergence,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l3,l2,Convergence,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l3,l3,Convergence,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l3,l4,Convergence,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l3,l6,Convergence,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l3,l7,Convergence,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l3,l8,Convergence,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l3,l9,Convergence,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l3,la,Convergence,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l3,lb,Convergence,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l3,l1,Convergence,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l3,l2,Convergence,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l3,l3,Convergence,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l3,l4,Convergence,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l3,l6,Convergence,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l3,l7,Convergence,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l3,l8,Convergence,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l3,l9,Convergence,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l3,la,Convergence,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l3,lb,Convergence,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
vl1,l1,Convergence,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
vl1,l2,Convergence,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
vl1,l3,Convergence,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
Expand All @@ -19,9 +19,9 @@ vl1,l8,Convergence,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
vl1,l9,Convergence,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
vl1,la,Convergence,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
vl1,lb,Convergence,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
l6,f1,Echec,l6,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
l6,f2,Echec,l6,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
l6,f3,Echec,l6,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
l6,f1,Echec,,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
l6,f2,Echec,,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
l6,f3,Echec,,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
vl7,f1,Echec,vl7,Tension haute,vl7_name,400.0,410.0,,0,
vl7,f2,Echec,vl7,Tension haute,vl7_name,400.0,410.0,,0,
vl7,f3,Echec,vl7,Tension haute,vl7_name,400.0,410.0,,0,
26 changes: 13 additions & 13 deletions src/test/resources/results/nmk-contingencies-result-en.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
Contingency ID,Status,Constraint,Bus,Violation type,Limit name,Limit value (A or kV),Calculated value (A or kV),Load (%),Overload,Side
l1,Converged,l3,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
l1,Converged,l3,,Current,l3_name,10.0,11.0,110.0,,Side 1
l1,Converged,vl1,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
l2,Converged,l3,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
l2,Converged,l3,,Current,l3_name,10.0,11.0,110.0,,Side 1
l2,Converged,vl1,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
l3,Converged,l3,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
l3,Converged,l3,,Current,l3_name,10.0,11.0,110.0,,Side 1
l3,Converged,vl1,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
l4,Converged,l3,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
l4,Converged,l3,,Current,l3_name,10.0,11.0,110.0,,Side 1
l4,Converged,vl1,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
l6,Converged,l3,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
l6,Converged,l3,,Current,l3_name,10.0,11.0,110.0,,Side 1
l6,Converged,vl1,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
l7,Converged,l3,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
l7,Converged,l3,,Current,l3_name,10.0,11.0,110.0,,Side 1
l7,Converged,vl1,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
l8,Converged,l3,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
l8,Converged,l3,,Current,l3_name,10.0,11.0,110.0,,Side 1
l8,Converged,vl1,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
l9,Converged,l3,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
l9,Converged,l3,,Current,l3_name,10.0,11.0,110.0,,Side 1
l9,Converged,vl1,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
la,Converged,l3,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
la,Converged,l3,,Current,l3_name,10.0,11.0,110.0,,Side 1
la,Converged,vl1,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
lb,Converged,l3,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
lb,Converged,l3,,Current,l3_name,10.0,11.0,110.0,,Side 1
lb,Converged,vl1,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
f1,Failed,l6,l6,Current,l6_name,10.0,11.0,110.0,1200,Side 1
f1,Failed,l6,,Current,l6_name,10.0,11.0,110.0,1200,Side 1
f1,Failed,vl7,vl7,High voltage,vl7_name,400.0,410.0,,0,
f2,Failed,l6,l6,Current,l6_name,10.0,11.0,110.0,1200,Side 1
f2,Failed,l6,,Current,l6_name,10.0,11.0,110.0,1200,Side 1
f2,Failed,vl7,vl7,High voltage,vl7_name,400.0,410.0,,0,
f3,Failed,l6,l6,Current,l6_name,10.0,11.0,110.0,1200,Side 1
f3,Failed,l6,,Current,l6_name,10.0,11.0,110.0,1200,Side 1
f3,Failed,vl7,vl7,High voltage,vl7_name,400.0,410.0,,0,
26 changes: 13 additions & 13 deletions src/test/resources/results/nmk-contingencies-result-fr.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
Id aléa,Statut,Contrainte,Noeud électrique,Type de contrainte,Nom du seuil,Valeur du seuil (A ou kV),Charge (%),Surcharge,Côté
l1,Convergence,l3,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l1,Convergence,l3,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l1,Convergence,vl1,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
l2,Convergence,l3,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l2,Convergence,l3,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l2,Convergence,vl1,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
l3,Convergence,l3,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l3,Convergence,l3,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l3,Convergence,vl1,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
l4,Convergence,l3,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l4,Convergence,l3,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l4,Convergence,vl1,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
l6,Convergence,l3,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l6,Convergence,l3,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l6,Convergence,vl1,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
l7,Convergence,l3,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l7,Convergence,l3,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l7,Convergence,vl1,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
l8,Convergence,l3,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l8,Convergence,l3,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l8,Convergence,vl1,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
l9,Convergence,l3,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l9,Convergence,l3,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
l9,Convergence,vl1,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
la,Convergence,l3,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
la,Convergence,l3,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
la,Convergence,vl1,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
lb,Convergence,l3,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
lb,Convergence,l3,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
lb,Convergence,vl1,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
f1,Echec,l6,l6,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
f1,Echec,l6,,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
f1,Echec,vl7,vl7,Tension haute,vl7_name,400.0,410.0,,0,
f2,Echec,l6,l6,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
f2,Echec,l6,,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
f2,Echec,vl7,vl7,Tension haute,vl7_name,400.0,410.0,,0,
f3,Echec,l6,l6,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
f3,Echec,l6,,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
f3,Echec,vl7,vl7,Tension haute,vl7_name,400.0,410.0,,0,