Skip to content

Commit 9e472af

Browse files
SlimaneAmarSlimane AMAR
SlimaneAmar
and
Slimane AMAR
authored
Fix location id for current limit violation (#181)
Co-authored-by: Slimane AMAR <[email protected]>
1 parent 6d438cb commit 9e472af

File tree

8 files changed

+59
-60
lines changed

8 files changed

+59
-60
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<mockwebserver3.version>5.0.0-alpha.14</mockwebserver3.version>
5050
<sonar.organization>gridsuite</sonar.organization>
5151
<sonar.projectKey>org.gridsuite:security-analysis-server</sonar.projectKey>
52-
<powsybl-ws-commons.version>1.25.0</powsybl-ws-commons.version><!-- should be removed once gridsuite-dependencies is upgraded-->
52+
<powsybl-ws-commons.version>1.25.1</powsybl-ws-commons.version><!-- should be removed once gridsuite-dependencies is upgraded-->
5353
</properties>
5454

5555
<build>

‎src/test/java/org/gridsuite/securityanalysis/server/SecurityAnalysisControllerTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ private void checkNResultEnumFilters(UUID resultUuid) throws Exception {
461461
}
462462

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

467467
private void checkNmKResultEnumFilters(UUID resultUuid) throws Exception {
@@ -510,8 +510,7 @@ private void verifyNmkContingrnciesResultLocationIds(List<ContingencyResultDTO>
510510
.distinct()
511511
.toList();
512512

513-
Assertions.assertThat(locationIds).hasSameElementsAs(List.of("l3", "vl1 (VLGEN_0, VLLOAD_0)", "l6", "vl7"));
514-
513+
Assertions.assertThat(locationIds).hasSameElementsAs(Arrays.asList(null, "vl1 (VLGEN_0, VLLOAD_0)", "vl7"));
515514
}
516515

517516
@Test

‎src/test/resources/results/n-result-en.csv‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Equipment,Violation type,Limit name,Limit value (A or kV),Calculated value (A or kV),Load (%),Overload,Side
2-
l3,Current,l3_name,10.0,11.0,110.0,,Side 1
3-
l6,Current,l6_name,10.0,11.0,110.0,1200,Side 1
2+
,Current,l3_name,10.0,11.0,110.0,,Side 1
3+
,Current,l6_name,10.0,11.0,110.0,1200,Side 1
44
"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,

‎src/test/resources/results/n-result-fr.csv‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Ouvrage,Type de contrainte,Nom du seuil,Valeur du seuil (A ou kV),Valeur calculée (A ou kV),Charge (%),Surcharge,Côté
2-
l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
3-
l6,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
2+
,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
3+
,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
44
"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,

‎src/test/resources/results/nmk-constraints-result-en.csv‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
Constraint,Contingency ID,Status,Bus,Violation type,Limit name,Limit value (A or kV),Calculated value (A or kV),Load (%),Overload,Side
2-
l3,l1,Converged,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
3-
l3,l2,Converged,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
4-
l3,l3,Converged,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
5-
l3,l4,Converged,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
6-
l3,l6,Converged,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
7-
l3,l7,Converged,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
8-
l3,l8,Converged,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
9-
l3,l9,Converged,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
10-
l3,la,Converged,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
11-
l3,lb,Converged,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
2+
l3,l1,Converged,,Current,l3_name,10.0,11.0,110.0,,Side 1
3+
l3,l2,Converged,,Current,l3_name,10.0,11.0,110.0,,Side 1
4+
l3,l3,Converged,,Current,l3_name,10.0,11.0,110.0,,Side 1
5+
l3,l4,Converged,,Current,l3_name,10.0,11.0,110.0,,Side 1
6+
l3,l6,Converged,,Current,l3_name,10.0,11.0,110.0,,Side 1
7+
l3,l7,Converged,,Current,l3_name,10.0,11.0,110.0,,Side 1
8+
l3,l8,Converged,,Current,l3_name,10.0,11.0,110.0,,Side 1
9+
l3,l9,Converged,,Current,l3_name,10.0,11.0,110.0,,Side 1
10+
l3,la,Converged,,Current,l3_name,10.0,11.0,110.0,,Side 1
11+
l3,lb,Converged,,Current,l3_name,10.0,11.0,110.0,,Side 1
1212
vl1,l1,Converged,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
1313
vl1,l2,Converged,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
1414
vl1,l3,Converged,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
@@ -19,9 +19,9 @@ vl1,l8,Converged,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
1919
vl1,l9,Converged,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
2020
vl1,la,Converged,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
2121
vl1,lb,Converged,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
22-
l6,f1,Failed,l6,Current,l6_name,10.0,11.0,110.0,1200,Side 1
23-
l6,f2,Failed,l6,Current,l6_name,10.0,11.0,110.0,1200,Side 1
24-
l6,f3,Failed,l6,Current,l6_name,10.0,11.0,110.0,1200,Side 1
22+
l6,f1,Failed,,Current,l6_name,10.0,11.0,110.0,1200,Side 1
23+
l6,f2,Failed,,Current,l6_name,10.0,11.0,110.0,1200,Side 1
24+
l6,f3,Failed,,Current,l6_name,10.0,11.0,110.0,1200,Side 1
2525
vl7,f1,Failed,vl7,High voltage,vl7_name,400.0,410.0,,0,
2626
vl7,f2,Failed,vl7,High voltage,vl7_name,400.0,410.0,,0,
2727
vl7,f3,Failed,vl7,High voltage,vl7_name,400.0,410.0,,0,

‎src/test/resources/results/nmk-constraints-result-fr.csv‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
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é
2-
l3,l1,Convergence,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
3-
l3,l2,Convergence,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
4-
l3,l3,Convergence,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
5-
l3,l4,Convergence,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
6-
l3,l6,Convergence,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
7-
l3,l7,Convergence,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
8-
l3,l8,Convergence,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
9-
l3,l9,Convergence,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
10-
l3,la,Convergence,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
11-
l3,lb,Convergence,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
2+
l3,l1,Convergence,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
3+
l3,l2,Convergence,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
4+
l3,l3,Convergence,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
5+
l3,l4,Convergence,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
6+
l3,l6,Convergence,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
7+
l3,l7,Convergence,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
8+
l3,l8,Convergence,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
9+
l3,l9,Convergence,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
10+
l3,la,Convergence,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
11+
l3,lb,Convergence,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
1212
vl1,l1,Convergence,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
1313
vl1,l2,Convergence,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
1414
vl1,l3,Convergence,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
@@ -19,9 +19,9 @@ vl1,l8,Convergence,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
1919
vl1,l9,Convergence,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
2020
vl1,la,Convergence,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
2121
vl1,lb,Convergence,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
22-
l6,f1,Echec,l6,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
23-
l6,f2,Echec,l6,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
24-
l6,f3,Echec,l6,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
22+
l6,f1,Echec,,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
23+
l6,f2,Echec,,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
24+
l6,f3,Echec,,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
2525
vl7,f1,Echec,vl7,Tension haute,vl7_name,400.0,410.0,,0,
2626
vl7,f2,Echec,vl7,Tension haute,vl7_name,400.0,410.0,,0,
2727
vl7,f3,Echec,vl7,Tension haute,vl7_name,400.0,410.0,,0,

‎src/test/resources/results/nmk-contingencies-result-en.csv‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
Contingency ID,Status,Constraint,Bus,Violation type,Limit name,Limit value (A or kV),Calculated value (A or kV),Load (%),Overload,Side
2-
l1,Converged,l3,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
2+
l1,Converged,l3,,Current,l3_name,10.0,11.0,110.0,,Side 1
33
l1,Converged,vl1,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
4-
l2,Converged,l3,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
4+
l2,Converged,l3,,Current,l3_name,10.0,11.0,110.0,,Side 1
55
l2,Converged,vl1,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
6-
l3,Converged,l3,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
6+
l3,Converged,l3,,Current,l3_name,10.0,11.0,110.0,,Side 1
77
l3,Converged,vl1,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
8-
l4,Converged,l3,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
8+
l4,Converged,l3,,Current,l3_name,10.0,11.0,110.0,,Side 1
99
l4,Converged,vl1,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
10-
l6,Converged,l3,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
10+
l6,Converged,l3,,Current,l3_name,10.0,11.0,110.0,,Side 1
1111
l6,Converged,vl1,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
12-
l7,Converged,l3,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
12+
l7,Converged,l3,,Current,l3_name,10.0,11.0,110.0,,Side 1
1313
l7,Converged,vl1,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
14-
l8,Converged,l3,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
14+
l8,Converged,l3,,Current,l3_name,10.0,11.0,110.0,,Side 1
1515
l8,Converged,vl1,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
16-
l9,Converged,l3,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
16+
l9,Converged,l3,,Current,l3_name,10.0,11.0,110.0,,Side 1
1717
l9,Converged,vl1,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
18-
la,Converged,l3,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
18+
la,Converged,l3,,Current,l3_name,10.0,11.0,110.0,,Side 1
1919
la,Converged,vl1,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
20-
lb,Converged,l3,l3,Current,l3_name,10.0,11.0,110.0,,Side 1
20+
lb,Converged,l3,,Current,l3_name,10.0,11.0,110.0,,Side 1
2121
lb,Converged,vl1,"vl1 (VLGEN_0, VLLOAD_0)",High voltage,IST,400.0,410.0,,0,
22-
f1,Failed,l6,l6,Current,l6_name,10.0,11.0,110.0,1200,Side 1
22+
f1,Failed,l6,,Current,l6_name,10.0,11.0,110.0,1200,Side 1
2323
f1,Failed,vl7,vl7,High voltage,vl7_name,400.0,410.0,,0,
24-
f2,Failed,l6,l6,Current,l6_name,10.0,11.0,110.0,1200,Side 1
24+
f2,Failed,l6,,Current,l6_name,10.0,11.0,110.0,1200,Side 1
2525
f2,Failed,vl7,vl7,High voltage,vl7_name,400.0,410.0,,0,
26-
f3,Failed,l6,l6,Current,l6_name,10.0,11.0,110.0,1200,Side 1
26+
f3,Failed,l6,,Current,l6_name,10.0,11.0,110.0,1200,Side 1
2727
f3,Failed,vl7,vl7,High voltage,vl7_name,400.0,410.0,,0,

‎src/test/resources/results/nmk-contingencies-result-fr.csv‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
Id aléa,Statut,Contrainte,Noeud électrique,Type de contrainte,Nom du seuil,Valeur du seuil (A ou kV),Charge (%),Surcharge,Côté
2-
l1,Convergence,l3,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
2+
l1,Convergence,l3,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
33
l1,Convergence,vl1,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
4-
l2,Convergence,l3,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
4+
l2,Convergence,l3,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
55
l2,Convergence,vl1,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
6-
l3,Convergence,l3,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
6+
l3,Convergence,l3,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
77
l3,Convergence,vl1,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
8-
l4,Convergence,l3,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
8+
l4,Convergence,l3,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
99
l4,Convergence,vl1,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
10-
l6,Convergence,l3,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
10+
l6,Convergence,l3,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
1111
l6,Convergence,vl1,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
12-
l7,Convergence,l3,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
12+
l7,Convergence,l3,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
1313
l7,Convergence,vl1,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
14-
l8,Convergence,l3,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
14+
l8,Convergence,l3,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
1515
l8,Convergence,vl1,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
16-
l9,Convergence,l3,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
16+
l9,Convergence,l3,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
1717
l9,Convergence,vl1,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
18-
la,Convergence,l3,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
18+
la,Convergence,l3,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
1919
la,Convergence,vl1,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
20-
lb,Convergence,l3,l3,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
20+
lb,Convergence,l3,,Intensité,l3_name,10.0,11.0,110.0,,Côté 1
2121
lb,Convergence,vl1,"vl1 (VLGEN_0, VLLOAD_0)",Tension haute,IST,400.0,410.0,,0,
22-
f1,Echec,l6,l6,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
22+
f1,Echec,l6,,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
2323
f1,Echec,vl7,vl7,Tension haute,vl7_name,400.0,410.0,,0,
24-
f2,Echec,l6,l6,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
24+
f2,Echec,l6,,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
2525
f2,Echec,vl7,vl7,Tension haute,vl7_name,400.0,410.0,,0,
26-
f3,Echec,l6,l6,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
26+
f3,Echec,l6,,Intensité,l6_name,10.0,11.0,110.0,1200,Côté 1
2727
f3,Echec,vl7,vl7,Tension haute,vl7_name,400.0,410.0,,0,

0 commit comments

Comments
 (0)