Skip to content

Commit f883a9e

Browse files
cphilividaldid-rte
cphili
authored and
vidaldid-rte
committed
ConnectedComponentMode -> using ComponentMode
Signed-off-by: Clement Philipot <[email protected]>
1 parent 3000ed3 commit f883a9e

12 files changed

+31
-31
lines changed

‎src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1995,7 +1995,7 @@ static LfNetworkParameters getNetworkParameters(LoadFlowParameters parameters, O
19951995
.setPlausibleActivePowerLimit(parametersExt.getPlausibleActivePowerLimit())
19961996
.setUseActiveLimits(parametersExt.isUseActiveLimits())
19971997
.setDisableVoltageControlOfGeneratorsOutsideActivePowerLimits(parametersExt.isDisableVoltageControlOfGeneratorsOutsideActivePowerLimits())
1998-
.setComputeMainConnectedComponentOnly(parameters.getComponentMode() == LoadFlowParameters.ComponentMode.MAIN_SYNCHRONOUS)
1998+
.setComputeMainConnectedComponentOnly(parameters.getComponentMode() == LoadFlowParameters.ComponentMode.MAIN_CONNECTED)
19991999
.setCountriesToBalance(parameters.getCountriesToBalance())
20002000
.setDistributedOnConformLoad((parameters.isDistributedSlack() || parametersExt.isAreaInterchangeControl()) && parameters.getBalanceType() == LoadFlowParameters.BalanceType.PROPORTIONAL_TO_CONFORM_LOAD)
20012001
.setPhaseControl(parameters.isPhaseShifterRegulationOn())
@@ -2121,7 +2121,7 @@ public static DcLoadFlowParameters createDcParameters(LoadFlowParameters paramet
21212121
.setPlausibleActivePowerLimit(parametersExt.getPlausibleActivePowerLimit())
21222122
.setUseActiveLimits(parametersExt.isUseActiveLimits())
21232123
.setDisableVoltageControlOfGeneratorsOutsideActivePowerLimits(parametersExt.isDisableVoltageControlOfGeneratorsOutsideActivePowerLimits())
2124-
.setComputeMainConnectedComponentOnly(parameters.getComponentMode() == LoadFlowParameters.ComponentMode.MAIN_SYNCHRONOUS)
2124+
.setComputeMainConnectedComponentOnly(parameters.getComponentMode() == LoadFlowParameters.ComponentMode.MAIN_CONNECTED)
21252125
.setCountriesToBalance(parameters.getCountriesToBalance())
21262126
.setDistributedOnConformLoad((parameters.isDistributedSlack() || parametersExt.isAreaInterchangeControl()) && parameters.getBalanceType() == LoadFlowParameters.BalanceType.PROPORTIONAL_TO_CONFORM_LOAD)
21272127
.setPhaseControl(parameters.isPhaseShifterRegulationOn())

‎src/main/java/com/powsybl/openloadflow/sa/AbstractSecurityAnalysis.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ SecurityAnalysisResult runSimulationsOnAllComponents(LfNetworkList networks, Lis
317317
List<Action> actions, List<LimitReduction> limitReductions,
318318
LoadFlowParameters lfParameters) {
319319

320-
List<LfNetwork> networkToSimulate = new ArrayList<>(getNetworksToSimulate(networks, lfParameters.getConnectedComponentMode()));
320+
List<LfNetwork> networkToSimulate = new ArrayList<>(getNetworksToSimulate(networks, lfParameters.getComponentMode()));
321321
OpenSecurityAnalysisParameters openSecurityAnalysisParameters = OpenSecurityAnalysisParameters.getOrDefault(securityAnalysisParameters);
322322
ContingencyActivePowerLossDistribution contingencyActivePowerLossDistribution = ContingencyActivePowerLossDistribution.find(openSecurityAnalysisParameters.getContingencyActivePowerLossDistribution());
323323

@@ -365,12 +365,12 @@ SecurityAnalysisResult runSimulationsOnAllComponents(LfNetworkList networks, Lis
365365
return new SecurityAnalysisResult(mergedPrecontingencyResult, postContingencyResults, operatorStrategyResults);
366366
}
367367

368-
static List<LfNetwork> getNetworksToSimulate(LfNetworkList networks, LoadFlowParameters.ConnectedComponentMode mode) {
368+
static List<LfNetwork> getNetworksToSimulate(LfNetworkList networks, LoadFlowParameters.ComponentMode mode) {
369369

370-
if (LoadFlowParameters.ConnectedComponentMode.MAIN.equals(mode)) {
370+
if (LoadFlowParameters.ComponentMode.MAIN_CONNECTED.equals(mode)) {
371371
return networks.getList().stream()
372372
.filter(n -> n.getNumCC() == ComponentConstants.MAIN_NUM && n.getValidity().equals(LfNetwork.Validity.VALID)).toList();
373-
} else if (LoadFlowParameters.ConnectedComponentMode.ALL.equals(mode)) {
373+
} else if (LoadFlowParameters.ComponentMode.ALL_CONNECTED.equals(mode)) {
374374
return networks.getList().stream()
375375
.filter(n -> n.getValidity().equals(LfNetwork.Validity.VALID)).toList();
376376
} else {

‎src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowEurostagTutorialExample1Test.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ void testSeveralShunts() {
352352

353353
LoadFlow.Runner loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory()));
354354
LoadFlowParameters parameters = new LoadFlowParameters();
355-
parameters.setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL)
355+
parameters.setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED)
356356
.setVoltageInitMode(LoadFlowParameters.VoltageInitMode.DC_VALUES);
357357
LoadFlowResult result = loadFlowRunner.run(network, parameters);
358358

@@ -387,7 +387,7 @@ void testSeveralShunts2() {
387387

388388
LoadFlow.Runner loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory()));
389389
LoadFlowParameters parameters = new LoadFlowParameters();
390-
parameters.setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL)
390+
parameters.setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED)
391391
.setVoltageInitMode(LoadFlowParameters.VoltageInitMode.DC_VALUES);
392392
LoadFlowResult result = loadFlowRunner.run(network, parameters);
393393

‎src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowReportTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ void testMultipleComponents() throws IOException {
125125
// CC2 SC2 has no generator connected. Ignored in for DC and AC.
126126
network.getGenerator("g10").disconnect();
127127

128-
var lfParameters = new LoadFlowParameters().setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL);
128+
var lfParameters = new LoadFlowParameters().setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED);
129129

