Skip to content

Commit 2c13994

Browse files
terriervikterriervik
committed
Upgrade dependencies
Signed-off-by: Viktor Terrier <viktor.terrier@rte-france.com>
1 parent 025ad90 commit 2c13994

10 files changed

Lines changed: 39 additions & 34 deletions

File tree

‎pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@
5050
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
5151
<maven.checkstyle.version>3.3.1</maven.checkstyle.version>
5252
<maven.jacoco.version>0.8.10</maven.jacoco.version>
53-
<powsybl.entsoe.version>2.14.0</powsybl.entsoe.version>
54-
<powsybl.openloadflow.version>1.16.0</powsybl.openloadflow.version>
55-
<powsybl.rao.version>6.6.0</powsybl.rao.version>
56-
<powsybl.version>6.8.0</powsybl.version>
53+
<powsybl.entsoe.version>3.0.1</powsybl.entsoe.version>
54+
<powsybl.openloadflow.version>2.0.0</powsybl.openloadflow.version>
55+
<powsybl.rao.version>7.0.0</powsybl.rao.version>
56+
<powsybl.version>7.0.1</powsybl.version>
5757
<slf4j.version>2.0.13</slf4j.version>
5858
</properties>
5959

‎src/main/java/com/rte_france/trm_algorithm/operational_conditions_aligners/exchange_and_net_position/ExchangeAndNetPosition.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@
77
*/
88
package com.rte_france.trm_algorithm.operational_conditions_aligners.exchange_and_net_position;
99

10-
import com.powsybl.balances_adjustment.util.CountryArea;
10+
import com.powsybl.balances_adjustment.util.BorderBasedCountryArea;
1111
import com.powsybl.balances_adjustment.util.CountryAreaFactory;
1212
import com.powsybl.iidm.network.Country;
1313
import com.powsybl.iidm.network.Network;
1414

1515
import java.util.Collections;
16+
import java.util.List;
1617
import java.util.Map;
1718
import java.util.Set;
1819
import java.util.function.Function;
@@ -40,11 +41,11 @@ private static Map<Country, Double> computeNetPositions(Network network) {
4041
country -> new CountryAreaFactory(country).create(network).getNetPosition()));
4142
}
4243

