Log missing network element instead of failing (#13)

* Log missing network element instead of failing

Signed-off-by: Viktor Terrier <viktor.terrier@rte-france.com>

Author: terriervik

src/main/java/com/rte_france/trm_algorithm/TrmAlgorithm.java

@@ -46,14 +46,15 @@ private void checkReferenceElementNotEmpty(List<String> referenceNetworkElementI
         }
     }
 
-    private void checkReferenceElementAreAvailableInMarketBasedNetwork(List<String> referenceNetworkElementIds, Network marketBasedNetwork) {
+    private List<String> checkReferenceElementAreAvailableInMarketBasedNetwork(List<String> referenceNetworkElementIds, Network marketBasedNetwork) {
         List<String> missingBranches = referenceNetworkElementIds.stream()
             .filter(branchId -> Objects.isNull(marketBasedNetwork.getBranch(branchId)))
             .sorted()
             .toList();
         if (!missingBranches.isEmpty()) {
-            throw new TrmException(String.format("Market-based network doesn't contain the following network elements: %s.", missingBranches));
+            LOGGER.error("Market-based network doesn't contain the following network elements: {}.", missingBranches);
         }
+        return referenceNetworkElementIds.stream().filter(branchId -> !missingBranches.contains(branchId)).collect(Collectors.toList());
     }
 
     public TrmResults computeUncertainties(Network referenceNetwork, Network marketBasedNetwork, XnecProvider xnecProvider, ZonalData<SensitivityVariableSet> referenceZonalGlsks) {
@@ -62,7 +63,7 @@ public TrmResults computeUncertainties(Network referenceNetwork, Network marketB
         LOGGER.info("Selecting Critical network elements");
         List<String> referenceNetworkElementIds = xnecProvider.getNetworkElements(referenceNetwork).stream().map(Identifiable::getId).sorted().toList();
         checkReferenceElementNotEmpty(referenceNetworkElementIds);
-        checkReferenceElementAreAvailableInMarketBasedNetwork(referenceNetworkElementIds, marketBasedNetwork);
+        referenceNetworkElementIds = checkReferenceElementAreAvailableInMarketBasedNetwork(referenceNetworkElementIds, marketBasedNetwork);
 
         operationalConditionAligner.align(referenceNetwork, marketBasedNetwork);
         Map<String, Double> marketBasedFlows = flowExtractor.extract(marketBasedNetwork, referenceNetworkElementIds);

src/test/java/com/rte_france/trm_algorithm/TrmAlgorithmTest.java

@@ -16,7 +16,6 @@
 import com.powsybl.flow_decomposition.xnec_provider.XnecProviderInterconnection;
 import com.powsybl.flow_decomposition.xnec_provider.XnecProviderUnion;
 import com.powsybl.glsk.commons.ZonalData;
-import com.powsybl.glsk.commons.ZonalDataImpl;
 import com.powsybl.glsk.cse.CseGlskDocument;
 import com.powsybl.iidm.modification.scalable.Scalable;
 import com.powsybl.iidm.network.Network;
@@ -35,8 +34,7 @@
 import java.time.ZoneOffset;
 import java.util.*;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @author Hugo Schindler {@literal <hugo.schindler at rte-france.com>}
@@ -242,11 +240,18 @@ void testSameNetwork16NodesWithDisconnectedLine() {
     @Test
     void testDifferentNetwork() {
         Network referenceNetwork = TestUtils.importNetwork("TestCase16Nodes/TestCase16Nodes.uct");
-        Network marketBasedNetwork = TestUtils.importNetwork("operational_conditions_aligners/pst/NETWORK_PST_FLOW_WITH_COUNTRIES_NON_NEUTRAL.uct");
-        XnecProvider xnecProvider = new XnecProviderInterconnection();
-        TrmAlgorithm trmAlgorithm = setUp(CracFactory.findDefault().create("crac"), new ZonalDataImpl<>(Collections.emptyMap()));
-        TrmException exception = assertThrows(TrmException.class, () -> trmAlgorithm.computeUncertainties(referenceNetwork, marketBasedNetwork, xnecProvider, null));
-        assertEquals("Market-based network doesn't contain the following network elements: [BBE1AA1  FFR5AA1  1, BBE2AA1  FFR3AA1  1, BBE4AA1  FFR5AA1  1, DDE2AA1  NNL3AA1  1, FFR2AA1  DDE3AA1  1, FFR4AA1  DDE1AA1  1, FFR4AA1  DDE4AA1  1, NNL2AA1  BBE3AA1  1].", exception.getMessage());
+        Network marketBasedNetwork = TestUtils.importNetwork("TestCase16Nodes/TestCase16Nodes.uct");
+        CseGlskDocument cseGlskDocument = CseGlskDocument.importGlsk(getClass().getResourceAsStream("TestCase16Nodes/glsk_proportional_16nodes.xml"), false, true);
+        marketBasedNetwork.getLine("BBE1AA1  FFR5AA1  1").remove();
+        ZonalData<SensitivityVariableSet> zonalGlsks = cseGlskDocument.getZonalGlsks(referenceNetwork);
+        ZonalData<Scalable> localMarketZonalScalable = cseGlskDocument.getZonalScalable(marketBasedNetwork);
+        XnecProviderByIds xnecProviderByIds = XnecProviderByIds.builder()
+                .addNetworkElementsOnBasecase(Set.of("BBE1AA1  FFR5AA1  1"))
+                .build();
+        XnecProvider xnecProvider = new XnecProviderUnion(List.of(xnecProviderByIds, new XnecProviderInterconnection()));
+        TrmAlgorithm trmAlgorithm = setUp(CracFactory.findDefault().create("crac"), localMarketZonalScalable);
+        TrmResults trmResults = trmAlgorithm.computeUncertainties(referenceNetwork, marketBasedNetwork, xnecProvider, zonalGlsks);
+        assertNull(trmResults.getUncertaintiesMap().get("BBE1AA1  FFR5AA1  1"));
     }
 
     @Test