Merge pull request #176 from farao-community/remove-mnec-from-prevent…

…ive-cnecs remove mnec from preventive cnecs
farao-community · Feb 12, 2024 · f634fa2 · f634fa2
2 parents 31fb8be + 89f5bfd
commit f634fa2
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/cse-lib/data/src/main/java/com/farao_community/farao/cse/data/ttc_rao/TtcRao.java b/cse-lib/data/src/main/java/com/farao_community/farao/cse/data/ttc_rao/TtcRao.java
@@ -212,16 +212,18 @@ private static List<Action> getCurativeActions(String contingencyId, CracResults
     private static List<PreventiveBranchResult> getPreventiveBranchResults(CracResultsHelper cracResultsHelper) {
         List<PreventiveBranchResult> preventiveBranchResults = new ArrayList<>();
         List<CnecPreventive> preventiveCnecs = cracResultsHelper.getPreventiveCnecs();
-        preventiveCnecs.forEach(cnecPrev -> {
-            PreventiveBranchResult preventiveBranchResult = new PreventiveBranchResult();
-            preventiveBranchResult.setName(cnecPrev.getCnecCommon().getName());
-            fillBranchCommonPropertiesFromCnecCommon(cnecPrev.getCnecCommon(), preventiveBranchResult);
-
-            preventiveBranchResult.setIMax(getIValue((int) cnecPrev.getiMax()));
-            preventiveBranchResult.setIBeforeOptimization(getIValue((int) cnecPrev.getiBeforeOptimisation()));
-            preventiveBranchResult.setIAfterOptimization(getIValue((int) cnecPrev.getI()));
-            preventiveBranchResults.add(preventiveBranchResult);
-        });
+        preventiveCnecs.stream()
+                .filter(mergedCnec -> !mergedCnec.getCnecCommon().isMonitored())
+                .forEach(cnecPrev -> {
+                    PreventiveBranchResult preventiveBranchResult = new PreventiveBranchResult();
+                    preventiveBranchResult.setName(cnecPrev.getCnecCommon().getName());
+                    fillBranchCommonPropertiesFromCnecCommon(cnecPrev.getCnecCommon(), preventiveBranchResult);
+
+                    preventiveBranchResult.setIMax(getIValue((int) cnecPrev.getiMax()));
+                    preventiveBranchResult.setIBeforeOptimization(getIValue((int) cnecPrev.getiBeforeOptimisation()));
+                    preventiveBranchResult.setIAfterOptimization(getIValue((int) cnecPrev.getI()));
+                    preventiveBranchResults.add(preventiveBranchResult);
+                });
         return preventiveBranchResults;
     }