Skip to content

Adapt NTC import to import EC process files #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OpenSuze merged 1 commit into from
Aug 19, 2025
Merged

Adapt NTC import to import EC process files #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions ...ithm/operational_conditions_aligners/exchange_and_net_position/SplittingFactorsUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -34,17 +34,17 @@ private SplittingFactorsUtils() {

public static Map<String, Double> 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<String, Double> reducedSplittingFactors = new HashMap<>();
ntc.computeReducedSplittingFactors().forEach((country, value) -> reducedSplittingFactors.put(new CountryEICode(Country.valueOf(country)).getCode(), value));

Expand Down
4 changes: 2 additions & 2 deletions ..._france/trm_algorithm/TestCase12Nodes/NTC_annual_CSE_simplified_without_special_lines.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<ReceiverRole v="A36"/>
<CreationDateTime v="2020-12-16T16:42:18Z"/>
<Domain v="10YDOM-1001A061T" codingScheme="A01"/>
<NTCvalues>
<NTCvaluesImport>
<SpecialDays>
<Day day="2021-02-25Z" description="">
<TimeInterval tini="T00:00Z" tfin="T01:00Z">
Expand Down Expand Up @@ -192,7 +192,7 @@
</DayOfWeek>
</Period>
</BasicDays>
</NTCvalues>
</NTCvaluesImport>
<SplittingFactors>
<SpecialDays>
<Day day="2021-02-25Z" description="">
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/com/rte_france/trm_algorithm/TestCase12Nodes/NTC_reductions_CSE.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<ReceiverRole v="A36" />
<CreationDateTime v="2021-06-23T15:14:59Z" />
<Domain v="10YDOM-1001A061T" codingScheme="A01" />
<NTCreductions>
<NTCreductionsImport>
<Period description="NTC 2021-02-24T22:00Z/2021-02-24T23:00Z" dtini="2021-02-24T22:00Z" dtfin="2021-02-24T23:00Z">
<DayOfWeek description="Everyday" daynum="0">
<TimeInterval tini="T22:00Z" tfin="T23:00Z">
Expand Down Expand Up @@ -251,7 +251,7 @@
</TimeInterval>
</DayOfWeek>
</Period>
</NTCreductions>
</NTCreductionsImport>
<SplittingFactors>
<Period description="SplittingFactor 2021-02-24T22:00Z/2021-02-24T23:00Z" dtini="2021-02-24T22:00Z" dtfin="2021-02-24T23:00Z">
<DayOfWeek description="Everyday" daynum="0">
Expand Down