Bump powsybl-core to 6.4.0, open-loadflow to 1.12.1 and entsoe to 2.1…

…0.0 (#1071)
powsybl · Jul 9, 2024 · dbc40ea · dbc40ea
1 parent 1f4d5b3
commit dbc40ea
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -116,9 +116,9 @@
         <maven.source.version>3.2.1</maven.source.version>
         <maven.templating.version>1.0.0</maven.templating.version>
         <mockito.inline.version>5.2.0</mockito.inline.version>
-        <powsybl.core.version>6.3.1</powsybl.core.version>
-        <powsybl.entsoe.version>2.9.0</powsybl.entsoe.version>
-        <powsybl.openloadflow.version>1.9.0</powsybl.openloadflow.version>
+        <powsybl.core.version>6.4.0</powsybl.core.version>
+        <powsybl.entsoe.version>2.10.0</powsybl.entsoe.version>
+        <powsybl.openloadflow.version>1.12.1</powsybl.openloadflow.version>
         <slf4j.version>1.7.36</slf4j.version>
         <xmlunit.core.version>2.8.1</xmlunit.core.version>
     </properties>

diff --git a/...misation/rao-api/src/test/java/com/powsybl/openrao/raoapi/json/JsonRaoParametersTest.java b/...misation/rao-api/src/test/java/com/powsybl/openrao/raoapi/json/JsonRaoParametersTest.java
@@ -151,7 +151,7 @@ void update() {
     void writeExtension() throws IOException {
         RaoParameters parameters = new RaoParameters();
         parameters.addExtension(DummyExtension.class, new DummyExtension());
-        writeTest(parameters, JsonRaoParameters::write, ComparisonUtils::compareTxt, "/RaoParametersWithExtension_v2.json");
+        writeTest(parameters, JsonRaoParameters::write, ComparisonUtils::assertTxtEquals, "/RaoParametersWithExtension_v2.json");
     }
 
     @Test

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withExtensions.json b/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withExtensions.json
@@ -132,7 +132,10 @@
             "newtonKrylovLineSearch" : false,
             "referenceBusSelectionMode" : "FIRST_SLACK",
             "writeReferenceTerminals" : true,
-            "voltageTargetPriorities" : [ "GENERATOR", "TRANSFORMER", "SHUNT" ]
+            "voltageTargetPriorities" : [ "GENERATOR", "TRANSFORMER", "SHUNT" ],
+            "transformerVoltageControlUseInitialTapPosition" : false,
+            "generatorVoltageControlMinNominalVoltage" : -1.0,
+            "fictitiousGeneratorVoltageControlCheckMode" : "FORCED"
           }
         }
       },

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withOLFParams.json b/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withOLFParams.json
@@ -132,7 +132,10 @@
             "newtonKrylovLineSearch" : false,
             "referenceBusSelectionMode" : "FIRST_SLACK",
             "writeReferenceTerminals" : true,
-            "voltageTargetPriorities" : [ "GENERATOR", "TRANSFORMER", "SHUNT" ]
+            "voltageTargetPriorities" : [ "GENERATOR", "TRANSFORMER", "SHUNT" ],
+            "transformerVoltageControlUseInitialTapPosition" : false,
+            "generatorVoltageControlMinNominalVoltage" : -1.0,
+            "fictitiousGeneratorVoltageControlCheckMode" : "FORCED"
           }
         }
       },

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withPartialExtensions.json b/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withPartialExtensions.json
@@ -132,7 +132,10 @@
             "newtonKrylovLineSearch" : false,
             "referenceBusSelectionMode" : "FIRST_SLACK",
             "writeReferenceTerminals" : true,
-            "voltageTargetPriorities" : [ "GENERATOR", "TRANSFORMER", "SHUNT" ]
+            "voltageTargetPriorities" : [ "GENERATOR", "TRANSFORMER", "SHUNT" ],
+            "transformerVoltageControlUseInitialTapPosition" : false,
+            "generatorVoltageControlMinNominalVoltage" : -1.0,
+            "fictitiousGeneratorVoltageControlCheckMode" : "FORCED"
           }
         }
       },

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withoutExtensions.json b/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withoutExtensions.json
@@ -132,7 +132,10 @@
             "newtonKrylovLineSearch" : false,
             "referenceBusSelectionMode" : "FIRST_SLACK",
             "writeReferenceTerminals" : true,
-            "voltageTargetPriorities" : [ "GENERATOR", "TRANSFORMER", "SHUNT" ]
+            "voltageTargetPriorities" : [ "GENERATOR", "TRANSFORMER", "SHUNT" ],
+            "transformerVoltageControlUseInitialTapPosition" : false,
+            "generatorVoltageControlMinNominalVoltage" : -1.0,
+            "fictitiousGeneratorVoltageControlCheckMode" : "FORCED"
           }
         }
       },