Skip to content

Bump to powsybl-core 7.1.0-RC1 #1301

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
merged 6 commits into from
Nov 28, 2025
Merged

Bump to powsybl-core 7.1.0-RC1 #1301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4a9488f
Bump IIDM version to 1.15 in unit test files
olperr1 Nov 18, 2025
5a8a649
bump powsybl-core to 7.1.0-SNAPSHOT
vidaldid-rte Nov 18, 2025
6777681
Fix public API modfication
vidaldid-rte Nov 26, 2025
4ae5029
update LoadFlowProviderAPI (#1299)
vidaldid-rte Nov 26, 2025
fbf982c
Adapt OpenLoadFlow to enum change in core (connected component mode) …
cphili Nov 26, 2025
78bbf6d
bump powsybl-core to 7.1.0-RC1
vidaldid-rte Nov 28, 2025
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<slf4jtoys.version>1.6.3</slf4jtoys.version>
<asciitable.version>0.3.2</asciitable.version>

<powsybl-core.version>7.0.1</powsybl-core.version>
<powsybl-core.version>7.1.0-RC1</powsybl-core.version>

<!-- This is required for later correct replacement of argline -->
<argLine/>
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/powsybl/openloadflow/OpenLoadFlowParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ public static List<Object> 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<Parameter> SPECIFIC_PARAMETERS = List.of(
Expand Down Expand Up @@ -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())
Expand Down Expand Up @@ -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())
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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());

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/powsybl/openloadflow/OpenLoadFlowProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ public Optional<Extension<LoadFlowParameters>> loadSpecificParameters(Map<String
}

@Override
public List<Parameter> getSpecificParameters() {
public List<Parameter> getRawSpecificParameters() {
return OpenLoadFlowParameters.SPECIFIC_PARAMETERS;
}

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/powsybl/openloadflow/sa/AbstractSecurityAnalysis.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ SecurityAnalysisResult runSimulationsOnAllComponents(LfNetworkList networks, Lis
List<Action> actions, List<LimitReduction> limitReductions,
LoadFlowParameters lfParameters) {

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

Expand Down Expand Up @@ -365,12 +365,12 @@ SecurityAnalysisResult runSimulationsOnAllComponents(LfNetworkList networks, Lis
return new SecurityAnalysisResult(mergedPrecontingencyResult, postContingencyResults, operatorStrategyResults);
}

static List<LfNetwork> getNetworksToSimulate(LfNetworkList networks, LoadFlowParameters.ConnectedComponentMode mode) {
static List<LfNetwork> 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 {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/powsybl/openloadflow/sensi/OpenSensitivityAnalysisProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/powsybl/openloadflow/OpenLoadFlowParametersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -459,7 +459,7 @@ void testEqualsCloneAndUpdate() {
void testSerializationRoundTrip() {
Set<String> 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<String> vals;
Expand Down
4 changes: 3 additions & 1 deletion src/test/java/com/powsybl/openloadflow/OpenLoadFlowProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowEurostagTutorialExample1Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/powsybl/openloadflow/ac/AcLoadFlowReportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/powsybl/openloadflow/ac/AreaInterchangeControlTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/powsybl/openloadflow/ac/ReferenceBusPrioritiesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/powsybl/openloadflow/ac/solver/AcSolverFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/powsybl/openloadflow/dc/DcLoadFlowTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/powsybl/openloadflow/network/LfNetworkTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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);
Expand Down
Loading