Skip to content

powsybl-dependencies v2025.3.0 #219

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
EtienneLt merged 5 commits into from
Jan 20, 2026
Merged

powsybl-dependencies v2025.3.0 #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1f56154
powsybl-dependencies v2025.3.0
EtienneLt Jan 9, 2026
7c54aa0
fix
EtienneLt Jan 9, 2026
37a920a
Merge branch 'main' into powsybl-dependencencies-v2025.3.0
EtienneLt Jan 12, 2026
331d71c
Merge branch 'main' into powsybl-dependencies-v2025.3.0
EtienneLt Jan 19, 2026
7b1dd20
empty commit to trigger ci
EtienneLt Jan 19, 2026
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
16 changes: 1 addition & 15 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,7 @@

<jib.from.image>powsybl/java-dynawo:3.1.0</jib.from.image>
<liquibase-hibernate-package>org.gridsuite.loadflow.server</liquibase-hibernate-package>
<gridsuite-dependencies.version>46.0.0</gridsuite-dependencies.version>
<!-- TODO remove gridsuite-filter.version and computation.version when upgrading gridsuite dependencies -->
<gridsuite-filter.version>1.18.0</gridsuite-filter.version>
<gridsuite-computation.version>1.10.0</gridsuite-computation.version>
<gridsuite-dependencies.version>47.0.0</gridsuite-dependencies.version>
<!--
antlr4 from openloadflow conflicts ? Only on repository.count() method in this project..
[ERROR] org.gridsuite.loadflow.server.SupervisionControllerTest.testResultCount <<< ERROR!
Expand Down Expand Up @@ -97,17 +94,6 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.gridsuite</groupId>
<artifactId>gridsuite-computation</artifactId>
<version>${gridsuite-computation.version}</version>
</dependency>

<dependency>
<groupId>org.gridsuite</groupId>
<artifactId>gridsuite-filter</artifactId>
<version>${gridsuite-filter.version}</version>
</dependency>

<dependency>
<groupId>org.gridsuite</groupId>
Expand Down
6 changes: 3 additions & 3 deletions ...main/java/org/gridsuite/loadflow/server/entities/parameters/LoadFlowParametersEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public class LoadFlowParametersEntity {

@Column(name = "connectedComponentMode")
@Enumerated(EnumType.STRING)
private LoadFlowParameters.ConnectedComponentMode connectedComponentMode;
private LoadFlowParameters.ComponentMode connectedComponentMode;
Copy link
Contributor

@Mathieu-Deharbe Mathieu-Deharbe Jan 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the type name changes you should probably change the variable name too :

Suggested change
private LoadFlowParameters.ComponentMode connectedComponentMode;
private LoadFlowParameters.ComponentMode componentMode;

(edit : ok I can see that this gets complicated given that this is an entity, maybe it is better to keep it like this, do as you wish)

Copy link
Contributor

@Mathieu-Deharbe Mathieu-Deharbe Jan 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the type name changes you should probably change the variable name too :

Suggested change
private LoadFlowParameters.ComponentMode connectedComponentMode;
private LoadFlowParameters.ComponentMode componentMode;

(edit : ok I can see that this gets complicated given that this is an entity, maybe it is better to keep it like this, do as you wish)


@Column(name = "hvdcAcEmulation", columnDefinition = "boolean default true", nullable = false)
private boolean hvdcAcEmulation = true;
Expand Down Expand Up @@ -175,7 +175,7 @@ private void assignCommonValues(LoadFlowParameters allCommonValues) {
balanceType = allCommonValues.getBalanceType();
dcUseTransformerRatio = allCommonValues.isDcUseTransformerRatio();
countriesToBalance = allCommonValues.getCountriesToBalance().stream().map(Country::toString).collect(Collectors.toSet());
connectedComponentMode = allCommonValues.getConnectedComponentMode();
connectedComponentMode = allCommonValues.getComponentMode();
hvdcAcEmulation = allCommonValues.isHvdcAcEmulation();
dcPowerFactor = allCommonValues.getDcPowerFactor();
}
Expand Down Expand Up @@ -205,7 +205,7 @@ public LoadFlowParameters toLoadFlowParameters() {
.setBalanceType(this.getBalanceType())
.setDcUseTransformerRatio(this.isDcUseTransformerRatio())
.setCountriesToBalance(this.getCountriesToBalance().stream().map(Country::valueOf).collect(Collectors.toSet()))
.setConnectedComponentMode(this.getConnectedComponentMode())
.setComponentMode(this.getConnectedComponentMode())
.setHvdcAcEmulation(this.isHvdcAcEmulation())
.setDcPowerFactor(this.getDcPowerFactor());
}
Expand Down
13 changes: 13 additions & 0 deletions src/main/resources/db/changelog/changesets/changelog_20260801T170000Z.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
<changeSet author="lesoteti" id="1764164817687-1">
<update tableName="load_flow_parameters">
<column name="connected_component_mode" value="MAIN_CONNECTED"/>
<where>connected_component_mode = 'MAIN'</where>
</update>
<update tableName="load_flow_parameters">
<column name="connected_component_mode" value="ALL_CONNECTED"/>
<where>connected_component_mode = 'ALL'</where>
</update>
</changeSet>
</databaseChangeLog>
3 changes: 3 additions & 0 deletions src/main/resources/db/changelog/db.changelog-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,6 @@ databaseChangeLog:
- include:
file: changesets/changelog_20251126T134638Z.xml
relativeToChangelogFile: true
- include:
file: changesets/changelog_20260801T170000Z.xml
relativeToChangelogFile: true