Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
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.16.0</gridsuite-filter.version>
<gridsuite-computation.version>1.9.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
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;

@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
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
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
Loading