Merge pull request #17 from rte-france/feature/add-aliases-on-networks

Add mapping function to link networks and apply aliases

Author: terriervik

src/main/java/com/rte_france/trm_algorithm/id_mapping/UcteMapper.java

@@ -41,6 +41,14 @@ public static IdentifiableMapping mapNetworks(Network networkReference, Network
         return builder.build();
     }
 
+    public static void mapNetworksAndAddAliases(Network networkReference, Network networkMarketBased) {
+        IdentifiableMapping mapping = UcteMapper.mapNetworks(networkReference, networkMarketBased);
+        mapping.mappingFromMarketBasedToReference.forEach((marketBasedId, referenceId) -> {
+            networkReference.getIdentifiable(referenceId).addAlias(marketBasedId);
+            networkMarketBased.getIdentifiable(marketBasedId).addAlias(referenceId);
+        });
+    }
+
     private static boolean isBranchConnectedToAnyGivenCountry(Branch branch, Country... countries) {
         return Arrays.stream(countries).anyMatch(country -> isBranchConnectedToCountry(branch, country));
     }

src/test/java/com/rte_france/trm_algorithm/id_mapping/UcteMapperTest.java

@@ -110,4 +110,16 @@ void testChosenCountries() {
             assertEquals("DGENE111 DLOAD111 1", mappingResultsChosenCountrys.idInReference("DGENE111 DLOAD111 1"));
         });
     }
+
+    @Test
+    void testApplyMappingAliases() {
+        // Given
+        Network networkReference = TestUtils.importNetwork("TestCase12Nodes/TestCase12Nodes_NewId.uct");
+        Network networkMarketBased = TestUtils.importNetwork("TestCase12Nodes/TestCase12Nodes.uct");
+        // When
+        UcteMapper.mapNetworksAndAddAliases(networkReference, networkMarketBased);
+        //Then
+        assertEquals(networkReference.getIdentifiable("BBE1AA1  BBE2AA1  1"), networkReference.getIdentifiable("BBE1AA12 BBE2AA11 1"));
+        assertEquals(networkMarketBased.getIdentifiable("BBE1AA1  BBE2AA1  1"), networkMarketBased.getIdentifiable("BBE1AA12 BBE2AA11 1"));
+    }
 }