130130
LoadFlowProvider provider = new OpenLoadFlowProvider(new DenseMatrixFactory(), new NaiveGraphConnectivityFactory<>(LfBus::getNum));
131131
LoadFlow.Runner runner = new LoadFlow.Runner(provider);

‎src/test/java/com/powsybl/openloadflow/ac/AreaInterchangeControlTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ void areaFragmentedBuses() {
239239
Area area1 = network.getArea("a1");
240240
Area area2 = network.getArea("a2");
241241

242-
parameters.setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL);
242+
parameters.setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED);
243243
var result = loadFlowRunner.run(network, parameters);
244244

245245
var componentResult = result.getComponentResults().get(0);
@@ -256,7 +256,7 @@ void areaFragmentedBoundaries() {
256256
Area area1 = network.getArea("a1");
257257
Area area2 = network.getArea("a2");
258258

259-
parameters.setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL);
259+
parameters.setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED);
260260
var result = loadFlowRunner.run(network, parameters);
261261

262262
var componentResult = result.getComponentResults().get(0);

‎src/test/java/com/powsybl/openloadflow/ac/ReferenceBusPrioritiesTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ void setUp() {
5656
.setReadSlackBus(true)
5757
.setUseReactiveLimits(false)
5858
.setDistributedSlack(true)
59-
.setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL);
59+
.setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED);
6060
parametersExt = OpenLoadFlowParameters.create(parameters)
6161
.setReferenceBusSelectionMode(ReferenceBusSelectionMode.GENERATOR_REFERENCE_PRIORITY);
6262
}

‎src/test/java/com/powsybl/openloadflow/dc/DcLoadFlowTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ void multiCcTest() {
289289
}
290290

291291
// bus 12 and 13 are out of main connected component
292-
parameters.setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL);
292+
parameters.setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED);
293293
loadFlowRunner.run(network, parameters);
294294

295295
// check angle is zero for the 2 slack buses

‎src/test/java/com/powsybl/openloadflow/network/LfNetworkTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ void testMultipleConnectedComponentsACAllComponents() {
158158
Network network = ConnectedComponentNetworkFactory.createTwoUnconnectedCC();
159159
LoadFlow.Runner loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory()));
160160
LoadFlowParameters parameters = new LoadFlowParameters();
161-
parameters.setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL);
161+
parameters.setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED);
162162
LoadFlowResult result = loadFlowRunner.run(network, parameters);
163163

