diff --git a/src/main/java/com/rte_france/trm_algorithm/operational_conditions_aligners/exchange_and_net_position/SplittingFactorsUtils.java b/src/main/java/com/rte_france/trm_algorithm/operational_conditions_aligners/exchange_and_net_position/SplittingFactorsUtils.java index 8fd7794..6e4ad44 100644 --- a/src/main/java/com/rte_france/trm_algorithm/operational_conditions_aligners/exchange_and_net_position/SplittingFactorsUtils.java +++ b/src/main/java/com/rte_france/trm_algorithm/operational_conditions_aligners/exchange_and_net_position/SplittingFactorsUtils.java @@ -8,11 +8,11 @@ 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.DailyNtcDocument; +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.YearlyNtcDocument; -import com.farao_community.farao.cse.data.xsd.NTCAnnualDocument; -import com.farao_community.farao.cse.data.xsd.NTCReductionsDocument; +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.powsybl.glsk.commons.CountryEICode; import com.powsybl.iidm.network.Country; import com.rte_france.trm_algorithm.TrmException; @@ -34,17 +34,17 @@ private SplittingFactorsUtils() { public static Map importSplittingFactorsFromNtcDocs(OffsetDateTime targetDateTime, InputStream ntcAnnualPath, InputStream ntcReductionsPath) { - YearlyNtcDocument yearlyNtcDocument; - DailyNtcDocument dailyNtcDocument; + YearlyNtcDocumentAdapted yearlyNtcDocument; + DailyNtcDocumentAdapted dailyNtcDocument; try { - yearlyNtcDocument = new YearlyNtcDocument(targetDateTime, DataUtil.unmarshalFromInputStream(ntcAnnualPath, NTCAnnualDocument.class)); - dailyNtcDocument = new DailyNtcDocument(targetDateTime, DataUtil.unmarshalFromInputStream(ntcReductionsPath, NTCReductionsDocument.class)); + yearlyNtcDocument = new YearlyNtcDocumentAdapted(targetDateTime, DataUtil.unmarshalFromInputStream(ntcAnnualPath, NTCAnnualDocument.class)); + dailyNtcDocument = new DailyNtcDocumentAdapted(targetDateTime, DataUtil.unmarshalFromInputStream(ntcReductionsPath, 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); + Ntc ntc = new Ntc(yearlyNtcDocument, dailyNtcDocument, true); Map reducedSplittingFactors = new HashMap<>(); ntc.computeReducedSplittingFactors().forEach((country, value) -> reducedSplittingFactors.put(new CountryEICode(Country.valueOf(country)).getCode(), value)); diff --git a/src/test/resources/com/rte_france/trm_algorithm/TestCase12Nodes/NTC_annual_CSE_simplified_without_special_lines.xml b/src/test/resources/com/rte_france/trm_algorithm/TestCase12Nodes/NTC_annual_CSE_simplified_without_special_lines.xml index 1477409..3bde719 100644 --- a/src/test/resources/com/rte_france/trm_algorithm/TestCase12Nodes/NTC_annual_CSE_simplified_without_special_lines.xml +++ b/src/test/resources/com/rte_france/trm_algorithm/TestCase12Nodes/NTC_annual_CSE_simplified_without_special_lines.xml @@ -11,7 +11,7 @@ - + @@ -192,7 +192,7 @@ - + diff --git a/src/test/resources/com/rte_france/trm_algorithm/TestCase12Nodes/NTC_reductions_CSE.xml b/src/test/resources/com/rte_france/trm_algorithm/TestCase12Nodes/NTC_reductions_CSE.xml index 7f48e4a..2597673 100644 --- a/src/test/resources/com/rte_france/trm_algorithm/TestCase12Nodes/NTC_reductions_CSE.xml +++ b/src/test/resources/com/rte_france/trm_algorithm/TestCase12Nodes/NTC_reductions_CSE.xml @@ -10,7 +10,7 @@ - + @@ -251,7 +251,7 @@ - +