diff --git a/pom.xml b/pom.xml index e49527d8..daae96eb 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ 5.0.0-alpha.14 gridsuite org.gridsuite:security-analysis-server - 1.25.0 + 1.25.1 diff --git a/src/test/java/org/gridsuite/securityanalysis/server/SecurityAnalysisControllerTest.java b/src/test/java/org/gridsuite/securityanalysis/server/SecurityAnalysisControllerTest.java index a3cb01bf..776c5bc3 100644 --- a/src/test/java/org/gridsuite/securityanalysis/server/SecurityAnalysisControllerTest.java +++ b/src/test/java/org/gridsuite/securityanalysis/server/SecurityAnalysisControllerTest.java @@ -461,7 +461,7 @@ private void checkNResultEnumFilters(UUID resultUuid) throws Exception { } private void verifynResultsLocationId(List 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 { @@ -510,8 +510,7 @@ private void verifyNmkContingrnciesResultLocationIds(List .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 diff --git a/src/test/resources/results/n-result-en.csv b/src/test/resources/results/n-result-en.csv index 31785e07..fe6ffe4a 100644 --- a/src/test/resources/results/n-result-en.csv +++ b/src/test/resources/results/n-result-en.csv @@ -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, diff --git a/src/test/resources/results/n-result-fr.csv b/src/test/resources/results/n-result-fr.csv index e2fd45e0..b11af1d3 100644 --- a/src/test/resources/results/n-result-fr.csv +++ b/src/test/resources/results/n-result-fr.csv @@ -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, diff --git a/src/test/resources/results/nmk-constraints-result-en.csv b/src/test/resources/results/nmk-constraints-result-en.csv index 838864c2..9f2f0843 100644 --- a/src/test/resources/results/nmk-constraints-result-en.csv +++ b/src/test/resources/results/nmk-constraints-result-en.csv @@ -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, @@ -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, diff --git a/src/test/resources/results/nmk-constraints-result-fr.csv b/src/test/resources/results/nmk-constraints-result-fr.csv index 7dce92d8..0aa39b42 100644 --- a/src/test/resources/results/nmk-constraints-result-fr.csv +++ b/src/test/resources/results/nmk-constraints-result-fr.csv @@ -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, @@ -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, diff --git a/src/test/resources/results/nmk-contingencies-result-en.csv b/src/test/resources/results/nmk-contingencies-result-en.csv index 2ee6d435..e49c2755 100644 --- a/src/test/resources/results/nmk-contingencies-result-en.csv +++ b/src/test/resources/results/nmk-contingencies-result-en.csv @@ -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, diff --git a/src/test/resources/results/nmk-contingencies-result-fr.csv b/src/test/resources/results/nmk-contingencies-result-fr.csv index a82e93c6..27e26c2b 100644 --- a/src/test/resources/results/nmk-contingencies-result-fr.csv +++ b/src/test/resources/results/nmk-contingencies-result-fr.csv @@ -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,