164164
assertTrue(result.isFullyConverged());
@@ -185,7 +185,7 @@ void testMultipleConnectedComponentsDCAllComponents() {
185185
Network network = ConnectedComponentNetworkFactory.createTwoUnconnectedCC();
186186
LoadFlow.Runner loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory()));
187187
LoadFlowParameters parameters = new LoadFlowParameters();
188-
parameters.setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL)
188+
parameters.setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED)
189189
.setVoltageInitMode(LoadFlowParameters.VoltageInitMode.DC_VALUES);
190190
parameters.setDc(true);
191191
LoadFlowResult result = loadFlowRunner.run(network, parameters);

‎src/test/java/com/powsybl/openloadflow/sa/OpenSecurityAnalysisTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3792,7 +3792,7 @@ void multiComponentSaTest(int threadCount) throws IOException {
37923792
OpenSecurityAnalysisParameters securityAnalysisParametersExt = new OpenSecurityAnalysisParameters()
37933793
.setThreadCount(threadCount);
37943794
securityAnalysisParameters.addExtension(OpenSecurityAnalysisParameters.class, securityAnalysisParametersExt);
3795-
securityAnalysisParameters.getLoadFlowParameters().setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL);
3795+
securityAnalysisParameters.getLoadFlowParameters().setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED);
37963796

37973797
List<Contingency> checkedContingencies = List.of(new Contingency("l13", new BranchContingency("l13")),
37983798
new Contingency("dummyLoad", new LoadContingency("dummyLoad")));
@@ -3892,7 +3892,7 @@ void multiComponentSaTestContingencyBothComponentsAndOperatorStrategy(int thread
38923892
OpenSecurityAnalysisParameters securityAnalysisParametersExt = new OpenSecurityAnalysisParameters()
38933893
.setThreadCount(threadCount);
38943894
securityAnalysisParameters.addExtension(OpenSecurityAnalysisParameters.class, securityAnalysisParametersExt);
3895-
securityAnalysisParameters.getLoadFlowParameters().setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL);
3895+
securityAnalysisParameters.getLoadFlowParameters().setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED);
38963896

38973897
// This contingency should impact both components
38983898
List<Contingency> checkedContingencies = List.of(new Contingency("compositeContingency", List.of(new BranchContingency("l13"), new LoadContingency("dummyLoad"))));
@@ -3988,7 +3988,7 @@ void multipleComponentTerminalActionReconnect() {
39883988
.add();
39893989

39903990
SecurityAnalysisParameters securityAnalysisParameters = new SecurityAnalysisParameters();
3991-
securityAnalysisParameters.getLoadFlowParameters().setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL);
3991+
securityAnalysisParameters.getLoadFlowParameters().setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED);
39923992

