From 4a9488f9f73382032da72f4281293d80f8614909 Mon Sep 17 00:00:00 2001 From: Olivier Perrin Date: Tue, 18 Nov 2025 11:26:03 +0100 Subject: [PATCH 1/6] Bump IIDM version to 1.15 in unit test files Signed-off-by: Olivier Perrin --- src/test/resources/debug-network.xiidm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/resources/debug-network.xiidm b/src/test/resources/debug-network.xiidm index 2e82f77ad6..066c80eb3d 100644 --- a/src/test/resources/debug-network.xiidm +++ b/src/test/resources/debug-network.xiidm @@ -1,5 +1,5 @@ - + From 5a8a649afaf1412a673d7c94f6320cb31c39f1bc Mon Sep 17 00:00:00 2001 From: Didier Vidal Date: Tue, 18 Nov 2025 15:48:52 +0100 Subject: [PATCH 2/6] bump powsybl-core to 7.1.0-SNAPSHOT Signed-off-by: Didier Vidal --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7ae2cb6e9e..1e5bebc0fe 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ 1.6.3 0.3.2 - 7.0.1 + 7.1.0-SNAPSHOT From 6777681eb796a7c59493f0dfa685de3c8dbf7b71 Mon Sep 17 00:00:00 2001 From: Didier Vidal Date: Wed, 26 Nov 2025 09:42:52 +0100 Subject: [PATCH 3/6] Fix public API modfication Signed-off-by: Didier Vidal --- .../openloadflow/sensi/OpenSensitivityAnalysisProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/powsybl/openloadflow/sensi/OpenSensitivityAnalysisProvider.java b/src/main/java/com/powsybl/openloadflow/sensi/OpenSensitivityAnalysisProvider.java index e0a4e1ec6f..3d936f096d 100644 --- a/src/main/java/com/powsybl/openloadflow/sensi/OpenSensitivityAnalysisProvider.java +++ b/src/main/java/com/powsybl/openloadflow/sensi/OpenSensitivityAnalysisProvider.java @@ -18,8 +18,8 @@ import com.powsybl.computation.CompletableFutureTask; import com.powsybl.computation.ComputationManager; import com.powsybl.contingency.Contingency; -import com.powsybl.contingency.contingency.list.ContingencyList; -import com.powsybl.contingency.contingency.list.DefaultContingencyList; +import com.powsybl.contingency.list.ContingencyList; +import com.powsybl.contingency.list.DefaultContingencyList; import com.powsybl.contingency.json.ContingencyJsonModule; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.VariantManagerConstants; From 4ae5029e783b5d8489c28710b5ff5151464ea2f6 Mon Sep 17 00:00:00 2001 From: vidaldid-rte Date: Wed, 26 Nov 2025 10:04:06 +0100 Subject: [PATCH 4/6] update LoadFlowProviderAPI (#1299) Signed-off-by: Didier Vidal --- .../java/com/powsybl/openloadflow/OpenLoadFlowProvider.java | 2 +- .../com/powsybl/openloadflow/OpenLoadFlowParametersTest.java | 4 ++-- .../com/powsybl/openloadflow/OpenLoadFlowProviderTest.java | 4 +++- .../powsybl/openloadflow/ac/solver/AcSolverFactoryTest.java | 2 +- .../sa/extensions/OpenSecurityAnalysisExtensionsTest.java | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/powsybl/openloadflow/OpenLoadFlowProvider.java b/src/main/java/com/powsybl/openloadflow/OpenLoadFlowProvider.java index da64a9b7fa..5612ec80dc 100644 --- a/src/main/java/com/powsybl/openloadflow/OpenLoadFlowProvider.java +++ b/src/main/java/com/powsybl/openloadflow/OpenLoadFlowProvider.java @@ -305,7 +305,7 @@ public Optional> loadSpecificParameters(Map getSpecificParameters() { + public List getRawSpecificParameters() { return OpenLoadFlowParameters.SPECIFIC_PARAMETERS; } diff --git a/src/test/java/com/powsybl/openloadflow/OpenLoadFlowParametersTest.java b/src/test/java/com/powsybl/openloadflow/OpenLoadFlowParametersTest.java index 544d302c7d..1269fcbd3c 100644 --- a/src/test/java/com/powsybl/openloadflow/OpenLoadFlowParametersTest.java +++ b/src/test/java/com/powsybl/openloadflow/OpenLoadFlowParametersTest.java @@ -391,7 +391,7 @@ void testCompareParameters() { @Test void testEqualsCloneAndUpdate() { OpenLoadFlowProvider provider = new OpenLoadFlowProvider(); - provider.getSpecificParameters().forEach(sp -> { + provider.getRawSpecificParameters().forEach(sp -> { var p1 = new LoadFlowParameters(); var p2 = new LoadFlowParameters(); var pe1 = OpenLoadFlowParameters.create(p1); @@ -459,7 +459,7 @@ void testEqualsCloneAndUpdate() { void testSerializationRoundTrip() { Set nullableParams = Set.of("debugDir", "outerLoopNames"); OpenLoadFlowProvider provider = new OpenLoadFlowProvider(); - provider.getSpecificParameters().forEach(sp -> { + provider.getRawSpecificParameters().forEach(sp -> { LoadFlowParameters p1 = new LoadFlowParameters(); OpenLoadFlowParameters e1 = OpenLoadFlowParameters.create(p1); List vals; diff --git a/src/test/java/com/powsybl/openloadflow/OpenLoadFlowProviderTest.java b/src/test/java/com/powsybl/openloadflow/OpenLoadFlowProviderTest.java index e414097189..f1d04f19fd 100644 --- a/src/test/java/com/powsybl/openloadflow/OpenLoadFlowProviderTest.java +++ b/src/test/java/com/powsybl/openloadflow/OpenLoadFlowProviderTest.java @@ -87,7 +87,9 @@ void testGetExtendedVoltageInitializer() { @Test void specificParametersTest() { OpenLoadFlowProvider provider = new OpenLoadFlowProvider(); + assertEquals(80, provider.getSpecificParameters().size()); + LoadFlowParameters parameters = new LoadFlowParameters(); provider.loadSpecificParameters(Collections.emptyMap()) @@ -114,7 +116,7 @@ void testCreateMapFromSpecificParameters() { long nullValueCOunt = parametersExt.toMap().values().stream().filter(Objects::isNull).count(); assertEquals(80, map.size() + nullValueCOunt); assertEquals(2, nullValueCOunt); // debugDir and outerLoopNames are nullable - assertEquals(provider.getSpecificParameters().size(), map.size() + nullValueCOunt); + assertEquals(provider.getRawSpecificParameters().size(), map.size() + nullValueCOunt); } @Test diff --git a/src/test/java/com/powsybl/openloadflow/ac/solver/AcSolverFactoryTest.java b/src/test/java/com/powsybl/openloadflow/ac/solver/AcSolverFactoryTest.java index cc7cad2149..4dadcc5647 100644 --- a/src/test/java/com/powsybl/openloadflow/ac/solver/AcSolverFactoryTest.java +++ b/src/test/java/com/powsybl/openloadflow/ac/solver/AcSolverFactoryTest.java @@ -107,7 +107,7 @@ public AcSolver create(LfNetwork network, AcLoadFlowParameters parameters, Equat @Test void testAcSolverTypeParam() { OpenLoadFlowProvider provider = new OpenLoadFlowProvider(); - Parameter acSolverType = provider.getSpecificParameters().stream().filter(p -> p.getName().equals(OpenLoadFlowParameters.AC_SOLVER_TYPE_PARAM_NAME)).findFirst().orElseThrow(); + Parameter acSolverType = provider.getRawSpecificParameters().stream().filter(p -> p.getName().equals(OpenLoadFlowParameters.AC_SOLVER_TYPE_PARAM_NAME)).findFirst().orElseThrow(); assertEquals("NEWTON_RAPHSON", acSolverType.getDefaultValue()); assertEquals(List.of("AC_SOLVER_MOCK", "FAST_DECOUPLED", "NEWTON_KRYLOV", "NEWTON_RAPHSON"), acSolverType.getPossibleValues()); } diff --git a/src/test/java/com/powsybl/openloadflow/sa/extensions/OpenSecurityAnalysisExtensionsTest.java b/src/test/java/com/powsybl/openloadflow/sa/extensions/OpenSecurityAnalysisExtensionsTest.java index b6b943d08f..ba29658a17 100644 --- a/src/test/java/com/powsybl/openloadflow/sa/extensions/OpenSecurityAnalysisExtensionsTest.java +++ b/src/test/java/com/powsybl/openloadflow/sa/extensions/OpenSecurityAnalysisExtensionsTest.java @@ -13,7 +13,7 @@ import com.powsybl.commons.test.AbstractSerDeTest; import com.powsybl.contingency.BranchContingency; import com.powsybl.contingency.Contingency; -import com.powsybl.contingency.contingency.list.DefaultContingencyList; +import com.powsybl.contingency.list.DefaultContingencyList; import com.powsybl.contingency.json.ContingencyJsonModule; import com.powsybl.loadflow.LoadFlowParameters; import com.powsybl.openloadflow.OpenLoadFlowParameters; From fbf982cee484183761ff1def217fd3d47ac5624f Mon Sep 17 00:00:00 2001 From: Clement Philipot Date: Wed, 26 Nov 2025 15:11:10 +0100 Subject: [PATCH 5/6] Adapt OpenLoadFlow to enum change in core (connected component mode) (#1286) Signed-off-by: Clement Philipot --- .../openloadflow/OpenLoadFlowParameters.java | 10 +++++----- .../sa/AbstractSecurityAnalysis.java | 8 ++++---- ...AcLoadFlowEurostagTutorialExample1Test.java | 4 ++-- .../openloadflow/ac/AcLoadFlowReportTest.java | 2 +- .../ac/AreaInterchangeControlTest.java | 4 ++-- .../ac/ReferenceBusPrioritiesTest.java | 2 +- .../openloadflow/dc/DcLoadFlowTest.java | 2 +- .../openloadflow/network/LfNetworkTest.java | 4 ++-- .../sa/OpenSecurityAnalysisTest.java | 18 +++++++++--------- .../OpenSecurityAnalysisWithActionsTest.java | 6 +++--- src/test/resources/debug-parameters.json | 4 ++-- src/test/resources/sa-params.json | 4 ++-- 12 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java b/src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java index a16008ffb7..b3246909fa 100644 --- a/src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java +++ b/src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java @@ -380,7 +380,7 @@ public static List getAcSolverTypePossibleValues() { .put("phaseShifterRegulationOn", PHASE_CONTROL_CATEGORY_KEY) .put("voltageInitMode", VOLTAGE_INIT_CATEGORY_KEY) .put("hvdcAcEmulation", HVDC_CATEGORY_KEY) - .put("computedConnectedComponentScope", PERFORMANCE_CATEGORY_KEY) + .put("computedComponentScope", PERFORMANCE_CATEGORY_KEY) .build(); public static final List SPECIFIC_PARAMETERS = List.of( @@ -1995,7 +1995,7 @@ static LfNetworkParameters getNetworkParameters(LoadFlowParameters parameters, O .setPlausibleActivePowerLimit(parametersExt.getPlausibleActivePowerLimit()) .setUseActiveLimits(parametersExt.isUseActiveLimits()) .setDisableVoltageControlOfGeneratorsOutsideActivePowerLimits(parametersExt.isDisableVoltageControlOfGeneratorsOutsideActivePowerLimits()) - .setComputeMainConnectedComponentOnly(parameters.getConnectedComponentMode() == LoadFlowParameters.ConnectedComponentMode.MAIN) + .setComputeMainConnectedComponentOnly(parameters.getComponentMode() == LoadFlowParameters.ComponentMode.MAIN_CONNECTED) .setCountriesToBalance(parameters.getCountriesToBalance()) .setDistributedOnConformLoad((parameters.isDistributedSlack() || parametersExt.isAreaInterchangeControl()) && parameters.getBalanceType() == LoadFlowParameters.BalanceType.PROPORTIONAL_TO_CONFORM_LOAD) .setPhaseControl(parameters.isPhaseShifterRegulationOn()) @@ -2121,7 +2121,7 @@ public static DcLoadFlowParameters createDcParameters(LoadFlowParameters paramet .setPlausibleActivePowerLimit(parametersExt.getPlausibleActivePowerLimit()) .setUseActiveLimits(parametersExt.isUseActiveLimits()) .setDisableVoltageControlOfGeneratorsOutsideActivePowerLimits(parametersExt.isDisableVoltageControlOfGeneratorsOutsideActivePowerLimits()) - .setComputeMainConnectedComponentOnly(parameters.getConnectedComponentMode() == LoadFlowParameters.ConnectedComponentMode.MAIN) + .setComputeMainConnectedComponentOnly(parameters.getComponentMode() == LoadFlowParameters.ComponentMode.MAIN_CONNECTED) .setCountriesToBalance(parameters.getCountriesToBalance()) .setDistributedOnConformLoad((parameters.isDistributedSlack() || parametersExt.isAreaInterchangeControl()) && parameters.getBalanceType() == LoadFlowParameters.BalanceType.PROPORTIONAL_TO_CONFORM_LOAD) .setPhaseControl(parameters.isPhaseShifterRegulationOn()) @@ -2187,7 +2187,7 @@ public static boolean equals(LoadFlowParameters parameters1, LoadFlowParameters parameters1.getBalanceType() == parameters2.getBalanceType() && parameters1.isDcUseTransformerRatio() == parameters2.isDcUseTransformerRatio() && parameters1.getCountriesToBalance().equals(parameters2.getCountriesToBalance()) && - parameters1.getConnectedComponentMode() == parameters2.getConnectedComponentMode() && + parameters1.getComponentMode() == parameters2.getComponentMode() && parameters1.isHvdcAcEmulation() == parameters2.isHvdcAcEmulation() && parameters1.getDcPowerFactor() == parameters2.getDcPowerFactor(); if (!equals) { @@ -2388,7 +2388,7 @@ public static LoadFlowParameters clone(LoadFlowParameters parameters) { .setBalanceType(parameters.getBalanceType()) .setDcUseTransformerRatio(parameters.isDcUseTransformerRatio()) .setCountriesToBalance(new HashSet<>(parameters.getCountriesToBalance())) - .setConnectedComponentMode(parameters.getConnectedComponentMode()) + .setComponentMode(parameters.getComponentMode()) .setHvdcAcEmulation(parameters.isHvdcAcEmulation()) .setDcPowerFactor(parameters.getDcPowerFactor()); diff --git a/src/main/java/com/powsybl/openloadflow/sa/AbstractSecurityAnalysis.java b/src/main/java/com/powsybl/openloadflow/sa/AbstractSecurityAnalysis.java index e3bf8c7913..b8882bcf2c 100644 --- a/src/main/java/com/powsybl/openloadflow/sa/AbstractSecurityAnalysis.java +++ b/src/main/java/com/powsybl/openloadflow/sa/AbstractSecurityAnalysis.java @@ -317,7 +317,7 @@ SecurityAnalysisResult runSimulationsOnAllComponents(LfNetworkList networks, Lis List actions, List limitReductions, LoadFlowParameters lfParameters) { - List networkToSimulate = new ArrayList<>(getNetworksToSimulate(networks, lfParameters.getConnectedComponentMode())); + List networkToSimulate = new ArrayList<>(getNetworksToSimulate(networks, lfParameters.getComponentMode())); OpenSecurityAnalysisParameters openSecurityAnalysisParameters = OpenSecurityAnalysisParameters.getOrDefault(securityAnalysisParameters); ContingencyActivePowerLossDistribution contingencyActivePowerLossDistribution = ContingencyActivePowerLossDistribution.find(openSecurityAnalysisParameters.getContingencyActivePowerLossDistribution()); @@ -365,12 +365,12 @@ SecurityAnalysisResult runSimulationsOnAllComponents(LfNetworkList networks, Lis return new SecurityAnalysisResult(mergedPrecontingencyResult, postContingencyResults, operatorStrategyResults); } - static List getNetworksToSimulate(LfNetworkList networks, LoadFlowParameters.ConnectedComponentMode mode) { + static List getNetworksToSimulate(LfNetworkList networks, LoadFlowParameters.ComponentMode mode) { - if (LoadFlowParameters.ConnectedComponentMode.MAIN.equals(mode)) { + if (LoadFlowParameters.ComponentMode.MAIN_CONNECTED.equals(mode)) { return networks.getList().stream() .filter(n -> n.getNumCC() == ComponentConstants.MAIN_NUM && n.getValidity().equals(LfNetwork.Validity.VALID)).toList(); - } else if (LoadFlowParameters.ConnectedComponentMode.ALL.equals(mode)) { + } else if (LoadFlowParameters.ComponentMode.ALL_CONNECTED.equals(mode)) { return networks.getList().stream() .filter(n -> n.getValidity().equals(LfNetwork.Validity.VALID)).toList(); } else { diff --git a/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowEurostagTutorialExample1Test.java b/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowEurostagTutorialExample1Test.java index bf62f82def..cc48daff1c 100644 --- a/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowEurostagTutorialExample1Test.java +++ b/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowEurostagTutorialExample1Test.java @@ -352,7 +352,7 @@ void testSeveralShunts() { LoadFlow.Runner loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory())); LoadFlowParameters parameters = new LoadFlowParameters(); - parameters.setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL) + parameters.setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED) .setVoltageInitMode(LoadFlowParameters.VoltageInitMode.DC_VALUES); LoadFlowResult result = loadFlowRunner.run(network, parameters); @@ -387,7 +387,7 @@ void testSeveralShunts2() { LoadFlow.Runner loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory())); LoadFlowParameters parameters = new LoadFlowParameters(); - parameters.setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL) + parameters.setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED) .setVoltageInitMode(LoadFlowParameters.VoltageInitMode.DC_VALUES); LoadFlowResult result = loadFlowRunner.run(network, parameters); diff --git a/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowReportTest.java b/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowReportTest.java index 68ccca6238..0e37431b4c 100644 --- a/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowReportTest.java +++ b/src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowReportTest.java @@ -125,7 +125,7 @@ void testMultipleComponents() throws IOException { // CC2 SC2 has no generator connected. Ignored in for DC and AC. network.getGenerator("g10").disconnect(); - var lfParameters = new LoadFlowParameters().setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL); + var lfParameters = new LoadFlowParameters().setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED); LoadFlowProvider provider = new OpenLoadFlowProvider(new DenseMatrixFactory(), new NaiveGraphConnectivityFactory<>(LfBus::getNum)); LoadFlow.Runner runner = new LoadFlow.Runner(provider); diff --git a/src/test/java/com/powsybl/openloadflow/ac/AreaInterchangeControlTest.java b/src/test/java/com/powsybl/openloadflow/ac/AreaInterchangeControlTest.java index 6c4e26f416..548b8010ec 100644 --- a/src/test/java/com/powsybl/openloadflow/ac/AreaInterchangeControlTest.java +++ b/src/test/java/com/powsybl/openloadflow/ac/AreaInterchangeControlTest.java @@ -239,7 +239,7 @@ void areaFragmentedBuses() { Area area1 = network.getArea("a1"); Area area2 = network.getArea("a2"); - parameters.setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL); + parameters.setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED); var result = loadFlowRunner.run(network, parameters); var componentResult = result.getComponentResults().get(0); @@ -256,7 +256,7 @@ void areaFragmentedBoundaries() { Area area1 = network.getArea("a1"); Area area2 = network.getArea("a2"); - parameters.setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL); + parameters.setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED); var result = loadFlowRunner.run(network, parameters); var componentResult = result.getComponentResults().get(0); diff --git a/src/test/java/com/powsybl/openloadflow/ac/ReferenceBusPrioritiesTest.java b/src/test/java/com/powsybl/openloadflow/ac/ReferenceBusPrioritiesTest.java index d72ea0ba32..efc122d150 100644 --- a/src/test/java/com/powsybl/openloadflow/ac/ReferenceBusPrioritiesTest.java +++ b/src/test/java/com/powsybl/openloadflow/ac/ReferenceBusPrioritiesTest.java @@ -56,7 +56,7 @@ void setUp() { .setReadSlackBus(true) .setUseReactiveLimits(false) .setDistributedSlack(true) - .setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL); + .setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED); parametersExt = OpenLoadFlowParameters.create(parameters) .setReferenceBusSelectionMode(ReferenceBusSelectionMode.GENERATOR_REFERENCE_PRIORITY); } diff --git a/src/test/java/com/powsybl/openloadflow/dc/DcLoadFlowTest.java b/src/test/java/com/powsybl/openloadflow/dc/DcLoadFlowTest.java index 3824f506c6..f463917a42 100644 --- a/src/test/java/com/powsybl/openloadflow/dc/DcLoadFlowTest.java +++ b/src/test/java/com/powsybl/openloadflow/dc/DcLoadFlowTest.java @@ -289,7 +289,7 @@ void multiCcTest() { } // bus 12 and 13 are out of main connected component - parameters.setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL); + parameters.setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED); loadFlowRunner.run(network, parameters); // check angle is zero for the 2 slack buses diff --git a/src/test/java/com/powsybl/openloadflow/network/LfNetworkTest.java b/src/test/java/com/powsybl/openloadflow/network/LfNetworkTest.java index 5f190e6f78..fbbfca3fa1 100644 --- a/src/test/java/com/powsybl/openloadflow/network/LfNetworkTest.java +++ b/src/test/java/com/powsybl/openloadflow/network/LfNetworkTest.java @@ -158,7 +158,7 @@ void testMultipleConnectedComponentsACAllComponents() { Network network = ConnectedComponentNetworkFactory.createTwoUnconnectedCC(); LoadFlow.Runner loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory())); LoadFlowParameters parameters = new LoadFlowParameters(); - parameters.setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL); + parameters.setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED); LoadFlowResult result = loadFlowRunner.run(network, parameters); assertTrue(result.isFullyConverged()); @@ -185,7 +185,7 @@ void testMultipleConnectedComponentsDCAllComponents() { Network network = ConnectedComponentNetworkFactory.createTwoUnconnectedCC(); LoadFlow.Runner loadFlowRunner = new LoadFlow.Runner(new OpenLoadFlowProvider(new DenseMatrixFactory())); LoadFlowParameters parameters = new LoadFlowParameters(); - parameters.setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL) + parameters.setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED) .setVoltageInitMode(LoadFlowParameters.VoltageInitMode.DC_VALUES); parameters.setDc(true); LoadFlowResult result = loadFlowRunner.run(network, parameters); diff --git a/src/test/java/com/powsybl/openloadflow/sa/OpenSecurityAnalysisTest.java b/src/test/java/com/powsybl/openloadflow/sa/OpenSecurityAnalysisTest.java index 4bc466983f..0693498ec7 100644 --- a/src/test/java/com/powsybl/openloadflow/sa/OpenSecurityAnalysisTest.java +++ b/src/test/java/com/powsybl/openloadflow/sa/OpenSecurityAnalysisTest.java @@ -3792,7 +3792,7 @@ void multiComponentSaTest(int threadCount) throws IOException { OpenSecurityAnalysisParameters securityAnalysisParametersExt = new OpenSecurityAnalysisParameters() .setThreadCount(threadCount); securityAnalysisParameters.addExtension(OpenSecurityAnalysisParameters.class, securityAnalysisParametersExt); - securityAnalysisParameters.getLoadFlowParameters().setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL); + securityAnalysisParameters.getLoadFlowParameters().setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED); List checkedContingencies = List.of(new Contingency("l13", new BranchContingency("l13")), new Contingency("dummyLoad", new LoadContingency("dummyLoad"))); @@ -3892,7 +3892,7 @@ void multiComponentSaTestContingencyBothComponentsAndOperatorStrategy(int thread OpenSecurityAnalysisParameters securityAnalysisParametersExt = new OpenSecurityAnalysisParameters() .setThreadCount(threadCount); securityAnalysisParameters.addExtension(OpenSecurityAnalysisParameters.class, securityAnalysisParametersExt); - securityAnalysisParameters.getLoadFlowParameters().setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL); + securityAnalysisParameters.getLoadFlowParameters().setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED); // This contingency should impact both components List checkedContingencies = List.of(new Contingency("compositeContingency", List.of(new BranchContingency("l13"), new LoadContingency("dummyLoad")))); @@ -3988,7 +3988,7 @@ void multipleComponentTerminalActionReconnect() { .add(); SecurityAnalysisParameters securityAnalysisParameters = new SecurityAnalysisParameters(); - securityAnalysisParameters.getLoadFlowParameters().setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL); + securityAnalysisParameters.getLoadFlowParameters().setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED); // Dummy contingency List contingencies = List.of(new Contingency("contingencyLoad", List.of(new LoadContingency("dummyLoad")))); @@ -4160,14 +4160,14 @@ void testComponentSelectionOneCCtwoSC() { assertEquals(1, networks.getList().get(1).getNumSC()); // Main connected component mode and all connected component mode should yield same result - List componentMain = AbstractSecurityAnalysis.getNetworksToSimulate(networks, LoadFlowParameters.ConnectedComponentMode.MAIN); + List componentMain = AbstractSecurityAnalysis.getNetworksToSimulate(networks, LoadFlowParameters.ComponentMode.MAIN_CONNECTED); assertEquals(2, componentMain.size()); assertEquals(0, componentMain.get(0).getNumCC()); assertEquals(0, componentMain.get(0).getNumSC()); assertEquals(0, componentMain.get(1).getNumCC()); assertEquals(1, componentMain.get(1).getNumSC()); - List componentAll = AbstractSecurityAnalysis.getNetworksToSimulate(networks, LoadFlowParameters.ConnectedComponentMode.ALL); + List componentAll = AbstractSecurityAnalysis.getNetworksToSimulate(networks, LoadFlowParameters.ComponentMode.ALL_CONNECTED); assertEquals(2, componentAll.size()); assertEquals(0, componentAll.get(0).getNumCC()); assertEquals(0, componentAll.get(0).getNumSC()); @@ -4187,13 +4187,13 @@ void testComponentSelectionTwoCC() { assertEquals(1, networks.getList().get(1).getNumSC()); // Main connected component mode should only select component associated to main CC - List componentMain = AbstractSecurityAnalysis.getNetworksToSimulate(networks, LoadFlowParameters.ConnectedComponentMode.MAIN); + List componentMain = AbstractSecurityAnalysis.getNetworksToSimulate(networks, LoadFlowParameters.ComponentMode.MAIN_CONNECTED); assertEquals(1, componentMain.size()); assertEquals(0, componentMain.get(0).getNumCC()); assertEquals(0, componentMain.get(0).getNumSC()); // All connected component mode should select all component - List componentAll = AbstractSecurityAnalysis.getNetworksToSimulate(networks, LoadFlowParameters.ConnectedComponentMode.ALL); + List componentAll = AbstractSecurityAnalysis.getNetworksToSimulate(networks, LoadFlowParameters.ComponentMode.ALL_CONNECTED); assertEquals(2, componentAll.size()); assertEquals(0, componentAll.get(0).getNumCC()); assertEquals(0, componentAll.get(0).getNumSC()); @@ -4212,8 +4212,8 @@ void testNoCc0Sc0() { assertEquals("CC0 SC4", compByBus.get("b04")); assertEquals("CC1 SC0", compByBus.get("b11")); assertEquals("CC1 SC0", compByBus.get("b12")); - LoadFlowParameters lfParametersAll = new LoadFlowParameters().setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL); - LoadFlowParameters lfParametersMain = new LoadFlowParameters().setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.MAIN); + LoadFlowParameters lfParametersAll = new LoadFlowParameters().setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED); + LoadFlowParameters lfParametersMain = new LoadFlowParameters().setComponentMode(LoadFlowParameters.ComponentMode.MAIN_CONNECTED); var lfResultAll = LoadFlow.run(network, lfParametersAll); assertTrue(lfResultAll.isFullyConverged()); var lfResultMain = LoadFlow.run(network, lfParametersMain); diff --git a/src/test/java/com/powsybl/openloadflow/sa/OpenSecurityAnalysisWithActionsTest.java b/src/test/java/com/powsybl/openloadflow/sa/OpenSecurityAnalysisWithActionsTest.java index 0f4a024132..6e1e4ad3a9 100644 --- a/src/test/java/com/powsybl/openloadflow/sa/OpenSecurityAnalysisWithActionsTest.java +++ b/src/test/java/com/powsybl/openloadflow/sa/OpenSecurityAnalysisWithActionsTest.java @@ -1513,7 +1513,7 @@ void testVSCConnectivityWithSwitch() { Network network = HvdcNetworkFactory.createHvdcAndSwitch(HvdcConverterStation.HvdcType.VSC); LoadFlowParameters parameters = new LoadFlowParameters(); - parameters.setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL); + parameters.setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED); // Disconect l12 - the HVDC line should still transfer power in N network.getLine("l12").getTerminal1().disconnect(); @@ -1748,7 +1748,7 @@ void testTerminalsConnectionActionWithTwoScs() { LoadFlowParameters parameters = new LoadFlowParameters(); parameters.setDistributedSlack(true); - parameters.setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL); + parameters.setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED); SecurityAnalysisParameters securityAnalysisParameters = new SecurityAnalysisParameters(); securityAnalysisParameters.setLoadFlowParameters(parameters); SecurityAnalysisResult resultAc = runSecurityAnalysis(network, contingencies, monitors, securityAnalysisParameters, @@ -1886,7 +1886,7 @@ void testContingencyParameters(boolean isDc, ContingencyLoadFlowParameters.Scope // run the security analysis LoadFlowParameters parameters = new LoadFlowParameters().setDc(isDc); - parameters.setConnectedComponentMode(LoadFlowParameters.ConnectedComponentMode.ALL); + parameters.setComponentMode(LoadFlowParameters.ComponentMode.ALL_CONNECTED); SecurityAnalysisParameters securityAnalysisParameters = new SecurityAnalysisParameters(); securityAnalysisParameters.setLoadFlowParameters(parameters); SecurityAnalysisResult resultAc = runSecurityAnalysis(network, contingencies, monitors, securityAnalysisParameters, diff --git a/src/test/resources/debug-parameters.json b/src/test/resources/debug-parameters.json index 7c74244403..514099c882 100644 --- a/src/test/resources/debug-parameters.json +++ b/src/test/resources/debug-parameters.json @@ -1,7 +1,7 @@ { "version" : "1.1", "load-flow-parameters" : { - "version" : "1.9", + "version" : "1.10", "voltageInitMode" : "UNIFORM_VALUES", "transformerVoltageControlOn" : false, "phaseShifterRegulationOn" : false, @@ -15,7 +15,7 @@ "balanceType" : "PROPORTIONAL_TO_GENERATION_P_MAX", "dcUseTransformerRatio" : true, "countriesToBalance" : [ ], - "connectedComponentMode" : "MAIN", + "componentMode" : "MAIN_CONNECTED", "hvdcAcEmulation" : true, "dcPowerFactor" : 1.0, "extensions" : { diff --git a/src/test/resources/sa-params.json b/src/test/resources/sa-params.json index 9341d355a8..ed0f7c1470 100644 --- a/src/test/resources/sa-params.json +++ b/src/test/resources/sa-params.json @@ -9,7 +9,7 @@ }, "intermediate-results-in-operator-strategy" : false, "load-flow-parameters" : { - "version" : "1.9", + "version" : "1.10", "voltageInitMode" : "UNIFORM_VALUES", "transformerVoltageControlOn" : false, "phaseShifterRegulationOn" : false, @@ -23,7 +23,7 @@ "balanceType" : "PROPORTIONAL_TO_GENERATION_P_MAX", "dcUseTransformerRatio" : true, "countriesToBalance" : [ ], - "connectedComponentMode" : "MAIN", + "componentMode" : "MAIN_CONNECTED", "hvdcAcEmulation" : true, "dcPowerFactor" : 1.0 }, From 78bbf6df6e67925cf85814d98c0bf7c6eebe4348 Mon Sep 17 00:00:00 2001 From: Didier Vidal Date: Fri, 28 Nov 2025 12:25:27 +0100 Subject: [PATCH 6/6] bump powsybl-core to 7.1.0-RC1 Signed-off-by: Didier Vidal --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1e5bebc0fe..cea1ddc468 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ 1.6.3 0.3.2 - 7.1.0-SNAPSHOT + 7.1.0-RC1