Upgrade rao parameters version to 3.0

Signed-off-by: Pauline Jean-Marie <[email protected]>
powsybl · Jan 17, 2025 · 0058ddc · 0058ddc
1 parent 9d6d32a
commit 0058ddc
Show file tree

Hide file tree

Showing 128 changed files with 128 additions and 128 deletions.
diff --git a/docs/parameters.md b/docs/parameters.md
@@ -551,7 +551,7 @@ Zones are seperated by + or -.
 :::{group-tab} JSON
 ~~~json
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "SECURE_FLOW",
     "unit" : "A",

diff --git a/python-util/rao_parameter_modification.py b/python-util/rao_parameter_modification.py
@@ -22,7 +22,7 @@ def rao_parameters_file(file_path):
     if "target" not in file_path and (file_path.endswith(".json")):
         with open(os.path.join(dirpath, filename), 'r') as file:
             for line in file:
-                if '"version" : "2.4"' in line or '"version" : "2.5"' in line:
+                if '"version" : "2.4"' in line or '"version" : "3.0"' in line:
                     correct_version = True
                 if any(name in line for name in relevant_rao_param_names):
                     has_rao_param_name = True

diff --git a/ra-optimisation/rao-api/src/main/java/com/powsybl/openrao/raoapi/RaoParametersCommons.java b/ra-optimisation/rao-api/src/main/java/com/powsybl/openrao/raoapi/RaoParametersCommons.java
@@ -16,7 +16,7 @@ public final class RaoParametersCommons {
     private RaoParametersCommons() {
     }
 
-    public static final String RAO_PARAMETERS_VERSION = "2.5";
+    public static final String RAO_PARAMETERS_VERSION = "3.0";
 
     // header
     public static final String VERSION = "version";

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParametersError_v2.json b/ra-optimisation/rao-api/src/test/resources/RaoParametersError_v2.json
@@ -1,4 +1,4 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "unknownField" : "abcd"
 }
diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParametersSet_v2.json b/ra-optimisation/rao-api/src/test/resources/RaoParametersSet_v2.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "A",

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParametersWithExtension_v2.json b/ra-optimisation/rao-api/src/test/resources/RaoParametersWithExtension_v2.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "SECURE_FLOW",
     "unit" : "MW",

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParametersWithLoopFlowError_v2.json b/ra-optimisation/rao-api/src/test/resources/RaoParametersWithLoopFlowError_v2.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "SECURE_FLOW",
     "unit" : "MW"

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParametersWithObjFuncTypeError_v2.json b/ra-optimisation/rao-api/src/test/resources/RaoParametersWithObjFuncTypeError_v2.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "WRONG"
   },

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParametersWithPrevStopCriterionError_v2.json b/ra-optimisation/rao-api/src/test/resources/RaoParametersWithPrevStopCriterionError_v2.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "MW"

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParametersWithWrongField_v2.json b/ra-optimisation/rao-api/src/test/resources/RaoParametersWithWrongField_v2.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "SECURE_FLOW",
     "unit" : "MW"

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
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "A",

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
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "SECURE_FLOW",
     "unit" : "MW",

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
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "MW",

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
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "A",

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParameters_default_v2.json b/ra-optimisation/rao-api/src/test/resources/RaoParameters_default_v2.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "SECURE_FLOW",
     "unit" : "MW"

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParameters_update_v2.json b/ra-optimisation/rao-api/src/test/resources/RaoParameters_update_v2.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "MW",

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParameters_v2.json b/ra-optimisation/rao-api/src/test/resources/RaoParameters_v2.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "SECURE_FLOW",
     "unit" : "MW",

diff --git a/ra-optimisation/search-tree-rao/src/test/resources/parameters/RaoParameters_2P_v2.json b/ra-optimisation/search-tree-rao/src/test/resources/parameters/RaoParameters_2P_v2.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "A",

diff --git a/ra-optimisation/search-tree-rao/src/test/resources/parameters/RaoParameters_DC.json b/ra-optimisation/search-tree-rao/src/test/resources/parameters/RaoParameters_DC.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "MW",

diff --git a/...misation/search-tree-rao/src/test/resources/parameters/RaoParameters_dc_minObjective.json b/...misation/search-tree-rao/src/test/resources/parameters/RaoParameters_dc_minObjective.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MIN_COST",
     "unit" : "MW",

