Skip to content

network-modification v0.64.0 #763

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 1 commit into from
Feb 11, 2026
Merged

network-modification v0.64.0 #763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@
<sonar.coverage.exclusions>**/migration/**/*</sonar.coverage.exclusions>
<sonar.organization>gridsuite</sonar.organization>
<sonar.projectKey>org.gridsuite:network-modification-server</sonar.projectKey>
<network-modification.version>0.63.0</network-modification.version>
<!-- TODO network-modification.version remove when included in gridsuite-dependencies -->
<network-modification.version>0.64.0</network-modification.version>
<!-- TODO network-store.version remove when included in powsybl-ws-dependencies -->
<network-store-client.version>1.38.0</network-store-client.version>
</properties>
Expand Down Expand Up @@ -106,6 +107,12 @@
<artifactId>powsybl-network-store-model</artifactId>
<version>${network-store-client.version}</version>
</dependency>
<!-- FIXME: to be removed at next gridsuite-dependencies upgrade -->
<dependency>
<groupId>org.gridsuite</groupId>
<artifactId>gridsuite-network-modification</artifactId>
<version>${network-modification.version}</version>
</dependency>
<!-- overrides of imports -->

<dependency><!-- To remove when integrate in next release of gridsuite-dependencies or powsybl-ws-dependencies -->
Expand Down Expand Up @@ -143,7 +150,6 @@
<dependency>
<groupId>org.gridsuite</groupId>
<artifactId>gridsuite-network-modification</artifactId>
<version>${network-modification.version}</version>
</dependency>
<dependency>
<groupId>com.powsybl</groupId>
Expand Down
18 changes: 9 additions & 9 deletions ...ation/server/modifications/byfilter/assignment/GeneratorModificationByAssignmentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ protected void createEquipments() {
getNetwork().getGenerator(GENERATOR_ID_2)
.setTargetP(200)
.setMaxP(2000)
.setMinP(50)
.setMinP(10)
.setTargetV(10)
.setTargetQ(20)
.newExtension(GeneratorStartupAdder.class)
Expand Down Expand Up @@ -214,7 +214,7 @@ protected List<AssignmentInfos<?>> getAssignmentInfos() {

DoubleAssignmentInfos assignmentInfos10 = DoubleAssignmentInfos.builder()
.editedField(GeneratorField.MAXIMUM_ACTIVE_POWER.name())
.value(50.)
.value(300.)
.filters(List.of(filter1, filter2, filter3, filter4, filter5))
.build();

Expand Down Expand Up @@ -291,7 +291,7 @@ protected void assertAfterNetworkModificationCreation() {
assertEquals(0.1, generatorStartup1.getPlannedOutageRate(), 0);
assertEquals(0.05, generatorStartup1.getForcedOutageRate(), 0);
assertEquals(10, generatorStartup1.getPlannedActivePowerSetpoint(), 0);
assertEquals(50, generator1.getMaxP(), 0);
assertEquals(300., generator1.getMaxP(), 0);
assertEquals(2, generator1.getMinP(), 0);
assertEquals(true, generator1.isVoltageRegulatorOn());

Expand All @@ -304,7 +304,7 @@ protected void assertAfterNetworkModificationCreation() {
assertEquals(0.1, generatorStartup2.getPlannedOutageRate(), 0);
assertEquals(0.05, generatorStartup2.getForcedOutageRate(), 0);
assertEquals(10, generatorStartup2.getPlannedActivePowerSetpoint(), 0);
assertEquals(50, generator2.getMaxP(), 0);
assertEquals(300, generator2.getMaxP(), 0);
assertEquals(2, generator2.getMinP(), 0);

Generator generator3 = getNetwork().getGenerator(GENERATOR_ID_3);
Expand All @@ -313,7 +313,7 @@ protected void assertAfterNetworkModificationCreation() {
assertEquals(300, generator3.getTargetP(), 0);
assertEquals(0.2, generatorShortCircuit3.getDirectTransX(), 0);
assertEquals(0.3, generatorShortCircuit3.getStepUpTransformerX(), 0);
assertEquals(50, generator3.getMaxP(), 0);
assertEquals(300, generator3.getMaxP(), 0);
assertEquals(2, generator3.getMinP(), 0);

Generator generator4 = getNetwork().getGenerator(GENERATOR_ID_4);
Expand All @@ -322,19 +322,19 @@ protected void assertAfterNetworkModificationCreation() {
assertEquals(0.2, generatorShortCircuit4.getDirectTransX(), 0);
assertEquals(0.3, generatorShortCircuit4.getStepUpTransformerX(), 0);
assertEquals(400, generator4.getTargetP(), 0);
assertEquals(50, generator4.getMaxP(), 0);
assertEquals(700, generator4.getMaxP(), 0);
assertEquals(2, generator4.getMinP(), 0);

Generator generator5 = getNetwork().getGenerator(GENERATOR_ID_5);
ActivePowerControl activePowerControl5 = generator5.getExtension(ActivePowerControl.class);
assertNotNull(activePowerControl5);
assertEquals(50, generator5.getMaxP(), 0);
assertEquals(300, generator5.getMaxP(), 0);
assertEquals(2, activePowerControl5.getDroop(), 0);

Generator generator6 = getNetwork().getGenerator(GENERATOR_ID_6);
ActivePowerControl activePowerControl6 = generator6.getExtension(ActivePowerControl.class);
assertNotNull(activePowerControl6);
assertEquals(50, generator6.getMaxP(), 0);
assertEquals(300, generator6.getMaxP(), 0);
assertEquals(2, activePowerControl6.getDroop(), 0);

Generator generator7 = getNetwork().getGenerator(GENERATOR_ID_7);
Expand Down Expand Up @@ -379,7 +379,7 @@ protected void assertAfterNetworkModificationDeletion() {
assertEquals(0.55, generatorStartup2.getForcedOutageRate(), 0);
assertEquals(40, generatorStartup2.getPlannedActivePowerSetpoint(), 0);
assertEquals(2000, generator2.getMaxP(), 0);
assertEquals(50, generator2.getMinP(), 0);
assertEquals(10, generator2.getMinP(), 0);

Generator generator3 = getNetwork().getGenerator(GENERATOR_ID_3);
GeneratorShortCircuit generatorShortCircuit3 = generator3.getExtension(GeneratorShortCircuit.class);
Expand Down
2 changes: 1 addition & 1 deletion ...odification/server/modifications/byfilter/formula/GeneratorByFormulaModificationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ protected void assertAfterNetworkModificationCreation() {
assertEquals(0.055, generatorStartup2.getForcedOutageRate(), 0);
assertEquals(50, generatorStartup2.getPlannedActivePowerSetpoint(), 0);
assertEquals(2002, generator2.getMaxP(), 0);
assertEquals(100, generator2.getMinP(), 0);
assertEquals(50, generator2.getMinP(), 0);

Generator generator3 = getNetwork().getGenerator(GENERATOR_ID_3);
GeneratorShortCircuit generatorShortCircuit3 = generator3.getExtension(GeneratorShortCircuit.class);
Expand Down
2 changes: 1 addition & 1 deletion ...fication/server/modifications/byfilter/formula/VoltageLevelByFormulaModificationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ protected void assertAfterNetworkModificationCreation() {

assertTrue(Double.isNaN(getNetwork().getVoltageLevel(VOLTAGE_LEVEL_ID_7).getLowVoltageLimit()));
assertTrue(Double.isNaN(getNetwork().getVoltageLevel(VOLTAGE_LEVEL_ID_7).getHighVoltageLimit()));
assertLogMessageWithoutRank("Cannot modify equipment v7 : At least one of the value or referenced field is not a number", REPORT_KEY_EQUIPMENT_MODIFIED_ERROR_NAN, reportService);
assertLogMessageWithoutRank("Cannot modify equipment v7 : At least one of the value or referenced field is missing", REPORT_KEY_EQUIPMENT_MODIFIED_ERROR_MISSING, reportService);
assertLogMessageWithoutRank("Cannot modify equipment v7 : The value or referenced field of the second operand in the division operator is zero", REPORT_KEY_EQUIPMENT_MODIFIED_ERROR_ZERO, reportService);
assertLogMessageWithoutRank("Some of the equipment have been modified : 14 equipment(s) modified and 5 equipment(s) not modified", REPORT_KEY_BY_FILTER_MODIFICATION_SOME, reportService);
}
Expand Down