43-
private static Map<Country, CountryArea> createCountryAreas(Network network) {
44-
return network.getCountries().stream().collect(Collectors.toMap(Function.identity(), country -> new CountryAreaFactory(country).create(network)));
44+
private static Map<Country, BorderBasedCountryArea> createCountryAreas(Network network) {
45+
return network.getCountries().stream().collect(Collectors.toMap(Function.identity(), country -> new BorderBasedCountryArea(network, List.of(country))));
4546
}
4647

47-
private static Map<Country, Map<Country, Double>> computeExchanges(Map<Country, CountryArea> countryAreaMap) {
48+
private static Map<Country, Map<Country, Double>> computeExchanges(Map<Country, BorderBasedCountryArea> countryAreaMap) {
4849
Set<Country> countries = countryAreaMap.keySet();
4950
return countries.stream()
5051
.collect(Collectors.toMap(
@@ -53,7 +54,7 @@ private static Map<Country, Map<Country, Double>> computeExchanges(Map<Country,
5354
));
5455
}
5556

56-
private static Map<Country, Double> computeExchangesOfCountrySource(Country countrySource, Set<Country> countries, Map<Country, CountryArea> countryAreaMap) {
57+
private static Map<Country, Double> computeExchangesOfCountrySource(Country countrySource, Set<Country> countries, Map<Country, BorderBasedCountryArea> countryAreaMap) {
5758
return countries.stream()
5859
.filter(countrySink -> countrySource != countrySink)
5960
.collect(Collectors.toMap(
@@ -62,7 +63,7 @@ private static Map<Country, Double> computeExchangesOfCountrySource(Country coun
6263
));
6364
}
6465

65-
private static double getLeavingFlowToCountry(Country countrySource, Country countrySink, Map<Country, CountryArea> countryAreaMap) {
66+
private static double getLeavingFlowToCountry(Country countrySource, Country countrySink, Map<Country, BorderBasedCountryArea> countryAreaMap) {
6667
return countryAreaMap.get(countrySource).getLeavingFlowToCountry(countryAreaMap.get(countrySink));
6768
}
6869

‎src/test/java/com/rte_france/trm_algorithm/FlowExtractorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class FlowExtractorTest {
2727
void testExtractFlowTwoBranches() {
2828
Network network = TestUtils.importNetwork("simple_networks/NETWORK_SINGLE_LOAD_TWO_GENERATORS_WITH_COUNTRIES.uct");
2929

30-
LoadFlowParameters loadFlowParameters = new LoadFlowParameters();
30+
LoadFlowParameters loadFlowParameters = LoadFlowParameters.load();
3131
FlowExtractor flowExtractor = new FlowExtractor(loadFlowParameters);
3232

3333
List<String> branchIds = List.of("FGEN1 11 BLOAD 11 1", "BLOAD 11 BGEN2 11 1");
@@ -40,7 +40,7 @@ void testExtractFlowTwoBranches() {
4040
void forceAcLoadFlow() {
4141
Network network = TestUtils.importNetwork("simple_networks/NETWORK_SINGLE_LOAD_TWO_GENERATORS_WITH_COUNTRIES.uct");
4242

43-
LoadFlowParameters loadFlowParameters = new LoadFlowParameters()
43+
LoadFlowParameters loadFlowParameters = LoadFlowParameters.load()
4444
.setDc(true);
4545
FlowExtractor flowExtractor = new FlowExtractor(loadFlowParameters);
4646

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ class TrmAlgorithmTest {
4444
private static final double EPSILON = 1e-3;
4545

4646
TrmAlgorithm setUp(Crac crac, ZonalData<Scalable> marketZonalScalable) {
47-
LoadFlowParameters loadFlowParameters = new LoadFlowParameters();
48-
BalanceComputationParameters balanceComputationParameters = new BalanceComputationParameters();
47+
LoadFlowParameters loadFlowParameters = LoadFlowParameters.load();
48+
BalanceComputationParameters balanceComputationParameters = BalanceComputationParameters.load();
4949
LoadFlow.Runner loadFlowRunner = LoadFlow.find();
5050
ComputationManager computationManager = LocalComputationManager.getDefault();
5151

‎src/test/java/com/rte_france/trm_algorithm/ZonalSensitivityComputerTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ void testSimpleNetwork() {
3737
List<String> branchIds = List.of("FFR2AA1 DDE3AA1 1", "FFR1AA1 FFR2AA1 1");
3838
CseGlskDocument cseGlskDocument = CseGlskDocument.importGlsk(getClass().getResourceAsStream("TestCase16Nodes/glsk_proportional_16nodes.xml"), false, true);
3939
ZonalData<SensitivityVariableSet> zonalGlsks = cseGlskDocument.getZonalGlsks(network);
40-
ZonalSensitivityComputer zonalSensitivityComputer = new ZonalSensitivityComputer(new LoadFlowParameters());
40+
ZonalSensitivityComputer zonalSensitivityComputer = new ZonalSensitivityComputer(LoadFlowParameters.load());
4141
Map<String, ZonalPtdfAndFlow> ptdf = zonalSensitivityComputer.run(network, branchIds, zonalGlsks);
4242
assertEquals(2, ptdf.size());
4343
assertEquals(0.315, ptdf.get("FFR2AA1 DDE3AA1 1").getZonalPtdf(), EPSILON);
@@ -55,7 +55,7 @@ void testSimpleNetworkWithCountryFiltering() {
5555
List<String> branchIds = List.of("FFR2AA1 DDE3AA1 1", "FFR1AA1 FFR2AA1 1");
5656
CseGlskDocument cseGlskDocument = CseGlskDocument.importGlsk(getClass().getResourceAsStream("TestCase16Nodes/glsk_proportional_16nodes.xml"), false, true);
5757
ZonalData<SensitivityVariableSet> zonalGlsks = cseGlskDocument.getZonalGlsks(network);
58-
ZonalSensitivityComputer zonalSensitivityComputer = new ZonalSensitivityComputer(new LoadFlowParameters(), countries);
58+
ZonalSensitivityComputer zonalSensitivityComputer = new ZonalSensitivityComputer(LoadFlowParameters.load(), countries);
5959
Map<String, ZonalPtdfAndFlow> ptdf = zonalSensitivityComputer.run(network, branchIds, zonalGlsks);
6060
assertEquals(2, ptdf.size());
6161
assertEquals(0.173, ptdf.get("FFR2AA1 DDE3AA1 1").getZonalPtdf(), EPSILON);
@@ -71,7 +71,7 @@ void testSimpleNetworkWithoutBranch() {
7171
List<String> branchIds = Collections.emptyList();
7272
CseGlskDocument cseGlskDocument = CseGlskDocument.importGlsk(getClass().getResourceAsStream("TestCase16Nodes/glsk_proportional_16nodes.xml"), false, true);
7373
ZonalData<SensitivityVariableSet> zonalGlsks = cseGlskDocument.getZonalGlsks(network);
74-
ZonalSensitivityComputer zonalSensitivityComputer = new ZonalSensitivityComputer(new LoadFlowParameters());
74+
ZonalSensitivityComputer zonalSensitivityComputer = new ZonalSensitivityComputer(LoadFlowParameters.load());
7575
Map<String, ZonalPtdfAndFlow> ptdf = zonalSensitivityComputer.run(network, branchIds, zonalGlsks);
7676
assertTrue(ptdf.isEmpty());
7777
}
@@ -83,7 +83,7 @@ void testForceAcSensitivityAnalysis() {
8383
CseGlskDocument cseGlskDocument = CseGlskDocument.importGlsk(getClass().getResourceAsStream("TestCase16Nodes/glsk_proportional_16nodes.xml"), false, true);
8484
ZonalData<SensitivityVariableSet> zonalGlsks = cseGlskDocument.getZonalGlsks(network);
8585

86-
LoadFlowParameters loadFlowParameters = new LoadFlowParameters().setDc(true);
86+
LoadFlowParameters loadFlowParameters = LoadFlowParameters.load().setDc(true);
8787

8888
ZonalSensitivityComputer zonalSensitivityComputer = new ZonalSensitivityComputer(loadFlowParameters);
8989
Map<String, ZonalPtdfAndFlow> ptdf = zonalSensitivityComputer.run(network, branchIds, zonalGlsks);
@@ -97,7 +97,7 @@ void testAcDivergence() {
9797
Network network = TestUtils.importNetwork("simple_networks/NETWORK_LOOP_FLOW_WITH_COUNTRIES.uct");
9898
List<String> branchIds = List.of("EGEN 11 FGEN 11 1");
9999
ZonalData<SensitivityVariableSet> zonalGlsks = TrmUtils.getAutoGlsk(network);
100-
ZonalSensitivityComputer zonalSensitivityComputer = new ZonalSensitivityComputer(new LoadFlowParameters());
100+
ZonalSensitivityComputer zonalSensitivityComputer = new ZonalSensitivityComputer(LoadFlowParameters.load());
101101
assertThrows(Exception.class, () -> zonalSensitivityComputer.run(network, branchIds, zonalGlsks));
102102
}
103103
}

‎src/test/java/com/rte_france/trm_algorithm/operational_conditions_aligners/ExchangeAlignerTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ void testDoNotAlignWithoutScalableData() {
5454
Load load2 = referenceNetwork.getLoad("PT_L1_1 _load");
5555
load2.setP0(load2.getP0() - 1000);
5656
ZonalData<Scalable> marketZonalScalable = new ZonalDataImpl<>(Collections.emptyMap());
57-
ExchangeAligner exchangeAligner = new ExchangeAligner(new BalanceComputationParameters(), LoadFlow.find(), LocalComputationManager.getDefault(), marketZonalScalable);
57+
ExchangeAligner exchangeAligner = new ExchangeAligner(BalanceComputationParameters.load(), LoadFlow.find(), LocalComputationManager.getDefault(), marketZonalScalable);
5858
TrmException trmException = assertThrows(TrmException.class, () -> exchangeAligner.align(referenceNetwork, marketBasedNetwork));
5959
assertEquals("Scalable not found: 10YFR-RTE------C", trmException.getMessage());
6060
}
@@ -75,7 +75,7 @@ void testAlignmentFail() {
7575
));
7676

7777
ZonalData<Scalable> marketZonalScalable = new ZonalDataImpl<>(scalableZonalData);
78-
ExchangeAligner exchangeAligner = new ExchangeAligner(new BalanceComputationParameters(), LoadFlow.find(), LocalComputationManager.getDefault(), marketZonalScalable);
78+
ExchangeAligner exchangeAligner = new ExchangeAligner(BalanceComputationParameters.load(), LoadFlow.find(), LocalComputationManager.getDefault(), marketZonalScalable);
7979
exchangeAligner.align(referenceNetwork, marketBasedNetwork);
8080
ExchangeAlignerResult result = exchangeAligner.getResult();
8181
assertEquals(NOT_ALIGNED, result.getStatus());
@@ -96,7 +96,7 @@ void testDoNotAlignWithSameNetPositions() {
9696
Network referenceNetwork = TestUtils.importNetwork("operational_conditions_aligners/shift/TestCase_with_transformers.xiidm");
9797
Network marketBasedNetwork = TestUtils.importNetwork("operational_conditions_aligners/shift/TestCase_with_transformers.xiidm");
9898
ZonalData<Scalable> marketZonalScalable = new ZonalDataImpl<>(Collections.emptyMap());
99-
ExchangeAligner exchangeAligner = new ExchangeAligner(new BalanceComputationParameters(), LoadFlow.find(), LocalComputationManager.getDefault(), marketZonalScalable);
99+
ExchangeAligner exchangeAligner = new ExchangeAligner(BalanceComputationParameters.load(), LoadFlow.find(), LocalComputationManager.getDefault(), marketZonalScalable);
100100
exchangeAligner.align(referenceNetwork, marketBasedNetwork);
101101
ExchangeAlignerResult result = exchangeAligner.getResult();
102102
assertEquals(ALREADY_ALIGNED, result.getStatus());
@@ -128,7 +128,7 @@ void testWithSwe() {
128128
LoadFlow.Runner loadFlowRunner = LoadFlow.find();
129129
ComputationManager computationManager = LocalComputationManager.getDefault();
130130
BalanceComputation balanceComputation = balanceComputationFactory.create(areas, loadFlowRunner, computationManager);
131-
BalanceComputationParameters parameters = new BalanceComputationParameters().setThresholdNetPosition(1e-2);
131+
BalanceComputationParameters parameters = BalanceComputationParameters.load().setThresholdNetPosition(1e-2);
132132
BalanceComputationResult balanceComputationResult = balanceComputation.run(referenceNetwork, referenceNetwork.getVariantManager().getWorkingVariantId(), parameters).join();
133133
assertEquals(BalanceComputationResult.Status.SUCCESS, balanceComputationResult.getStatus());
134134

@@ -167,13 +167,13 @@ void testWith16Nodes() {
167167
LoadFlow.Runner loadFlowRunner = LoadFlow.find();
168168
ComputationManager computationManager = LocalComputationManager.getDefault();
169169
BalanceComputation balanceComputation = balanceComputationFactory.create(areas, loadFlowRunner, computationManager);
170-
BalanceComputationParameters parameters = new BalanceComputationParameters();
170+
BalanceComputationParameters parameters = BalanceComputationParameters.load();
171171
BalanceComputationResult balanceComputationResult = balanceComputation.run(referenceNetwork, referenceNetwork.getVariantManager().getWorkingVariantId(), parameters).join();
172172
assertEquals(BalanceComputationResult.Status.SUCCESS, balanceComputationResult.getStatus());
173173

174174
Network marketBasedNetwork = TestUtils.importNetwork("TestCase16Nodes/TestCase16Nodes.uct");
175175
ZonalData<Scalable> marketZonalScalable = TrmUtils.getAutoScalable(marketBasedNetwork);
176-
ExchangeAligner exchangeAligner = new ExchangeAligner(new BalanceComputationParameters(), LoadFlow.find(), LocalComputationManager.getDefault(), marketZonalScalable);
176+
ExchangeAligner exchangeAligner = new ExchangeAligner(BalanceComputationParameters.load(), LoadFlow.find(), LocalComputationManager.getDefault(), marketZonalScalable);
177177
exchangeAligner.align(referenceNetwork, marketBasedNetwork);
178178
ExchangeAlignerResult result = exchangeAligner.getResult();
179179
assertEquals(ALIGNED_WITH_BALANCE_ADJUSTMENT, result.getStatus());
@@ -194,7 +194,7 @@ void testSameNetwork16Nodes() {
194194
Network referenceNetwork = TestUtils.importNetwork("TestCase16Nodes/TestCase16Nodes.uct");
195195
Network marketBasedNetwork = TestUtils.importNetwork("TestCase16Nodes/TestCase16Nodes.uct");
196196
ZonalData<Scalable> marketZonalScalable = TrmUtils.getAutoScalable(marketBasedNetwork);
197-
ExchangeAligner exchangeAligner = new ExchangeAligner(new BalanceComputationParameters(), LoadFlow.find(), LocalComputationManager.getDefault(), marketZonalScalable);
197+
ExchangeAligner exchangeAligner = new ExchangeAligner(BalanceComputationParameters.load(), LoadFlow.find(), LocalComputationManager.getDefault(), marketZonalScalable);
198198
exchangeAligner.align(referenceNetwork, marketBasedNetwork);
199199
ExchangeAlignerResult result = exchangeAligner.getResult();
200200
assertEquals(ALREADY_ALIGNED, result.getStatus());
@@ -214,7 +214,7 @@ void testSmallerMarketBasedNetwork() {
214214
Network referenceNetwork = TestUtils.importNetwork("TestCase16Nodes/TestCase16Nodes.uct");
215215
Network marketBasedNetwork = TestUtils.importNetwork("operational_conditions_aligners/pst/NETWORK_PST_FLOW_WITH_COUNTRIES_NON_NEUTRAL.uct");
216216
ZonalData<Scalable> marketZonalScalable = TrmUtils.getAutoScalable(marketBasedNetwork);
217-
ExchangeAligner exchangeAligner = new ExchangeAligner(new BalanceComputationParameters(), LoadFlow.find(), LocalComputationManager.getDefault(), marketZonalScalable);
217+
ExchangeAligner exchangeAligner = new ExchangeAligner(BalanceComputationParameters.load(), LoadFlow.find(), LocalComputationManager.getDefault(), marketZonalScalable);
218218
TrmException exception = assertThrows(TrmException.class, () -> exchangeAligner.align(referenceNetwork, marketBasedNetwork));
219219
assertEquals("Market based network contains countries [BE, FR]. It does not contain all reference network countries [BE, FR, DE, NL]", exception.getMessage());
220220
}
@@ -228,7 +228,7 @@ void testSmallerReferenceNetworkAligned() {
228228
Load load2 = marketBasedNetwork.getLoad("DDE4AA1 _load");
229229
load2.setP0(load2.getP0() - 500);
230230
ZonalData<Scalable> marketZonalScalable = TrmUtils.getAutoScalable(marketBasedNetwork);
231-
ExchangeAligner exchangeAligner = new ExchangeAligner(new BalanceComputationParameters(), LoadFlow.find(), LocalComputationManager.getDefault(), marketZonalScalable);
231+
ExchangeAligner exchangeAligner = new ExchangeAligner(BalanceComputationParameters.load(), LoadFlow.find(), LocalComputationManager.getDefault(), marketZonalScalable);
232232
exchangeAligner.align(referenceNetwork, marketBasedNetwork);
233233
ExchangeAlignerResult result = exchangeAligner.getResult();
234234
assertEquals(ALIGNED_WITH_BALANCE_ADJUSTMENT, result.getStatus());
@@ -253,7 +253,7 @@ void testAligmentDoesOnlyValidForNTC() {
253253
Load load2 = marketBasedNetwork.getLoad("DDE4AA1 _load");
254254
load2.setP0(load2.getP0() - 500);
255255
ZonalData<Scalable> marketZonalScalable = TrmUtils.getAutoScalable(marketBasedNetwork);
256-
ExchangeAligner exchangeAligner = new ExchangeAligner(new BalanceComputationParameters(), LoadFlow.find(), LocalComputationManager.getDefault(), marketZonalScalable);
256+
ExchangeAligner exchangeAligner = new ExchangeAligner(BalanceComputationParameters.load(), LoadFlow.find(), LocalComputationManager.getDefault(), marketZonalScalable);
257257
exchangeAligner.align(referenceNetwork, marketBasedNetwork);
258258
ExchangeAlignerResult result = exchangeAligner.getResult();
259259
assertEquals(TARGET_NET_POSITION_REACHED_BUT_EXCHANGE_NOT_ALIGNED, result.getStatus());

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class ItalyNorthExchangeAlignerTest {
3333
void testSimpleShift() {
3434
Network referenceNetwork = TestUtils.importNetwork("TestCase12Nodes/NETWORK_TEST_IN_REFERENCE.uct");
3535
Network marketBasedNetwork = TestUtils.importNetwork("TestCase12Nodes/NETWORK_TEST_IN.uct");
36-
LoadFlowParameters loadFlowParameters = new LoadFlowParameters();
36+
LoadFlowParameters loadFlowParameters = LoadFlowParameters.load();
3737

3838
Map<String, Double> reducedSplittingFactors = ImmutableMap.of(
3939
new CountryEICode(FR).getCode(), 0.4,
@@ -61,7 +61,7 @@ void testSimpleShift() {
6161
void testAlreadyAligned() {
6262
Network referenceNetwork = TestUtils.importNetwork("TestCase12Nodes/NETWORK_TEST_IN_REFERENCE.uct");
6363
Network marketBasedNetwork = TestUtils.importNetwork("TestCase12Nodes/NETWORK_TEST_IN.uct");
64-
LoadFlowParameters loadFlowParameters = new LoadFlowParameters();
64+
LoadFlowParameters loadFlowParameters = LoadFlowParameters.load();
6565

6666
Map<String, Double> reducedSplittingFactors = ImmutableMap.of(
6767
new CountryEICode(AT).getCode(), 0.3,
@@ -85,7 +85,7 @@ void testAlreadyAligned() {
8585
void testShiftWithImportedSplittingFactors() {
8686
Network referenceNetwork = TestUtils.importNetwork("TestCase12Nodes/NETWORK_TEST_IN_REFERENCE.uct");
8787
Network marketBasedNetwork = TestUtils.importNetwork("TestCase12Nodes/NETWORK_TEST_IN.uct");
88-
LoadFlowParameters loadFlowParameters = new LoadFlowParameters();
88+
LoadFlowParameters loadFlowParameters = LoadFlowParameters.load();
8989

9090
InputStream yearlyData = ItalyNorthExchangeAlignerTest.class.getResourceAsStream("../TestCase12Nodes/NTC_annual_CSE_simplified_without_special_lines.xml");
9191
InputStream dailyData = ItalyNorthExchangeAlignerTest.class.getResourceAsStream("../TestCase12Nodes/NTC_reductions_CSE.xml");

0 commit comments

Comments
 (0)