39933993
// Dummy contingency
39943994
List<Contingency> contingencies = List.of(new Contingency("contingencyLoad", List.of(new LoadContingency("dummyLoad"))));
@@ -4160,14 +4160,14 @@ void testComponentSelectionOneCCtwoSC() {
41604160
assertEquals(1, networks.getList().get(1).getNumSC());
41614161

41624162
// Main connected component mode and all connected component mode should yield same result
4163-
List<LfNetwork> componentMain = AbstractSecurityAnalysis.getNetworksToSimulate(networks, LoadFlowParameters.ConnectedComponentMode.MAIN);
4163+
List<LfNetwork> componentMain = AbstractSecurityAnalysis.getNetworksToSimulate(networks, LoadFlowParameters.ComponentMode.MAIN_CONNECTED);
41644164
assertEquals(2, componentMain.size());
41654165
assertEquals(0, componentMain.get(0).getNumCC());
41664166
assertEquals(0, componentMain.get(0).getNumSC());
41674167
assertEquals(0, componentMain.get(1).getNumCC());
41684168
assertEquals(1, componentMain.get(1).getNumSC());
41694169

4170-
List<LfNetwork> componentAll = AbstractSecurityAnalysis.getNetworksToSimulate(networks, LoadFlowParameters.ConnectedComponentMode.ALL);
4170+
List<LfNetwork> componentAll = AbstractSecurityAnalysis.getNetworksToSimulate(networks, LoadFlowParameters.ComponentMode.ALL_CONNECTED);
41714171
assertEquals(2, componentAll.size());
41724172
assertEquals(0, componentAll.get(0).getNumCC());
41734173
assertEquals(0, componentAll.get(0).getNumSC());
@@ -4187,13 +4187,13 @@ void testComponentSelectionTwoCC() {
41874187
assertEquals(1, networks.getList().get(1).getNumSC());
41884188

41894189
// Main connected component mode should only select component associated to main CC
4190-
List<LfNetwork> componentMain = AbstractSecurityAnalysis.getNetworksToSimulate(networks, LoadFlowParameters.ConnectedComponentMode.MAIN);
4190+
List<LfNetwork> componentMain = AbstractSecurityAnalysis.getNetworksToSimulate(networks, LoadFlowParameters.ComponentMode.MAIN_CONNECTED);
41914191
assertEquals(1, componentMain.size());
41924192
assertEquals(0, componentMain.get(0).getNumCC());
41934193
assertEquals(0, componentMain.get(0).getNumSC());
41944194

41954195
// All connected component mode should select all component
4196-
List<LfNetwork> componentAll = AbstractSecurityAnalysis.getNetworksToSimulate(networks, LoadFlowParameters.ConnectedComponentMode.ALL);
4196+
List<LfNetwork> componentAll = AbstractSecurityAnalysis.getNetworksToSimulate(networks, LoadFlowParameters.ComponentMode.ALL_CONNECTED);
41974197
assertEquals(2, componentAll.size());
41984198
assertEquals(0, componentAll.get(0).getNumCC());
41994199
assertEquals(0, componentAll.get(0).getNumSC());
@@ -4212,8 +4212,8 @@ void testNoCc0Sc0() {
42124212
assertEquals("CC0 SC4", compByBus.get("b04"));
42134213
assertEquals("CC1 SC0", compByBus.get("b11"));
42144214
assertEquals("CC1 SC0", compByBus.get("b12"));
4215-
LoadFlowParameters lfParametersAll = new LoadFlowParameters().setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL);
4216-
LoadFlowParameters lfParametersMain = new LoadFlowParameters().setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.MAIN);
4215+
LoadFlowParameters lfParametersAll = new LoadFlowParameters().setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED);
4216+
LoadFlowParameters lfParametersMain = new LoadFlowParameters().setComponentMode(LoadFlowParameters.ComponentMode.MAIN_CONNECTED);
42174217
var lfResultAll = LoadFlow.run(network, lfParametersAll);
42184218
assertTrue(lfResultAll.isFullyConverged());
42194219
var lfResultMain = LoadFlow.run(network, lfParametersMain);

‎src/test/java/com/powsybl/openloadflow/sa/OpenSecurityAnalysisWithActionsTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1513,7 +1513,7 @@ void testVSCConnectivityWithSwitch() {
15131513
Network network = HvdcNetworkFactory.createHvdcAndSwitch(HvdcConverterStation.HvdcType.VSC);
15141514

15151515
LoadFlowParameters parameters = new LoadFlowParameters();
1516-
parameters.setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL);
1516+
parameters.setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED);
15171517

15181518
// Disconect l12 - the HVDC line should still transfer power in N
15191519
network.getLine("l12").getTerminal1().disconnect();
@@ -1748,7 +1748,7 @@ void testTerminalsConnectionActionWithTwoScs() {
17481748

17491749
LoadFlowParameters parameters = new LoadFlowParameters();
17501750
parameters.setDistributedSlack(true);
1751-
parameters.setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL);
1751+
parameters.setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED);
17521752
SecurityAnalysisParameters securityAnalysisParameters = new SecurityAnalysisParameters();
17531753
securityAnalysisParameters.setLoadFlowParameters(parameters);
17541754
SecurityAnalysisResult resultAc = runSecurityAnalysis(network, contingencies, monitors, securityAnalysisParameters,
@@ -1886,7 +1886,7 @@ void testContingencyParameters(boolean isDc, ContingencyLoadFlowParameters.Scope
18861886

18871887
// run the security analysis
18881888
LoadFlowParameters parameters = new LoadFlowParameters().setDc(isDc);
1889-
parameters.setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL);
1889+
parameters.setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED);
18901890
SecurityAnalysisParameters securityAnalysisParameters = new SecurityAnalysisParameters();
18911891
securityAnalysisParameters.setLoadFlowParameters(parameters);
18921892
SecurityAnalysisResult resultAc = runSecurityAnalysis(network, contingencies, monitors, securityAnalysisParameters,

0 commit comments

Comments
 (0)