diff --git a/...misation/search-tree-rao/src/test/resources/parameters/RaoParameters_oneIteration_v2.json b/...misation/search-tree-rao/src/test/resources/parameters/RaoParameters_oneIteration_v2.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "A",

diff --git a/ra-optimisation/search-tree-rao/src/test/resources/parameters/RaoParameters_secure.json b/ra-optimisation/search-tree-rao/src/test/resources/parameters/RaoParameters_secure.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "SECURE_FLOW",
     "unit" : "MW"

diff --git a/tests/src/test/resources/files/configurations/common/RaoParameters_default.json b/tests/src/test/resources/files/configurations/common/RaoParameters_default.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "SECURE_FLOW",
     "unit" : "MW"

diff --git a/tests/src/test/resources/files/configurations/common/RaoParameters_maxMargin_ampere.json b/tests/src/test/resources/files/configurations/common/RaoParameters_maxMargin_ampere.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "A",

diff --git a/tests/src/test/resources/files/configurations/common/RaoParameters_maxMargin_ampere_mip.json b/tests/src/test/resources/files/configurations/common/RaoParameters_maxMargin_ampere_mip.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "A",

diff --git a/...st/resources/files/configurations/common/RaoParameters_maxMargin_ampere_withFallback.json b/...st/resources/files/configurations/common/RaoParameters_maxMargin_ampere_withFallback.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "A",

diff --git a/...s/src/test/resources/files/configurations/common/RaoParameters_maxMargin_megawatt_ac.json b/...s/src/test/resources/files/configurations/common/RaoParameters_maxMargin_megawatt_ac.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "MW",

diff --git a/...s/src/test/resources/files/configurations/common/RaoParameters_maxMargin_megawatt_dc.json b/...s/src/test/resources/files/configurations/common/RaoParameters_maxMargin_megawatt_dc.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "MW",

diff --git a/...ources/files/configurations/common/RaoParameters_maxMargin_megawatt_dc_withLoopFlows.json b/...ources/files/configurations/common/RaoParameters_maxMargin_megawatt_dc_withLoopFlows.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "MW",

diff --git a/tests/src/test/resources/files/configurations/common/RaoParameters_posMargin_ampere.json b/tests/src/test/resources/files/configurations/common/RaoParameters_posMargin_ampere.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "SECURE_FLOW",
     "unit" : "A"

diff --git a/...st/resources/files/configurations/common/RaoParameters_posMargin_ampere_withFallback.json b/...st/resources/files/configurations/common/RaoParameters_posMargin_ampere_withFallback.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "SECURE_FLOW",
     "unit" : "A"

diff --git a/...s/src/test/resources/files/configurations/common/RaoParameters_posMargin_megawatt_ac.json b/...s/src/test/resources/files/configurations/common/RaoParameters_posMargin_megawatt_ac.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "SECURE_FLOW",
     "unit" : "MW"

diff --git a/...s/src/test/resources/files/configurations/common/RaoParameters_posMargin_megawatt_dc.json b/...s/src/test/resources/files/configurations/common/RaoParameters_posMargin_megawatt_dc.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "SECURE_FLOW",
     "unit" : "MW"

diff --git a/tests/src/test/resources/files/configurations/common/RaoParameters_securityAnalysis.json b/tests/src/test/resources/files/configurations/common/RaoParameters_securityAnalysis.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "SECURE_FLOW",
     "unit" : "A"

diff --git a/tests/src/test/resources/files/configurations/common/RaoParameters_simple_AC_loopflow.json b/tests/src/test/resources/files/configurations/common/RaoParameters_simple_AC_loopflow.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "SECURE_FLOW",
     "unit" : "MW"

diff --git a/tests/src/test/resources/files/configurations/epic10/RaoParameters_relMargin_megawatt.json b/tests/src/test/resources/files/configurations/epic10/RaoParameters_relMargin_megawatt.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_RELATIVE_MARGIN",
     "unit" : "MW",

diff --git a/tests/src/test/resources/files/configurations/epic10/conf_ep10us2case1.json b/tests/src/test/resources/files/configurations/epic10/conf_ep10us2case1.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_RELATIVE_MARGIN",
     "unit" : "MW",

diff --git a/tests/src/test/resources/files/configurations/epic10/conf_ep10us2case2.json b/tests/src/test/resources/files/configurations/epic10/conf_ep10us2case2.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_RELATIVE_MARGIN",
     "unit" : "MW",

