From 07511dd44e6598835867f79c52639141873d61c7 Mon Sep 17 00:00:00 2001 From: Pauline Jean-Marie Date: Thu, 16 Jan 2025 10:24:36 +0100 Subject: [PATCH] Upgrade rao parameters version to 3.0 Signed-off-by: Pauline Jean-Marie --- docs/parameters.md | 2 +- python-util/rao_parameter_modification.py | 2 +- .../java/com/powsybl/openrao/raoapi/RaoParametersCommons.java | 2 +- .../rao-api/src/test/resources/RaoParametersError_v2.json | 2 +- .../rao-api/src/test/resources/RaoParametersSet_v2.json | 2 +- .../src/test/resources/RaoParametersWithExtension_v2.json | 2 +- .../src/test/resources/RaoParametersWithLoopFlowError_v2.json | 2 +- .../test/resources/RaoParametersWithObjFuncTypeError_v2.json | 2 +- .../resources/RaoParametersWithPrevStopCriterionError_v2.json | 2 +- .../src/test/resources/RaoParametersWithWrongField_v2.json | 2 +- .../src/test/resources/RaoParameters_config_withExtensions.json | 2 +- .../src/test/resources/RaoParameters_config_withOLFParams.json | 2 +- .../resources/RaoParameters_config_withPartialExtensions.json | 2 +- .../test/resources/RaoParameters_config_withoutExtensions.json | 2 +- .../rao-api/src/test/resources/RaoParameters_default_v2.json | 2 +- .../rao-api/src/test/resources/RaoParameters_update_v2.json | 2 +- .../rao-api/src/test/resources/RaoParameters_v2.json | 2 +- .../src/test/resources/parameters/RaoParameters_2P_v2.json | 2 +- .../src/test/resources/parameters/RaoParameters_DC.json | 2 +- .../resources/parameters/RaoParameters_dc_minObjective.json | 2 +- .../resources/parameters/RaoParameters_oneIteration_v2.json | 2 +- .../src/test/resources/parameters/RaoParameters_secure.json | 2 +- .../files/configurations/common/RaoParameters_default.json | 2 +- .../configurations/common/RaoParameters_maxMargin_ampere.json | 2 +- .../common/RaoParameters_maxMargin_ampere_mip.json | 2 +- .../common/RaoParameters_maxMargin_ampere_withFallback.json | 2 +- .../common/RaoParameters_maxMargin_megawatt_ac.json | 2 +- .../common/RaoParameters_maxMargin_megawatt_dc.json | 2 +- .../RaoParameters_maxMargin_megawatt_dc_withLoopFlows.json | 2 +- .../configurations/common/RaoParameters_posMargin_ampere.json | 2 +- .../common/RaoParameters_posMargin_ampere_withFallback.json | 2 +- .../common/RaoParameters_posMargin_megawatt_ac.json | 2 +- .../common/RaoParameters_posMargin_megawatt_dc.json | 2 +- .../configurations/common/RaoParameters_securityAnalysis.json | 2 +- .../configurations/common/RaoParameters_simple_AC_loopflow.json | 2 +- .../configurations/epic10/RaoParameters_relMargin_megawatt.json | 2 +- .../files/configurations/epic10/conf_ep10us2case1.json | 2 +- .../files/configurations/epic10/conf_ep10us2case2.json | 2 +- .../files/configurations/epic10/conf_ep10us3case1.json | 2 +- .../files/configurations/epic10/conf_ep10us4case1.json | 2 +- .../RaoParameters_maxMargin_megawatt_ac_mnecDimin180.json | 2 +- .../epic11/RaoParameters_maxMargin_megawatt_ac_mnecDimin20.json | 2 +- .../RaoParameters_posMargin_ampere_mnecDiminMinusInf.json | 2 +- .../epic12/raoParametersSweIDCC_minObjective.json | 2 +- .../epic12/raoParametersSweIDCC_minObjectiveDisabled2P.json | 2 +- .../epic12/raoParametersSweIDCC_minObjectiveWithGlobal2P.json | 2 +- .../files/configurations/epic13/RaoParameters_13_6_11.json | 2 +- .../files/configurations/epic13/RaoParameters_13_6_2.json | 2 +- .../epic13/RaoParameters_best_preventive_by_300_secure.json | 2 +- .../epic13/RaoParameters_best_preventive_by_500.json | 2 +- .../epic13/RaoParameters_best_preventive_by_628.json | 2 +- .../files/configurations/epic13/RaoParameters_ep13us6case8.json | 2 +- .../files/configurations/epic13/RaoParameters_ep13us7case6.json | 2 +- .../epic13/RaoParameters_maxMargin_ampere_2p_global.json | 2 +- .../RaoParameters_maxMargin_ampere_absolute_threshold.json | 2 +- .../RaoParameters_maxMargin_ampere_absolute_threshold_12.json | 2 +- .../configurations/epic13/RaoParameters_relMargin_ampere.json | 2 +- .../epic13/RaoParameters_stop_curative_at_preventive.json | 2 +- .../files/configurations/epic15/RaoParameters_ep15us11-2.json | 2 +- .../files/configurations/epic15/RaoParameters_ep15us11-4.json | 2 +- .../files/configurations/epic15/RaoParameters_ep15us11-5-1.json | 2 +- .../files/configurations/epic15/RaoParameters_ep15us11-5-2.json | 2 +- .../configurations/epic15/RaoParameters_ep15us11-5-3-3.json | 2 +- .../configurations/epic15/RaoParameters_ep15us13case1.json | 2 +- .../configurations/epic15/RaoParameters_ep15us13case10.json | 2 +- .../configurations/epic15/RaoParameters_ep15us13case2.json | 2 +- .../configurations/epic15/RaoParameters_ep15us13case5.json | 2 +- .../configurations/epic15/RaoParameters_ep15us13case6.json | 2 +- .../configurations/epic15/RaoParameters_ep15us13case7.json | 2 +- .../configurations/epic15/RaoParameters_ep15us13case8.json | 2 +- .../configurations/epic15/RaoParameters_ep15us17case10.json | 2 +- .../configurations/epic15/RaoParameters_ep15us17case11.json | 2 +- .../configurations/epic15/RaoParameters_ep15us17case12.json | 2 +- .../configurations/epic15/RaoParameters_ep15us17case2.json | 2 +- .../configurations/epic15/RaoParameters_ep15us17case6.json | 2 +- .../files/configurations/epic15/RaoParameters_ep15us7-2.json | 2 +- .../configurations/epic15/raoParametersSweIDCC_withoutPsts.json | 2 +- .../files/configurations/epic19/RaoParameters_19_10_10&11.json | 2 +- .../files/configurations/epic19/RaoParameters_19_11_9.json | 2 +- .../files/configurations/epic19/RaoParameters_19_11_9_bis.json | 2 +- .../files/configurations/epic19/RaoParameters_dc_discrete.json | 2 +- .../epic19/RaoParameters_maxMargin_ampere_shareCra.json | 2 +- .../epic19/RaoParameters_maxMargin_megawatt_shareCra.json | 2 +- .../epic19/RaoParameters_maxRelMargin_ampere_shareCra.json | 2 +- .../epic19/RaoParameters_maxRelMargin_ampere_shareCra_mip.json | 2 +- .../epic19/RaoParameters_maxRelMargin_megawatt_shareCra.json | 2 +- .../RaoParameters_maxRelMargin_megawatt_shareCra_mip.json | 2 +- .../files/configurations/epic20/RaoParameters_20_4.json | 2 +- .../files/configurations/epic20/RaoParameters_20_6_1.json | 2 +- .../files/configurations/epic20/RaoParameters_20_6_2.json | 2 +- .../epic20/RaoParameters_maxMargin_MW_DC_withLF_with2P.json | 2 +- .../RaoParameters_maxMargin_ampere_2p_if_cost_increase.json | 2 +- .../RaoParameters_maxMargin_ampere_forbid_cost_increase.json | 2 +- .../RaoParameters_maxMargin_ampere_second_preventive.json | 2 +- .../epic4/RaoParameters_posMargin_ampere_ac_divergence.json | 2 +- ...oParameters_posMargin_ampere_withFallback_ac_divergence.json | 2 +- ...ers_posMargin_ampere_withFallback_differentFallbackCost.json | 2 +- .../epic5/RaoParameters_maxMargin_absoluteMinImpact190.json | 2 +- .../epic5/RaoParameters_maxMargin_absoluteMinImpact195.json | 2 +- .../configurations/epic5/RaoParameters_maxMargin_maxDepth.json | 2 +- .../epic5/RaoParameters_maxMargin_relativeMinImpact.json | 2 +- .../epic7/RaoParameters_maxMargin_mw_ac_lf_false_10_100.json | 2 +- .../epic7/RaoParameters_maxMargin_mw_ac_lf_false_5_100.json | 2 +- .../RaoParameters_maxMargin_mw_ac_lf_false_5_100_BE_NL.json | 2 +- .../epic7/RaoParameters_maxMargin_mw_ac_lf_false_5_100_NL.json | 2 +- ...arameters_maxMargin_mw_ac_lf_false_5_100_lfAugmentation.json | 2 +- .../epic7/RaoParameters_maxMargin_mw_ac_lf_true_5_100.json | 2 +- .../epic7/RaoParameters_maxMargin_mw_dc_lf_accurate_5_100.json | 2 +- .../epic7/RaoParameters_maxMargin_mw_dc_lf_false_10_100.json | 2 +- .../epic7/RaoParameters_maxMargin_mw_dc_lf_false_5_100.json | 2 +- .../epic7/RaoParameters_maxMargin_mw_dc_lf_inBetween_5_100.json | 2 +- .../epic91/RaoParameters_case_91_12_search_tree.json | 2 +- .../configurations/epic91/RaoParameters_case_91_12_secure.json | 2 +- .../epic91/RaoParameters_case_91_12_secure_2PRAO.json | 2 +- .../files/configurations/epic91/RaoParameters_case_91_13_1.json | 2 +- .../files/configurations/epic91/RaoParameters_case_91_1_1.json | 2 +- .../files/configurations/epic91/RaoParameters_case_91_1_12.json | 2 +- .../files/configurations/epic91/RaoParameters_case_91_1_3.json | 2 +- .../files/configurations/epic91/RaoParameters_case_91_1_6.json | 2 +- .../files/configurations/epic91/RaoParameters_case_91_1_7.json | 2 +- .../epic91/RaoParameters_interrupt_search_tree.json | 2 +- .../epic91/RaoParameters_interrupt_search_tree_2_threads.json | 2 +- .../epic91/RaoParameters_maxMargin_mw_ac_lf_false_3_100.json | 2 +- .../RaoParameters_maxMargin_mw_ac_lf_false_3_100_mip.json | 2 +- .../configurations/epic92/RaoParameters_dc_minObjective.json | 2 +- .../epic92/RaoParameters_dc_minObjective_maxDepth1.json | 2 +- .../epic92/RaoParameters_margin_dc_minObjective.json | 2 +- .../rao1/RaoParameters_maxMargin_ampere_highPSTcost.json | 2 +- 128 files changed, 128 insertions(+), 128 deletions(-) diff --git a/docs/parameters.md b/docs/parameters.md index 74058991a5..73db38c2bd 100644 --- 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 index ef36c70549..9d153d3292 100644 --- 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 index 95341b096f..8a6b10e6cc 100644 --- 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 index 0556eb9a8f..faf52c2a1c 100644 --- 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" } \ No newline at end of file diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParametersSet_v2.json b/ra-optimisation/rao-api/src/test/resources/RaoParametersSet_v2.json index 40ee7e2056..479a3f1acb 100644 --- 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 index 8eaf8c4375..ed972e8c6a 100644 --- 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 index 6099cf4d99..d89bfa1951 100644 --- 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 index a69d596844..c9273be38e 100644 --- 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 index bd8bcb1a1e..751edb8b6c 100644 --- 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 index cfc64ea2c9..3b4ac7e7e7 100644 --- 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 index 13dbea6a07..f691f800b7 100644 --- 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 index 20d09cddc3..6e5259d5fb 100644 --- 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 index 1685f3c64a..aeae1e42a7 100644 --- 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 index 5184a2987a..e3f58641e1 100644 --- 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 index 93deaa3b3f..52996adc56 100644 --- 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 index 8afc024408..a41386c477 100644 --- 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 index 449e7859d8..faa076ecdd 100644 --- 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 index c56f064114..91b8b56f0b 100644 --- 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 index 7ed712e939..bf3a91edab 100644 --- 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/ra-optimisation/search-tree-rao/src/test/resources/parameters/RaoParameters_dc_minObjective.json b/ra-optimisation/search-tree-rao/src/test/resources/parameters/RaoParameters_dc_minObjective.json index 7e5bbf8590..7c1eef20ba 100644 --- a/ra-optimisation/search-tree-rao/src/test/resources/parameters/RaoParameters_dc_minObjective.json +++ b/ra-optimisation/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/ra-optimisation/search-tree-rao/src/test/resources/parameters/RaoParameters_oneIteration_v2.json b/ra-optimisation/search-tree-rao/src/test/resources/parameters/RaoParameters_oneIteration_v2.json index 55c1c1bf09..3520d870ea 100644 --- a/ra-optimisation/search-tree-rao/src/test/resources/parameters/RaoParameters_oneIteration_v2.json +++ b/ra-optimisation/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 index b8c9ca6476..274aa15e68 100644 --- 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 index a8d4c78616..b9e2a6dc21 100644 --- 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 index db8c8ea82d..e3de9abc07 100644 --- 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 index 8ac06e7963..546bc5d150 100644 --- 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/tests/src/test/resources/files/configurations/common/RaoParameters_maxMargin_ampere_withFallback.json b/tests/src/test/resources/files/configurations/common/RaoParameters_maxMargin_ampere_withFallback.json index 404d17d15d..2e21c11994 100644 --- a/tests/src/test/resources/files/configurations/common/RaoParameters_maxMargin_ampere_withFallback.json +++ b/tests/src/test/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/tests/src/test/resources/files/configurations/common/RaoParameters_maxMargin_megawatt_ac.json b/tests/src/test/resources/files/configurations/common/RaoParameters_maxMargin_megawatt_ac.json index 8272abd698..ec101d07c4 100644 --- a/tests/src/test/resources/files/configurations/common/RaoParameters_maxMargin_megawatt_ac.json +++ b/tests/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/tests/src/test/resources/files/configurations/common/RaoParameters_maxMargin_megawatt_dc.json b/tests/src/test/resources/files/configurations/common/RaoParameters_maxMargin_megawatt_dc.json index ed9eb8cb5c..53e866dc64 100644 --- a/tests/src/test/resources/files/configurations/common/RaoParameters_maxMargin_megawatt_dc.json +++ b/tests/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/tests/src/test/resources/files/configurations/common/RaoParameters_maxMargin_megawatt_dc_withLoopFlows.json b/tests/src/test/resources/files/configurations/common/RaoParameters_maxMargin_megawatt_dc_withLoopFlows.json index 023a0a20e1..95a2b1b2eb 100644 --- a/tests/src/test/resources/files/configurations/common/RaoParameters_maxMargin_megawatt_dc_withLoopFlows.json +++ b/tests/src/test/resources/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 index 4eb5eb2aef..ce0ea42854 100644 --- 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/tests/src/test/resources/files/configurations/common/RaoParameters_posMargin_ampere_withFallback.json b/tests/src/test/resources/files/configurations/common/RaoParameters_posMargin_ampere_withFallback.json index 5377f7f1e9..f0ac339952 100644 --- a/tests/src/test/resources/files/configurations/common/RaoParameters_posMargin_ampere_withFallback.json +++ b/tests/src/test/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/tests/src/test/resources/files/configurations/common/RaoParameters_posMargin_megawatt_ac.json b/tests/src/test/resources/files/configurations/common/RaoParameters_posMargin_megawatt_ac.json index ccc83ca767..65e62a26aa 100644 --- a/tests/src/test/resources/files/configurations/common/RaoParameters_posMargin_megawatt_ac.json +++ b/tests/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/tests/src/test/resources/files/configurations/common/RaoParameters_posMargin_megawatt_dc.json b/tests/src/test/resources/files/configurations/common/RaoParameters_posMargin_megawatt_dc.json index 55038cb4f4..885c393a81 100644 --- a/tests/src/test/resources/files/configurations/common/RaoParameters_posMargin_megawatt_dc.json +++ b/tests/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 index 4222ea3410..323f649f90 100644 --- 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 index b3c1ef8041..f320cfe8f2 100644 --- 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 index 8cbdaa60f3..572c15c4d7 100644 --- 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 index ed520fc037..b7b1b07c82 100644 --- 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 index 2571dc6f24..c4b3ec21a2 100644 --- 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 index 89b470de4a..9fdd12f2bf 100644 --- 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 index aa752b3bfe..342e3e133a 100644 --- 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/tests/src/test/resources/files/configurations/epic11/RaoParameters_maxMargin_megawatt_ac_mnecDimin180.json b/tests/src/test/resources/files/configurations/epic11/RaoParameters_maxMargin_megawatt_ac_mnecDimin180.json index d3ad738640..d8a6bac2e4 100644 --- a/tests/src/test/resources/files/configurations/epic11/RaoParameters_maxMargin_megawatt_ac_mnecDimin180.json +++ b/tests/src/test/resources/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/tests/src/test/resources/files/configurations/epic11/RaoParameters_maxMargin_megawatt_ac_mnecDimin20.json b/tests/src/test/resources/files/configurations/epic11/RaoParameters_maxMargin_megawatt_ac_mnecDimin20.json index 23e9701c8d..6d6d27be17 100644 --- a/tests/src/test/resources/files/configurations/epic11/RaoParameters_maxMargin_megawatt_ac_mnecDimin20.json +++ b/tests/src/test/resources/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/tests/src/test/resources/files/configurations/epic11/RaoParameters_posMargin_ampere_mnecDiminMinusInf.json b/tests/src/test/resources/files/configurations/epic11/RaoParameters_posMargin_ampere_mnecDiminMinusInf.json index 770a88519a..2885e6015e 100644 --- a/tests/src/test/resources/files/configurations/epic11/RaoParameters_posMargin_ampere_mnecDiminMinusInf.json +++ b/tests/src/test/resources/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 index fa7c3d41ba..6f52045ee7 100644 --- 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/tests/src/test/resources/files/configurations/epic12/raoParametersSweIDCC_minObjectiveDisabled2P.json b/tests/src/test/resources/files/configurations/epic12/raoParametersSweIDCC_minObjectiveDisabled2P.json index a10794da0d..9c7033d7c0 100644 --- a/tests/src/test/resources/files/configurations/epic12/raoParametersSweIDCC_minObjectiveDisabled2P.json +++ b/tests/src/test/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/tests/src/test/resources/files/configurations/epic12/raoParametersSweIDCC_minObjectiveWithGlobal2P.json b/tests/src/test/resources/files/configurations/epic12/raoParametersSweIDCC_minObjectiveWithGlobal2P.json index 9d3d966e60..42dfc903ad 100644 --- a/tests/src/test/resources/files/configurations/epic12/raoParametersSweIDCC_minObjectiveWithGlobal2P.json +++ b/tests/src/test/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 index e737e0e6b1..4a40787b9c 100644 --- 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 index 9305a2f455..f2dd558c01 100644 --- 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/tests/src/test/resources/files/configurations/epic13/RaoParameters_best_preventive_by_300_secure.json b/tests/src/test/resources/files/configurations/epic13/RaoParameters_best_preventive_by_300_secure.json index 10912e2377..bde6df527d 100644 --- a/tests/src/test/resources/files/configurations/epic13/RaoParameters_best_preventive_by_300_secure.json +++ b/tests/src/test/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/tests/src/test/resources/files/configurations/epic13/RaoParameters_best_preventive_by_500.json b/tests/src/test/resources/files/configurations/epic13/RaoParameters_best_preventive_by_500.json index 16711d3b7d..ec2a49b86e 100644 --- a/tests/src/test/resources/files/configurations/epic13/RaoParameters_best_preventive_by_500.json +++ b/tests/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/tests/src/test/resources/files/configurations/epic13/RaoParameters_best_preventive_by_628.json b/tests/src/test/resources/files/configurations/epic13/RaoParameters_best_preventive_by_628.json index c44f09b01b..c4afc1d0bc 100644 --- a/tests/src/test/resources/files/configurations/epic13/RaoParameters_best_preventive_by_628.json +++ b/tests/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 index 60a352ec6c..f437732568 100644 --- 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 index d8020cc1a7..bfccd8c470 100644 --- 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/tests/src/test/resources/files/configurations/epic13/RaoParameters_maxMargin_ampere_2p_global.json b/tests/src/test/resources/files/configurations/epic13/RaoParameters_maxMargin_ampere_2p_global.json index 79f0f64451..75b8c14204 100644 --- a/tests/src/test/resources/files/configurations/epic13/RaoParameters_maxMargin_ampere_2p_global.json +++ b/tests/src/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/tests/src/test/resources/files/configurations/epic13/RaoParameters_maxMargin_ampere_absolute_threshold.json b/tests/src/test/resources/files/configurations/epic13/RaoParameters_maxMargin_ampere_absolute_threshold.json index 24ce1f6a25..ae04e4472c 100644 --- a/tests/src/test/resources/files/configurations/epic13/RaoParameters_maxMargin_ampere_absolute_threshold.json +++ b/tests/src/test/resources/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/tests/src/test/resources/files/configurations/epic13/RaoParameters_maxMargin_ampere_absolute_threshold_12.json b/tests/src/test/resources/files/configurations/epic13/RaoParameters_maxMargin_ampere_absolute_threshold_12.json index 8829b892db..4f8d17f6c1 100644 --- a/tests/src/test/resources/files/configurations/epic13/RaoParameters_maxMargin_ampere_absolute_threshold_12.json +++ b/tests/src/test/resources/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", diff --git a/tests/src/test/resources/files/configurations/epic13/RaoParameters_relMargin_ampere.json b/tests/src/test/resources/files/configurations/epic13/RaoParameters_relMargin_ampere.json index 9abf6fcdbc..5ea60580b0 100644 --- a/tests/src/test/resources/files/configurations/epic13/RaoParameters_relMargin_ampere.json +++ b/tests/src/test/resources/files/configurations/epic13/RaoParameters_relMargin_ampere.json @@ -1,5 +1,5 @@ { - "version" : "2.5", + "version" : "3.0", "objective-function" : { "type" : "MAX_MIN_RELATIVE_MARGIN", "unit" : "A", diff --git a/tests/src/test/resources/files/configurations/epic13/RaoParameters_stop_curative_at_preventive.json b/tests/src/test/resources/files/configurations/epic13/RaoParameters_stop_curative_at_preventive.json index 6a1f69893e..0753793218 100644 --- a/tests/src/test/resources/files/configurations/epic13/RaoParameters_stop_curative_at_preventive.json +++ b/tests/src/test/resources/files/configurations/epic13/RaoParameters_stop_curative_at_preventive.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/epic15/RaoParameters_ep15us11-2.json b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us11-2.json index 7bfe9afd7e..0e96a3cee8 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us11-2.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us11-2.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/epic15/RaoParameters_ep15us11-4.json b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us11-4.json index 974361adf5..5410dd5787 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us11-4.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us11-4.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/epic15/RaoParameters_ep15us11-5-1.json b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us11-5-1.json index 66796a1e8a..5e7179ccce 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us11-5-1.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us11-5-1.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/epic15/RaoParameters_ep15us11-5-2.json b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us11-5-2.json index 23188b44bc..f5bed932b6 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us11-5-2.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us11-5-2.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/epic15/RaoParameters_ep15us11-5-3-3.json b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us11-5-3-3.json index 8900873f45..a2be72b13b 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us11-5-3-3.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us11-5-3-3.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/epic15/RaoParameters_ep15us13case1.json b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case1.json index ba1451e9e5..8bcf003f68 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case1.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case1.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/epic15/RaoParameters_ep15us13case10.json b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case10.json index ce7ef37b52..8e77d306d9 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case10.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case10.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/epic15/RaoParameters_ep15us13case2.json b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case2.json index 50c49e933f..de69c3c422 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case2.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case2.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/epic15/RaoParameters_ep15us13case5.json b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case5.json index cd680fefdf..bd8b3dfcd0 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case5.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case5.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/epic15/RaoParameters_ep15us13case6.json b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case6.json index 95f80e8a6a..8c23c5a228 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case6.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case6.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/epic15/RaoParameters_ep15us13case7.json b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case7.json index 1e3a84d337..8a49485099 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case7.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case7.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/epic15/RaoParameters_ep15us13case8.json b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case8.json index fedc474ff7..c632b04582 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case8.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case8.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/epic15/RaoParameters_ep15us17case10.json b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case10.json index 914f446466..00b6c1cd9f 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case10.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case10.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/epic15/RaoParameters_ep15us17case11.json b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case11.json index 914f446466..00b6c1cd9f 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case11.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case11.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/epic15/RaoParameters_ep15us17case12.json b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case12.json index 4d1565bdb1..4cd4b14263 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case12.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case12.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/epic15/RaoParameters_ep15us17case2.json b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case2.json index ddb9b28793..bec2abb42d 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case2.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case2.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/epic15/RaoParameters_ep15us17case6.json b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case6.json index ddb9b28793..bec2abb42d 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case6.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case6.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/epic15/RaoParameters_ep15us7-2.json b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us7-2.json index 286c06b138..472040e639 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us7-2.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us7-2.json @@ -1,5 +1,5 @@ { - "version" : "2.5", + "version" : "3.0", "objective-function" : { "type" : "MAX_MIN_MARGIN" }, diff --git a/tests/src/test/resources/files/configurations/epic15/raoParametersSweIDCC_withoutPsts.json b/tests/src/test/resources/files/configurations/epic15/raoParametersSweIDCC_withoutPsts.json index b4cc20f67e..c65dd2fe53 100644 --- a/tests/src/test/resources/files/configurations/epic15/raoParametersSweIDCC_withoutPsts.json +++ b/tests/src/test/resources/files/configurations/epic15/raoParametersSweIDCC_withoutPsts.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/epic19/RaoParameters_19_10_10&11.json b/tests/src/test/resources/files/configurations/epic19/RaoParameters_19_10_10&11.json index cf31d3656b..a6fb1a3a1f 100644 --- a/tests/src/test/resources/files/configurations/epic19/RaoParameters_19_10_10&11.json +++ b/tests/src/test/resources/files/configurations/epic19/RaoParameters_19_10_10&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/epic19/RaoParameters_19_11_9.json b/tests/src/test/resources/files/configurations/epic19/RaoParameters_19_11_9.json index 336e422407..85b54f7575 100644 --- a/tests/src/test/resources/files/configurations/epic19/RaoParameters_19_11_9.json +++ b/tests/src/test/resources/files/configurations/epic19/RaoParameters_19_11_9.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/epic19/RaoParameters_19_11_9_bis.json b/tests/src/test/resources/files/configurations/epic19/RaoParameters_19_11_9_bis.json index 0d3a29eb91..2bb3f346af 100644 --- a/tests/src/test/resources/files/configurations/epic19/RaoParameters_19_11_9_bis.json +++ b/tests/src/test/resources/files/configurations/epic19/RaoParameters_19_11_9_bis.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/epic19/RaoParameters_dc_discrete.json b/tests/src/test/resources/files/configurations/epic19/RaoParameters_dc_discrete.json index 62048daf53..afe993238b 100644 --- a/tests/src/test/resources/files/configurations/epic19/RaoParameters_dc_discrete.json +++ b/tests/src/test/resources/files/configurations/epic19/RaoParameters_dc_discrete.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/epic19/RaoParameters_maxMargin_ampere_shareCra.json b/tests/src/test/resources/files/configurations/epic19/RaoParameters_maxMargin_ampere_shareCra.json index a96942fccb..912849a989 100644 --- a/tests/src/test/resources/files/configurations/epic19/RaoParameters_maxMargin_ampere_shareCra.json +++ b/tests/src/test/resources/files/configurations/epic19/RaoParameters_maxMargin_ampere_shareCra.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/epic19/RaoParameters_maxMargin_megawatt_shareCra.json b/tests/src/test/resources/files/configurations/epic19/RaoParameters_maxMargin_megawatt_shareCra.json index 8974ed9d8f..ff34d2dd54 100644 --- a/tests/src/test/resources/files/configurations/epic19/RaoParameters_maxMargin_megawatt_shareCra.json +++ b/tests/src/test/resources/files/configurations/epic19/RaoParameters_maxMargin_megawatt_shareCra.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/epic19/RaoParameters_maxRelMargin_ampere_shareCra.json b/tests/src/test/resources/files/configurations/epic19/RaoParameters_maxRelMargin_ampere_shareCra.json index 1d2b1156a8..4195b906b9 100644 --- a/tests/src/test/resources/files/configurations/epic19/RaoParameters_maxRelMargin_ampere_shareCra.json +++ b/tests/src/test/resources/files/configurations/epic19/RaoParameters_maxRelMargin_ampere_shareCra.json @@ -1,5 +1,5 @@ { - "version" : "2.5", + "version" : "3.0", "objective-function" : { "type" : "MAX_MIN_RELATIVE_MARGIN", "unit" : "A", diff --git a/tests/src/test/resources/files/configurations/epic19/RaoParameters_maxRelMargin_ampere_shareCra_mip.json b/tests/src/test/resources/files/configurations/epic19/RaoParameters_maxRelMargin_ampere_shareCra_mip.json index f3a17cd1ce..357d0b8e0e 100644 --- a/tests/src/test/resources/files/configurations/epic19/RaoParameters_maxRelMargin_ampere_shareCra_mip.json +++ b/tests/src/test/resources/files/configurations/epic19/RaoParameters_maxRelMargin_ampere_shareCra_mip.json @@ -1,5 +1,5 @@ { - "version" : "2.5", + "version" : "3.0", "objective-function" : { "type" : "MAX_MIN_RELATIVE_MARGIN", "unit" : "A", diff --git a/tests/src/test/resources/files/configurations/epic19/RaoParameters_maxRelMargin_megawatt_shareCra.json b/tests/src/test/resources/files/configurations/epic19/RaoParameters_maxRelMargin_megawatt_shareCra.json index b69606dd22..0ea90e2e5b 100644 --- a/tests/src/test/resources/files/configurations/epic19/RaoParameters_maxRelMargin_megawatt_shareCra.json +++ b/tests/src/test/resources/files/configurations/epic19/RaoParameters_maxRelMargin_megawatt_shareCra.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/epic19/RaoParameters_maxRelMargin_megawatt_shareCra_mip.json b/tests/src/test/resources/files/configurations/epic19/RaoParameters_maxRelMargin_megawatt_shareCra_mip.json index a1fb49fc4b..d4fbffb068 100644 --- a/tests/src/test/resources/files/configurations/epic19/RaoParameters_maxRelMargin_megawatt_shareCra_mip.json +++ b/tests/src/test/resources/files/configurations/epic19/RaoParameters_maxRelMargin_megawatt_shareCra_mip.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/epic20/RaoParameters_20_4.json b/tests/src/test/resources/files/configurations/epic20/RaoParameters_20_4.json index f69876b3ac..7a91bdf0a6 100644 --- a/tests/src/test/resources/files/configurations/epic20/RaoParameters_20_4.json +++ b/tests/src/test/resources/files/configurations/epic20/RaoParameters_20_4.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/epic20/RaoParameters_20_6_1.json b/tests/src/test/resources/files/configurations/epic20/RaoParameters_20_6_1.json index 5f775a8b86..4e5c28cf99 100644 --- a/tests/src/test/resources/files/configurations/epic20/RaoParameters_20_6_1.json +++ b/tests/src/test/resources/files/configurations/epic20/RaoParameters_20_6_1.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/epic20/RaoParameters_20_6_2.json b/tests/src/test/resources/files/configurations/epic20/RaoParameters_20_6_2.json index 75f27a56f6..c3b46c929f 100644 --- a/tests/src/test/resources/files/configurations/epic20/RaoParameters_20_6_2.json +++ b/tests/src/test/resources/files/configurations/epic20/RaoParameters_20_6_2.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/epic20/RaoParameters_maxMargin_MW_DC_withLF_with2P.json b/tests/src/test/resources/files/configurations/epic20/RaoParameters_maxMargin_MW_DC_withLF_with2P.json index 5bcf5a5f08..2da8b7dee3 100644 --- a/tests/src/test/resources/files/configurations/epic20/RaoParameters_maxMargin_MW_DC_withLF_with2P.json +++ b/tests/src/test/resources/files/configurations/epic20/RaoParameters_maxMargin_MW_DC_withLF_with2P.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/epic20/RaoParameters_maxMargin_ampere_2p_if_cost_increase.json b/tests/src/test/resources/files/configurations/epic20/RaoParameters_maxMargin_ampere_2p_if_cost_increase.json index 4709606af9..53d1b496d5 100644 --- a/tests/src/test/resources/files/configurations/epic20/RaoParameters_maxMargin_ampere_2p_if_cost_increase.json +++ b/tests/src/test/resources/files/configurations/epic20/RaoParameters_maxMargin_ampere_2p_if_cost_increase.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/epic20/RaoParameters_maxMargin_ampere_forbid_cost_increase.json b/tests/src/test/resources/files/configurations/epic20/RaoParameters_maxMargin_ampere_forbid_cost_increase.json index db8c8ea82d..e3de9abc07 100644 --- a/tests/src/test/resources/files/configurations/epic20/RaoParameters_maxMargin_ampere_forbid_cost_increase.json +++ b/tests/src/test/resources/files/configurations/epic20/RaoParameters_maxMargin_ampere_forbid_cost_increase.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/epic20/RaoParameters_maxMargin_ampere_second_preventive.json b/tests/src/test/resources/files/configurations/epic20/RaoParameters_maxMargin_ampere_second_preventive.json index 3c9518e222..bbf1182577 100644 --- a/tests/src/test/resources/files/configurations/epic20/RaoParameters_maxMargin_ampere_second_preventive.json +++ b/tests/src/test/resources/files/configurations/epic20/RaoParameters_maxMargin_ampere_second_preventive.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/epic4/RaoParameters_posMargin_ampere_ac_divergence.json b/tests/src/test/resources/files/configurations/epic4/RaoParameters_posMargin_ampere_ac_divergence.json index 2c4fd088d2..823264d01a 100644 --- a/tests/src/test/resources/files/configurations/epic4/RaoParameters_posMargin_ampere_ac_divergence.json +++ b/tests/src/test/resources/files/configurations/epic4/RaoParameters_posMargin_ampere_ac_divergence.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/epic4/RaoParameters_posMargin_ampere_withFallback_ac_divergence.json b/tests/src/test/resources/files/configurations/epic4/RaoParameters_posMargin_ampere_withFallback_ac_divergence.json index 1fa959814d..4d99685be3 100644 --- a/tests/src/test/resources/files/configurations/epic4/RaoParameters_posMargin_ampere_withFallback_ac_divergence.json +++ b/tests/src/test/resources/files/configurations/epic4/RaoParameters_posMargin_ampere_withFallback_ac_divergence.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/epic4/RaoParameters_posMargin_ampere_withFallback_differentFallbackCost.json b/tests/src/test/resources/files/configurations/epic4/RaoParameters_posMargin_ampere_withFallback_differentFallbackCost.json index fecd974c3f..4b55716ef7 100644 --- a/tests/src/test/resources/files/configurations/epic4/RaoParameters_posMargin_ampere_withFallback_differentFallbackCost.json +++ b/tests/src/test/resources/files/configurations/epic4/RaoParameters_posMargin_ampere_withFallback_differentFallbackCost.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/epic5/RaoParameters_maxMargin_absoluteMinImpact190.json b/tests/src/test/resources/files/configurations/epic5/RaoParameters_maxMargin_absoluteMinImpact190.json index f5bba69bd5..2a22566be3 100644 --- a/tests/src/test/resources/files/configurations/epic5/RaoParameters_maxMargin_absoluteMinImpact190.json +++ b/tests/src/test/resources/files/configurations/epic5/RaoParameters_maxMargin_absoluteMinImpact190.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/epic5/RaoParameters_maxMargin_absoluteMinImpact195.json b/tests/src/test/resources/files/configurations/epic5/RaoParameters_maxMargin_absoluteMinImpact195.json index 5b2819840c..f913be1952 100644 --- a/tests/src/test/resources/files/configurations/epic5/RaoParameters_maxMargin_absoluteMinImpact195.json +++ b/tests/src/test/resources/files/configurations/epic5/RaoParameters_maxMargin_absoluteMinImpact195.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/epic5/RaoParameters_maxMargin_maxDepth.json b/tests/src/test/resources/files/configurations/epic5/RaoParameters_maxMargin_maxDepth.json index eecc005c58..713f990d81 100644 --- a/tests/src/test/resources/files/configurations/epic5/RaoParameters_maxMargin_maxDepth.json +++ b/tests/src/test/resources/files/configurations/epic5/RaoParameters_maxMargin_maxDepth.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/epic5/RaoParameters_maxMargin_relativeMinImpact.json b/tests/src/test/resources/files/configurations/epic5/RaoParameters_maxMargin_relativeMinImpact.json index d9eca7ad09..3ef6e5669e 100644 --- a/tests/src/test/resources/files/configurations/epic5/RaoParameters_maxMargin_relativeMinImpact.json +++ b/tests/src/test/resources/files/configurations/epic5/RaoParameters_maxMargin_relativeMinImpact.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/epic7/RaoParameters_maxMargin_mw_ac_lf_false_10_100.json b/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_ac_lf_false_10_100.json index b41fc49f28..8464f02e29 100644 --- a/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_ac_lf_false_10_100.json +++ b/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_ac_lf_false_10_100.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/epic7/RaoParameters_maxMargin_mw_ac_lf_false_5_100.json b/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_ac_lf_false_5_100.json index 6f13a2ea83..9b1ee9c7d2 100644 --- a/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_ac_lf_false_5_100.json +++ b/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_ac_lf_false_5_100.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/epic7/RaoParameters_maxMargin_mw_ac_lf_false_5_100_BE_NL.json b/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_ac_lf_false_5_100_BE_NL.json index 3d63cbc7fa..f951ebb17d 100644 --- a/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_ac_lf_false_5_100_BE_NL.json +++ b/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_ac_lf_false_5_100_BE_NL.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/epic7/RaoParameters_maxMargin_mw_ac_lf_false_5_100_NL.json b/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_ac_lf_false_5_100_NL.json index 1e832c01cf..5e6b3682b5 100644 --- a/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_ac_lf_false_5_100_NL.json +++ b/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_ac_lf_false_5_100_NL.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/epic7/RaoParameters_maxMargin_mw_ac_lf_false_5_100_lfAugmentation.json b/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_ac_lf_false_5_100_lfAugmentation.json index 38f8038c9c..cec026927e 100644 --- a/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_ac_lf_false_5_100_lfAugmentation.json +++ b/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_ac_lf_false_5_100_lfAugmentation.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/epic7/RaoParameters_maxMargin_mw_ac_lf_true_5_100.json b/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_ac_lf_true_5_100.json index f9bbefe513..e1d04419ef 100644 --- a/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_ac_lf_true_5_100.json +++ b/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_ac_lf_true_5_100.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/epic7/RaoParameters_maxMargin_mw_dc_lf_accurate_5_100.json b/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_dc_lf_accurate_5_100.json index 91a9c4528f..f306d1e230 100644 --- a/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_dc_lf_accurate_5_100.json +++ b/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_dc_lf_accurate_5_100.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/epic7/RaoParameters_maxMargin_mw_dc_lf_false_10_100.json b/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_dc_lf_false_10_100.json index f3af918661..ba505c48f9 100644 --- a/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_dc_lf_false_10_100.json +++ b/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_dc_lf_false_10_100.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/epic7/RaoParameters_maxMargin_mw_dc_lf_false_5_100.json b/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_dc_lf_false_5_100.json index f8a8497851..68e08ef5f2 100644 --- a/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_dc_lf_false_5_100.json +++ b/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_dc_lf_false_5_100.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/epic7/RaoParameters_maxMargin_mw_dc_lf_inBetween_5_100.json b/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_dc_lf_inBetween_5_100.json index 167f083ee3..918000e7ac 100644 --- a/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_dc_lf_inBetween_5_100.json +++ b/tests/src/test/resources/files/configurations/epic7/RaoParameters_maxMargin_mw_dc_lf_inBetween_5_100.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/epic91/RaoParameters_case_91_12_search_tree.json b/tests/src/test/resources/files/configurations/epic91/RaoParameters_case_91_12_search_tree.json index 6143f91e84..0acdf5fd1d 100644 --- a/tests/src/test/resources/files/configurations/epic91/RaoParameters_case_91_12_search_tree.json +++ b/tests/src/test/resources/files/configurations/epic91/RaoParameters_case_91_12_search_tree.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/epic91/RaoParameters_case_91_12_secure.json b/tests/src/test/resources/files/configurations/epic91/RaoParameters_case_91_12_secure.json index 06681877f0..c6a325aaa6 100644 --- a/tests/src/test/resources/files/configurations/epic91/RaoParameters_case_91_12_secure.json +++ b/tests/src/test/resources/files/configurations/epic91/RaoParameters_case_91_12_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/epic91/RaoParameters_case_91_12_secure_2PRAO.json b/tests/src/test/resources/files/configurations/epic91/RaoParameters_case_91_12_secure_2PRAO.json index 643beb08da..b3823ed519 100644 --- a/tests/src/test/resources/files/configurations/epic91/RaoParameters_case_91_12_secure_2PRAO.json +++ b/tests/src/test/resources/files/configurations/epic91/RaoParameters_case_91_12_secure_2PRAO.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/epic91/RaoParameters_case_91_13_1.json b/tests/src/test/resources/files/configurations/epic91/RaoParameters_case_91_13_1.json index cbb89cbbf7..15f96de867 100644 --- a/tests/src/test/resources/files/configurations/epic91/RaoParameters_case_91_13_1.json +++ b/tests/src/test/resources/files/configurations/epic91/RaoParameters_case_91_13_1.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/epic91/RaoParameters_case_91_1_1.json b/tests/src/test/resources/files/configurations/epic91/RaoParameters_case_91_1_1.json index b96d3b9500..2dd1e27ff9 100644 --- a/tests/src/test/resources/files/configurations/epic91/RaoParameters_case_91_1_1.json +++ b/tests/src/test/resources/files/configurations/epic91/RaoParameters_case_91_1_1.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/epic91/RaoParameters_case_91_1_12.json b/tests/src/test/resources/files/configurations/epic91/RaoParameters_case_91_1_12.json index 58d12d7e25..2db8b5256c 100644 --- a/tests/src/test/resources/files/configurations/epic91/RaoParameters_case_91_1_12.json +++ b/tests/src/test/resources/files/configurations/epic91/RaoParameters_case_91_1_12.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/epic91/RaoParameters_case_91_1_3.json b/tests/src/test/resources/files/configurations/epic91/RaoParameters_case_91_1_3.json index 187552f571..30eaf589d1 100644 --- a/tests/src/test/resources/files/configurations/epic91/RaoParameters_case_91_1_3.json +++ b/tests/src/test/resources/files/configurations/epic91/RaoParameters_case_91_1_3.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/epic91/RaoParameters_case_91_1_6.json b/tests/src/test/resources/files/configurations/epic91/RaoParameters_case_91_1_6.json index 97b8085f22..3c659828c0 100644 --- a/tests/src/test/resources/files/configurations/epic91/RaoParameters_case_91_1_6.json +++ b/tests/src/test/resources/files/configurations/epic91/RaoParameters_case_91_1_6.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/epic91/RaoParameters_case_91_1_7.json b/tests/src/test/resources/files/configurations/epic91/RaoParameters_case_91_1_7.json index 6694d76039..914da7db67 100644 --- a/tests/src/test/resources/files/configurations/epic91/RaoParameters_case_91_1_7.json +++ b/tests/src/test/resources/files/configurations/epic91/RaoParameters_case_91_1_7.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/epic91/RaoParameters_interrupt_search_tree.json b/tests/src/test/resources/files/configurations/epic91/RaoParameters_interrupt_search_tree.json index feaff6f1a2..6371439e6d 100644 --- a/tests/src/test/resources/files/configurations/epic91/RaoParameters_interrupt_search_tree.json +++ b/tests/src/test/resources/files/configurations/epic91/RaoParameters_interrupt_search_tree.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/epic91/RaoParameters_interrupt_search_tree_2_threads.json b/tests/src/test/resources/files/configurations/epic91/RaoParameters_interrupt_search_tree_2_threads.json index 43469b3c63..969e36b821 100644 --- a/tests/src/test/resources/files/configurations/epic91/RaoParameters_interrupt_search_tree_2_threads.json +++ b/tests/src/test/resources/files/configurations/epic91/RaoParameters_interrupt_search_tree_2_threads.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/epic91/RaoParameters_maxMargin_mw_ac_lf_false_3_100.json b/tests/src/test/resources/files/configurations/epic91/RaoParameters_maxMargin_mw_ac_lf_false_3_100.json index e033af16b1..96023a2354 100644 --- a/tests/src/test/resources/files/configurations/epic91/RaoParameters_maxMargin_mw_ac_lf_false_3_100.json +++ b/tests/src/test/resources/files/configurations/epic91/RaoParameters_maxMargin_mw_ac_lf_false_3_100.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/epic91/RaoParameters_maxMargin_mw_ac_lf_false_3_100_mip.json b/tests/src/test/resources/files/configurations/epic91/RaoParameters_maxMargin_mw_ac_lf_false_3_100_mip.json index 93a87cc184..4b0fb6d696 100644 --- a/tests/src/test/resources/files/configurations/epic91/RaoParameters_maxMargin_mw_ac_lf_false_3_100_mip.json +++ b/tests/src/test/resources/files/configurations/epic91/RaoParameters_maxMargin_mw_ac_lf_false_3_100_mip.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/epic92/RaoParameters_dc_minObjective.json b/tests/src/test/resources/files/configurations/epic92/RaoParameters_dc_minObjective.json index 7e5bbf8590..7c1eef20ba 100644 --- a/tests/src/test/resources/files/configurations/epic92/RaoParameters_dc_minObjective.json +++ b/tests/src/test/resources/files/configurations/epic92/RaoParameters_dc_minObjective.json @@ -1,5 +1,5 @@ { - "version" : "2.5", + "version" : "3.0", "objective-function" : { "type" : "MIN_COST", "unit" : "MW", diff --git a/tests/src/test/resources/files/configurations/epic92/RaoParameters_dc_minObjective_maxDepth1.json b/tests/src/test/resources/files/configurations/epic92/RaoParameters_dc_minObjective_maxDepth1.json index 0b9bb54d8c..cd0a819737 100644 --- a/tests/src/test/resources/files/configurations/epic92/RaoParameters_dc_minObjective_maxDepth1.json +++ b/tests/src/test/resources/files/configurations/epic92/RaoParameters_dc_minObjective_maxDepth1.json @@ -1,5 +1,5 @@ { - "version" : "2.5", + "version" : "3.0", "objective-function" : { "type" : "MIN_COST", "unit" : "MW", diff --git a/tests/src/test/resources/files/configurations/epic92/RaoParameters_margin_dc_minObjective.json b/tests/src/test/resources/files/configurations/epic92/RaoParameters_margin_dc_minObjective.json index 8dfda041e8..dfabc9a747 100644 --- a/tests/src/test/resources/files/configurations/epic92/RaoParameters_margin_dc_minObjective.json +++ b/tests/src/test/resources/files/configurations/epic92/RaoParameters_margin_dc_minObjective.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/rao1/RaoParameters_maxMargin_ampere_highPSTcost.json b/tests/src/test/resources/files/configurations/rao1/RaoParameters_maxMargin_ampere_highPSTcost.json index 14e183862e..73ac449949 100644 --- a/tests/src/test/resources/files/configurations/rao1/RaoParameters_maxMargin_ampere_highPSTcost.json +++ b/tests/src/test/resources/files/configurations/rao1/RaoParameters_maxMargin_ampere_highPSTcost.json @@ -1,5 +1,5 @@ { - "version" : "2.5", + "version" : "3.0", "objective-function" : { "type" : "MAX_MIN_MARGIN", "unit" : "A",