Fix import and farao-dichotomy version for shift (#21)

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

Author: terriervik

pom.xml

@@ -42,7 +42,7 @@
         </sonar.jacoco.reportPath>
 
         <!-- Dependencies versions -->
-        <farao-dichotomy.version>4.32.0</farao-dichotomy.version>
+        <farao-dichotomy.version>4.33.1</farao-dichotomy.version>
         <gridcapa-cse.version>1.46.1</gridcapa-cse.version>
         <gridcapa-swe.version>1.40.0</gridcapa-swe.version>
         <junit-jupiter.version>5.10.2</junit-jupiter.version>

src/main/java/com/rte_france/trm_algorithm/operational_conditions_aligners/exchange_and_net_position/SplittingFactorsUtils.java

@@ -8,11 +8,7 @@
 package com.rte_france.trm_algorithm.operational_conditions_aligners.exchange_and_net_position;
 
 import com.farao_community.farao.cse.data.DataUtil;
-import com.farao_community.farao.cse.data.ntc.DailyNtcDocumentAdapted;
-import com.farao_community.farao.cse.data.ntc.Ntc;
-import com.farao_community.farao.cse.data.ntc.YearlyNtcDocumentAdapted;
-import com.farao_community.farao.cse.data.xsd.ntc_adapted.NTCAnnualDocument;
-import com.farao_community.farao.cse.data.xsd.ntc_adapted.NTCReductionsDocument;
+import com.farao_community.farao.cse.data.ntc.*;
 import com.powsybl.glsk.commons.CountryEICode;
 import com.powsybl.iidm.network.Country;
 import com.rte_france.trm_algorithm.TrmException;
@@ -32,16 +28,16 @@ private SplittingFactorsUtils() {
         // Utility class
     }
 
-    public static Map<String, Double> importSplittingFactorsFromNtcDocs(OffsetDateTime targetDateTime, InputStream ntcAnnualPath, InputStream ntcReductionsPath) {
+    public static Map<String, Double> importSplittingFactorsFromAdaptedNtcDocs(OffsetDateTime targetDateTime, InputStream ntcAnnualPath, InputStream ntcReductionsPath) {
 
         YearlyNtcDocumentAdapted yearlyNtcDocument;
         DailyNtcDocumentAdapted dailyNtcDocument;
         try {
-            yearlyNtcDocument = new YearlyNtcDocumentAdapted(targetDateTime, DataUtil.unmarshalFromInputStream(ntcAnnualPath, NTCAnnualDocument.class));
-            dailyNtcDocument = new DailyNtcDocumentAdapted(targetDateTime, DataUtil.unmarshalFromInputStream(ntcReductionsPath, NTCReductionsDocument.class));
+            yearlyNtcDocument = new YearlyNtcDocumentAdapted(targetDateTime, DataUtil.unmarshalFromInputStream(ntcAnnualPath, com.farao_community.farao.cse.data.xsd.ntc_adapted.NTCAnnualDocument.class));
+            dailyNtcDocument = new DailyNtcDocumentAdapted(targetDateTime, DataUtil.unmarshalFromInputStream(ntcReductionsPath, com.farao_community.farao.cse.data.xsd.ntc_adapted.NTCReductionsDocument.class));
 
         } catch (JAXBException e) {
-            throw new TrmException("An error occurred in the NTC files import for " + targetDateTime + ": " + e);
+            throw new TrmException("An error occurred in the adapted NTC files import for " + targetDateTime + ": " + e);
         }
 
         Ntc ntc = new Ntc(yearlyNtcDocument, dailyNtcDocument, true);
@@ -51,4 +47,24 @@ public static Map<String, Double> importSplittingFactorsFromNtcDocs(OffsetDateTi
         return reducedSplittingFactors;
 
     }
+
+    public static Map<String, Double> importSplittingFactorsFromNtcDocs(OffsetDateTime targetDateTime, InputStream ntcAnnualPath, InputStream ntcReductionsPath) {
+
+        YearlyNtcDocument yearlyNtcDocument;
+        DailyNtcDocument dailyNtcDocument;
+        try {
+            yearlyNtcDocument = new YearlyNtcDocument(targetDateTime, DataUtil.unmarshalFromInputStream(ntcAnnualPath, com.farao_community.farao.cse.data.xsd.NTCAnnualDocument.class));
+            dailyNtcDocument = new DailyNtcDocument(targetDateTime, DataUtil.unmarshalFromInputStream(ntcReductionsPath, com.farao_community.farao.cse.data.xsd.NTCReductionsDocument.class));
+
+        } catch (JAXBException e) {
+            throw new TrmException("An error occurred in the NTC files import for " + targetDateTime + ": " + e);
+        }
+
+        Ntc ntc = new Ntc(yearlyNtcDocument, dailyNtcDocument, false);
+        Map<String, Double> reducedSplittingFactors = new HashMap<>();
+        ntc.computeReducedSplittingFactors().forEach((country, value) -> reducedSplittingFactors.put(new CountryEICode(Country.valueOf(country)).getCode(), value));
+
+        return reducedSplittingFactors;
+
+    }
 }

src/test/java/com/rte_france/trm_algorithm/operational_conditions_aligners/ItalyNorthExchangeAlignerTest.java

@@ -20,7 +20,7 @@
 
 import static com.powsybl.iidm.network.Country.*;
 import static com.rte_france.trm_algorithm.operational_conditions_aligners.ExchangeAlignerStatus.*;
-import static com.rte_france.trm_algorithm.operational_conditions_aligners.exchange_and_net_position.SplittingFactorsUtils.importSplittingFactorsFromNtcDocs;
+import static com.rte_france.trm_algorithm.operational_conditions_aligners.exchange_and_net_position.SplittingFactorsUtils.importSplittingFactorsFromAdaptedNtcDocs;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
@@ -90,7 +90,7 @@ void testShiftWithImportedSplittingFactors() {
         InputStream yearlyData = ItalyNorthExchangeAlignerTest.class.getResourceAsStream("../TestCase12Nodes/NTC_annual_CSE_simplified_without_special_lines.xml");
         InputStream dailyData = ItalyNorthExchangeAlignerTest.class.getResourceAsStream("../TestCase12Nodes/NTC_reductions_CSE.xml");
 
-        Map<String, Double> reducedSplittingFactors = importSplittingFactorsFromNtcDocs(OffsetDateTime.parse("2021-02-25T16:30Z"), yearlyData, dailyData);
+        Map<String, Double> reducedSplittingFactors = importSplittingFactorsFromAdaptedNtcDocs(OffsetDateTime.parse("2021-02-25T16:30Z"), yearlyData, dailyData);
 
         // These are not the splitting factors but the reduced splitting factors
         assertEquals(0.046, reducedSplittingFactors.get(new CountryEICode(AT).getCode()), EPSILON);

src/test/java/com/rte_france/trm_algorithm/operational_conditions_aligners/exchange_and_net_position/SplittingFactorsUtilsTest.java

@@ -24,11 +24,26 @@ class SplittingFactorsUtilsTest {
     private static final double DOUBLE_PRECISION = 0.001;
 
     @Test
-    void testNtcReductionsImport() {
+    void testAdaptedNtcReductionsImport() {
 
         InputStream yearlyData = SplittingFactorsUtilsTest.class.getResourceAsStream("../../TestCase12Nodes/NTC_annual_CSE_simplified_without_special_lines.xml");
         InputStream dailyData = SplittingFactorsUtilsTest.class.getResourceAsStream("../../TestCase12Nodes/NTC_reductions_CSE.xml");
 
+        Map<String, Double> splittingFactors = SplittingFactorsUtils.importSplittingFactorsFromAdaptedNtcDocs(OffsetDateTime.parse("2021-02-25T16:30Z"), yearlyData, dailyData);
+
+        assertEquals(4, splittingFactors.size());
+        assertEquals(0.456, splittingFactors.get(new CountryEICode(FR).getCode()), DOUBLE_PRECISION);
+        assertEquals(0.425, splittingFactors.get(new CountryEICode(CH).getCode()), DOUBLE_PRECISION);
+        assertEquals(0.045, splittingFactors.get(new CountryEICode(AT).getCode()), DOUBLE_PRECISION);
+        assertEquals(0.073, splittingFactors.get(new CountryEICode(SI).getCode()), DOUBLE_PRECISION);
+    }
+
+    @Test
+    void testNtcReductionsImport() {
+
+        InputStream yearlyData = SplittingFactorsUtilsTest.class.getResourceAsStream("../../TestCase12Nodes/NTC_annual_CSE_simplified_without_special_lines_old_format.xml");
+        InputStream dailyData = SplittingFactorsUtilsTest.class.getResourceAsStream("../../TestCase12Nodes/NTC_reductions_CSE_old_format.xml");
+
         Map<String, Double> splittingFactors = SplittingFactorsUtils.importSplittingFactorsFromNtcDocs(OffsetDateTime.parse("2021-02-25T16:30Z"), yearlyData, dailyData);
 
         assertEquals(4, splittingFactors.size());