diff --git a/tests/src/test/resources/files/configurations/epic10/conf_ep10us3case1.json b/tests/src/test/resources/files/configurations/epic10/conf_ep10us3case1.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_RELATIVE_MARGIN",
     "unit" : "MW",

diff --git a/tests/src/test/resources/files/configurations/epic10/conf_ep10us4case1.json b/tests/src/test/resources/files/configurations/epic10/conf_ep10us4case1.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_RELATIVE_MARGIN",
     "unit" : "MW",

diff --git a/...sources/files/configurations/epic11/RaoParameters_maxMargin_megawatt_ac_mnecDimin180.json b/...sources/files/configurations/epic11/RaoParameters_maxMargin_megawatt_ac_mnecDimin180.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "MW",

diff --git a/...esources/files/configurations/epic11/RaoParameters_maxMargin_megawatt_ac_mnecDimin20.json b/...esources/files/configurations/epic11/RaoParameters_maxMargin_megawatt_ac_mnecDimin20.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "MW",

diff --git a/...sources/files/configurations/epic11/RaoParameters_posMargin_ampere_mnecDiminMinusInf.json b/...sources/files/configurations/epic11/RaoParameters_posMargin_ampere_mnecDiminMinusInf.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "SECURE_FLOW",
     "unit" : "A"

diff --git a/tests/src/test/resources/files/configurations/epic12/raoParametersSweIDCC_minObjective.json b/tests/src/test/resources/files/configurations/epic12/raoParametersSweIDCC_minObjective.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "A",

diff --git a/...st/resources/files/configurations/epic12/raoParametersSweIDCC_minObjectiveDisabled2P.json b/...st/resources/files/configurations/epic12/raoParametersSweIDCC_minObjectiveDisabled2P.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "A",

diff --git a/.../resources/files/configurations/epic12/raoParametersSweIDCC_minObjectiveWithGlobal2P.json b/.../resources/files/configurations/epic12/raoParametersSweIDCC_minObjectiveWithGlobal2P.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "A",

diff --git a/tests/src/test/resources/files/configurations/epic13/RaoParameters_13_6_11.json b/tests/src/test/resources/files/configurations/epic13/RaoParameters_13_6_11.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "MW",

diff --git a/tests/src/test/resources/files/configurations/epic13/RaoParameters_13_6_2.json b/tests/src/test/resources/files/configurations/epic13/RaoParameters_13_6_2.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "MW",

diff --git a/...st/resources/files/configurations/epic13/RaoParameters_best_preventive_by_300_secure.json b/...st/resources/files/configurations/epic13/RaoParameters_best_preventive_by_300_secure.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "A",

diff --git a/.../src/test/resources/files/configurations/epic13/RaoParameters_best_preventive_by_500.json b/.../src/test/resources/files/configurations/epic13/RaoParameters_best_preventive_by_500.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "A",

diff --git a/.../src/test/resources/files/configurations/epic13/RaoParameters_best_preventive_by_628.json b/.../src/test/resources/files/configurations/epic13/RaoParameters_best_preventive_by_628.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "A",

diff --git a/tests/src/test/resources/files/configurations/epic13/RaoParameters_ep13us6case8.json b/tests/src/test/resources/files/configurations/epic13/RaoParameters_ep13us6case8.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "MW",

diff --git a/tests/src/test/resources/files/configurations/epic13/RaoParameters_ep13us7case6.json b/tests/src/test/resources/files/configurations/epic13/RaoParameters_ep13us7case6.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "MW",

diff --git a/.../test/resources/files/configurations/epic13/RaoParameters_maxMargin_ampere_2p_global.json b/.../test/resources/files/configurations/epic13/RaoParameters_maxMargin_ampere_2p_global.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "A",

diff --git a/...ources/files/configurations/epic13/RaoParameters_maxMargin_ampere_absolute_threshold.json b/...ources/files/configurations/epic13/RaoParameters_maxMargin_ampere_absolute_threshold.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "A",

diff --git a/...ces/files/configurations/epic13/RaoParameters_maxMargin_ampere_absolute_threshold_12.json b/...ces/files/configurations/epic13/RaoParameters_maxMargin_ampere_absolute_threshold_12.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.5",
+  "version" : "3.0",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN",
     "unit" : "A",