From 539cacfece0012ed77f127549c3211109e0c5bbe Mon Sep 17 00:00:00 2001 From: Pauline Jean-Marie Date: Wed, 31 Jul 2024 09:50:42 +0200 Subject: [PATCH] ForbidCostIncrease should always be true (for the optim results to be acceptable) Signed-off-by: Pauline Jean-Marie --- docs/output-data/rao-result/steps.md | 2 +- docs/parameters.md | 12 ------ python-util/rao_parameter_modification.py | 40 +++++++++++++++++++ .../openrao/raoapi/RaoParametersCommons.java | 3 +- .../json/JsonObjectiveFunctionParameters.java | 5 --- .../ObjectiveFunctionParameters.java | 11 ----- .../raoapi/json/JsonRaoParametersTest.java | 1 - .../parameters/RaoParametersConfigTest.java | 2 - .../RaoParametersYamlConfigTest.java | 3 -- .../test/resources/RaoParametersError_v2.json | 2 +- .../test/resources/RaoParametersSet_v2.json | 3 +- ...arametersWithCurStopCriterionError_v2.json | 3 +- .../RaoParametersWithExtension_v2.json | 3 +- .../RaoParametersWithLoopFlowError_v2.json | 3 +- ...rametersWithPrevStopCriterionError_v2.json | 3 +- .../RaoParametersWithWrongField_v2.json | 3 +- .../RaoParameters_config_withExtensions.json | 3 +- .../RaoParameters_config_withOLFParams.json | 3 +- ...rameters_config_withPartialExtensions.json | 3 +- ...aoParameters_config_withoutExtensions.json | 3 +- .../resources/RaoParameters_default_v2.json | 2 +- .../resources/RaoParameters_update_v2.json | 2 +- .../src/test/resources/RaoParameters_v2.json | 3 +- .../test/resources/config_withExtensions.yml | 1 - .../config_withPartialExtensions.yml | 1 - .../resources/config_withoutExtensions.yml | 1 - .../algorithm/CastorFullOptimization.java | 2 +- .../algorithm/CastorFullOptimizationTest.java | 1 - .../parameters/RaoParameters_2P_v2.json | 3 +- .../parameters/RaoParameters_DC.json | 3 +- .../RaoParameters_oneIteration_v2.json | 3 +- .../parameters/RaoParameters_secure.json | 3 +- .../common/RaoParameters_default.json | 3 +- .../RaoParameters_maxMargin_ampere.json | 3 +- .../RaoParameters_maxMargin_ampere_mip.json | 3 +- ...ameters_maxMargin_ampere_withFallback.json | 3 +- .../RaoParameters_maxMargin_megawatt_ac.json | 3 +- .../RaoParameters_maxMargin_megawatt_dc.json | 3 +- ...s_maxMargin_megawatt_dc_withLoopFlows.json | 3 +- .../RaoParameters_posMargin_ampere.json | 3 +- ...ameters_posMargin_ampere_withFallback.json | 3 +- .../RaoParameters_posMargin_megawatt_ac.json | 3 +- .../RaoParameters_posMargin_megawatt_dc.json | 3 +- .../RaoParameters_securityAnalysis.json | 3 +- .../RaoParameters_simple_AC_loopflow.json | 3 +- .../RaoParameters_relMargin_megawatt.json | 3 +- .../epic10/conf_ep10us2case1.json | 3 +- .../epic10/conf_ep10us2case2.json | 3 +- .../epic10/conf_ep10us3case1.json | 3 +- .../epic10/conf_ep10us4case1.json | 3 +- ...rs_maxMargin_megawatt_ac_mnecDimin180.json | 3 +- ...ers_maxMargin_megawatt_ac_mnecDimin20.json | 3 +- ...rs_posMargin_ampere_mnecDiminMinusInf.json | 3 +- .../raoParametersSweIDCC_minObjective.json | 3 +- ...ametersSweIDCC_minObjectiveDisabled2P.json | 3 +- ...etersSweIDCC_minObjectiveWithGlobal2P.json | 3 +- .../epic13/RaoParameters_13_6_11.json | 3 +- .../epic13/RaoParameters_13_6_2.json | 3 +- ...ameters_best_preventive_by_300_secure.json | 3 +- .../RaoParameters_best_preventive_by_500.json | 3 +- .../RaoParameters_best_preventive_by_628.json | 3 +- .../epic13/RaoParameters_ep13us6case8.json | 3 +- .../epic13/RaoParameters_ep13us7case6.json | 3 +- ...Parameters_maxMargin_ampere_2p_global.json | 3 +- ...s_maxMargin_ampere_absolute_threshold.json | 3 +- ...axMargin_ampere_absolute_threshold_12.json | 3 +- .../RaoParameters_relMargin_ampere.json | 3 +- ...arameters_stop_curative_at_preventive.json | 3 +- .../epic15/RaoParameters_ep15us11-2.json | 3 +- .../epic15/RaoParameters_ep15us11-4.json | 3 +- .../epic15/RaoParameters_ep15us11-5-1.json | 3 +- .../epic15/RaoParameters_ep15us11-5-2.json | 3 +- .../epic15/RaoParameters_ep15us11-5-3-3.json | 3 +- .../epic15/RaoParameters_ep15us13case1.json | 3 +- .../epic15/RaoParameters_ep15us13case10.json | 3 +- .../epic15/RaoParameters_ep15us13case2.json | 3 +- .../epic15/RaoParameters_ep15us13case5.json | 3 +- .../epic15/RaoParameters_ep15us13case6.json | 3 +- .../epic15/RaoParameters_ep15us13case7.json | 3 +- .../epic15/RaoParameters_ep15us13case8.json | 3 +- .../epic15/RaoParameters_ep15us17case10.json | 3 +- .../epic15/RaoParameters_ep15us17case11.json | 3 +- .../epic15/RaoParameters_ep15us17case12.json | 3 +- .../epic15/RaoParameters_ep15us17case2.json | 3 +- .../epic15/RaoParameters_ep15us17case6.json | 3 +- .../raoParametersSweIDCC_withoutPsts.json | 3 +- .../epic19/RaoParameters_19_10_10&11.json | 3 +- .../epic19/RaoParameters_19_11_9.json | 3 +- .../epic19/RaoParameters_19_11_9_bis.json | 3 +- .../epic19/RaoParameters_dc_discrete.json | 3 +- ...oParameters_maxMargin_ampere_shareCra.json | 3 +- ...arameters_maxMargin_megawatt_shareCra.json | 3 +- ...rameters_maxRelMargin_ampere_shareCra.json | 3 +- ...ters_maxRelMargin_ampere_shareCra_mip.json | 3 +- ...meters_maxRelMargin_megawatt_shareCra.json | 3 +- ...rs_maxRelMargin_megawatt_shareCra_mip.json | 3 +- .../epic20/RaoParameters_20_4.json | 3 +- .../epic20/RaoParameters_20_6_1.json | 3 +- .../epic20/RaoParameters_20_6_2.json | 3 +- ...ameters_maxMargin_MW_DC_withLF_with2P.json | 3 +- ..._maxMargin_ampere_2p_if_cost_increase.json | 3 +- ...maxMargin_ampere_forbid_cost_increase.json | 3 +- ...rs_maxMargin_ampere_second_preventive.json | 3 +- ...meters_posMargin_ampere_ac_divergence.json | 3 +- ...gin_ampere_withFallback_ac_divergence.json | 3 +- ...re_withFallback_differentFallbackCost.json | 3 +- ...meters_maxMargin_absoluteMinImpact190.json | 3 +- ...meters_maxMargin_absoluteMinImpact195.json | 3 +- .../RaoParameters_maxMargin_maxDepth.json | 3 +- ...arameters_maxMargin_relativeMinImpact.json | 3 +- ...eters_maxMargin_mw_ac_lf_false_10_100.json | 3 +- ...meters_maxMargin_mw_ac_lf_false_5_100.json | 3 +- ..._maxMargin_mw_ac_lf_false_5_100_BE_NL.json | 3 +- ...ers_maxMargin_mw_ac_lf_false_5_100_NL.json | 3 +- ...n_mw_ac_lf_false_5_100_lfAugmentation.json | 3 +- ...ameters_maxMargin_mw_ac_lf_true_5_100.json | 3 +- ...ers_maxMargin_mw_dc_lf_accurate_5_100.json | 3 +- ...eters_maxMargin_mw_dc_lf_false_10_100.json | 3 +- ...meters_maxMargin_mw_dc_lf_false_5_100.json | 3 +- ...rs_maxMargin_mw_dc_lf_inBetween_5_100.json | 3 +- .../RaoParameters_case_91_12_search_tree.json | 3 +- .../RaoParameters_case_91_12_secure.json | 3 +- ...RaoParameters_case_91_12_secure_2PRAO.json | 3 +- .../epic91/RaoParameters_case_91_13_1.json | 3 +- .../epic91/RaoParameters_case_91_1_1.json | 3 +- .../epic91/RaoParameters_case_91_1_12.json | 3 +- .../epic91/RaoParameters_case_91_1_3.json | 3 +- .../epic91/RaoParameters_case_91_1_6.json | 3 +- .../epic91/RaoParameters_case_91_1_7.json | 3 +- .../RaoParameters_interrupt_search_tree.json | 3 +- ...eters_interrupt_search_tree_2_threads.json | 3 +- ...meters_maxMargin_mw_ac_lf_false_3_100.json | 3 +- ...rs_maxMargin_mw_ac_lf_false_3_100_mip.json | 3 +- ...rameters_maxMargin_ampere_highPSTcost.json | 3 +- 134 files changed, 163 insertions(+), 279 deletions(-) create mode 100644 python-util/rao_parameter_modification.py diff --git a/docs/output-data/rao-result/steps.md b/docs/output-data/rao-result/steps.md index b5f521cf5d..d0021112e3 100644 --- a/docs/output-data/rao-result/steps.md +++ b/docs/output-data/rao-result/steps.md @@ -1,5 +1,5 @@ This field contains macro information about which steps the [CASTOR RAO](/castor.md#algorithm) executed. -(See also: [Forbidding cost increase](/parameters.md#forbid-cost-increase), [Second preventive RAO parameters](/parameters.md#second-preventive-rao-parameters)) +(See also: [Second preventive RAO parameters](/parameters.md#second-preventive-rao-parameters)) | Value | Did CASTOR run a 1st preventive RAO? | Did CASTOR run a 2nd preventive RAO? | Did the RAO fall back to initial situation? | Did the RAO fall back to 1st preventive RAO result even though a 2nd was run? | |----------------------------------------------------------|--------------------------------------|--------------------------------------|---------------------------------------------|-------------------------------------------------------------------------------| diff --git a/docs/parameters.md b/docs/parameters.md index dfca226a3e..926f485e48 100644 --- a/docs/parameters.md +++ b/docs/parameters.md @@ -40,17 +40,6 @@ These parameters (objective-function) configure the remedial action optimisation - **MAX_MIN_RELATIVE_MARGIN_IN_AMPERE**: same as MAX_MIN_MARGIN_IN_AMPERE, but the margins will be relative (divided by the absolute sum of PTDFs) when they are positive. -#### forbid-cost-increase -- **Expected value**: true/false -- **Default value**: false -- **Usage**: if this parameter is set to true, OpenRAO will post-check the results after optimisation. If the value of - the objective function is worse after optimisation than before optimisation, then it will return the initial - solution (i.e. no PRA and no CRA applied). - This can happen for example if the preventive RAO decreases the margin on a curative CNEC, which cannot be reverted - during curative RAO. - If this parameter is set to false, OpenRAO will return the real result of optimisation, which has a worse result - than the initial situation. - #### preventive-stop-criterion - **Expected value**: one of the following: - "MIN_OBJECTIVE" @@ -584,7 +573,6 @@ Zones are seperated by + or -. "version" : "2.4", "objective-function" : { "type" : "MAX_MIN_RELATIVE_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "PREVENTIVE_OBJECTIVE", diff --git a/python-util/rao_parameter_modification.py b/python-util/rao_parameter_modification.py new file mode 100644 index 0000000000..55a3acac51 --- /dev/null +++ b/python-util/rao_parameter_modification.py @@ -0,0 +1,40 @@ +# Copyright (c) 2024, RTE (http://www.rte-france.com) +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# SPDX-License-Identifier: MPL-2.0 + +import os +import json + +root_directory = os.path.join(os.getcwd(), "..") + + +def rao_parameters_file(file_path): + correct_version = False + obj_fun = False + if file_path.endswith(".json") or file_path.endswith(".yml"): + with open(os.path.join(dirpath, filename), 'r') as file: + for line in file: + if "objective-function" in line: + obj_fun = True + if '"version" : "2.4"' in line or '"version" : "2.5"' in line: + correct_version = True + if correct_version and obj_fun: + return True + return False + + +for dirpath, dirnames, filenames in os.walk(root_directory): + for filename in filenames: + file_path = os.path.join(dirpath, filename) + if rao_parameters_file(file_path): + print("file to change : " + file_path) + lines = None + if file_path.endswith(".json"): + with open(file_path, 'r') as file: + lines = file.readlines() + lines = [line.replace('"version" : "2.4"', '"version" : "2.5"') for line in lines if "forbid-cost-increase" not in line] + if lines is not None: + with open(file_path, 'w') as file: + file.writelines(lines) 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 17a65285c0..35a0261247 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.4"; + public static final String RAO_PARAMETERS_VERSION = "2.5"; // header public static final String VERSION = "version"; @@ -25,7 +25,6 @@ private RaoParametersCommons() { public static final String OBJECTIVE_FUNCTION = "objective-function"; public static final String OBJECTIVE_FUNCTION_SECTION = "rao-objective-function"; public static final String TYPE = "type"; - public static final String FORBID_COST_INCREASE = "forbid-cost-increase"; public static final String CURATIVE_MIN_OBJ_IMPROVEMENT = "curative-min-obj-improvement"; public static final String PREVENTIVE_STOP_CRITERION = "preventive-stop-criterion"; public static final String CURATIVE_STOP_CRITERION = "curative-stop-criterion"; diff --git a/ra-optimisation/rao-api/src/main/java/com/powsybl/openrao/raoapi/json/JsonObjectiveFunctionParameters.java b/ra-optimisation/rao-api/src/main/java/com/powsybl/openrao/raoapi/json/JsonObjectiveFunctionParameters.java index 9a7b51f9d0..af4ae6b069 100644 --- a/ra-optimisation/rao-api/src/main/java/com/powsybl/openrao/raoapi/json/JsonObjectiveFunctionParameters.java +++ b/ra-optimisation/rao-api/src/main/java/com/powsybl/openrao/raoapi/json/JsonObjectiveFunctionParameters.java @@ -27,7 +27,6 @@ private JsonObjectiveFunctionParameters() { static void serialize(RaoParameters parameters, JsonGenerator jsonGenerator) throws IOException { jsonGenerator.writeObjectFieldStart(OBJECTIVE_FUNCTION); jsonGenerator.writeObjectField(TYPE, parameters.getObjectiveFunctionParameters().getType()); - jsonGenerator.writeBooleanField(FORBID_COST_INCREASE, parameters.getObjectiveFunctionParameters().getForbidCostIncrease()); jsonGenerator.writeObjectField(PREVENTIVE_STOP_CRITERION, parameters.getObjectiveFunctionParameters().getPreventiveStopCriterion()); jsonGenerator.writeObjectField(CURATIVE_STOP_CRITERION, parameters.getObjectiveFunctionParameters().getCurativeStopCriterion()); jsonGenerator.writeNumberField(CURATIVE_MIN_OBJ_IMPROVEMENT, parameters.getObjectiveFunctionParameters().getCurativeMinObjImprovement()); @@ -41,10 +40,6 @@ static void deserialize(JsonParser jsonParser, RaoParameters raoParameters) thro case TYPE: raoParameters.getObjectiveFunctionParameters().setType(stringToObjectiveFunction(jsonParser.nextTextValue())); break; - case FORBID_COST_INCREASE: - jsonParser.nextToken(); - raoParameters.getObjectiveFunctionParameters().setForbidCostIncrease(jsonParser.getBooleanValue()); - break; case PREVENTIVE_STOP_CRITERION: raoParameters.getObjectiveFunctionParameters().setPreventiveStopCriterion(stringToPreventiveStopCriterion(jsonParser.nextTextValue())); break; diff --git a/ra-optimisation/rao-api/src/main/java/com/powsybl/openrao/raoapi/parameters/ObjectiveFunctionParameters.java b/ra-optimisation/rao-api/src/main/java/com/powsybl/openrao/raoapi/parameters/ObjectiveFunctionParameters.java index f6d53f1491..2b0aee4dca 100644 --- a/ra-optimisation/rao-api/src/main/java/com/powsybl/openrao/raoapi/parameters/ObjectiveFunctionParameters.java +++ b/ra-optimisation/rao-api/src/main/java/com/powsybl/openrao/raoapi/parameters/ObjectiveFunctionParameters.java @@ -22,14 +22,12 @@ public class ObjectiveFunctionParameters { // Default values private static final ObjectiveFunctionType DEFAULT_OBJECTIVE_FUNCTION = ObjectiveFunctionType.MAX_MIN_MARGIN_IN_MEGAWATT; - private static final boolean DEFAULT_FORBID_COST_INCREASE = false; private static final double DEFAULT_CURATIVE_MIN_OBJ_IMPROVEMENT = 0; private static final PreventiveStopCriterion DEFAULT_PREVENTIVE_STOP_CRITERION = PreventiveStopCriterion.SECURE; private static final CurativeStopCriterion DEFAULT_CURATIVE_STOP_CRITERION = CurativeStopCriterion.MIN_OBJECTIVE; private static final boolean DEFAULT_OPTIMIZE_CURATIVE_IF_PREVENTIVE_UNSECURE = false; // Attributes private ObjectiveFunctionType type = DEFAULT_OBJECTIVE_FUNCTION; - private boolean forbidCostIncrease = DEFAULT_FORBID_COST_INCREASE; private double curativeMinObjImprovement = DEFAULT_CURATIVE_MIN_OBJ_IMPROVEMENT; private PreventiveStopCriterion preventiveStopCriterion = DEFAULT_PREVENTIVE_STOP_CRITERION; private CurativeStopCriterion curativeStopCriterion = DEFAULT_CURATIVE_STOP_CRITERION; @@ -78,14 +76,6 @@ public void setType(ObjectiveFunctionType type) { this.type = type; } - public boolean getForbidCostIncrease() { - return forbidCostIncrease; - } - - public void setForbidCostIncrease(boolean forbidCostIncrease) { - this.forbidCostIncrease = forbidCostIncrease; - } - public void setPreventiveStopCriterion(PreventiveStopCriterion preventiveStopCriterion) { this.preventiveStopCriterion = preventiveStopCriterion; } @@ -121,7 +111,6 @@ public static ObjectiveFunctionParameters load(PlatformConfig platformConfig) { .ifPresent(config -> { parameters.setType(config.getEnumProperty(TYPE, ObjectiveFunctionType.class, DEFAULT_OBJECTIVE_FUNCTION)); - parameters.setForbidCostIncrease(config.getBooleanProperty(FORBID_COST_INCREASE, DEFAULT_FORBID_COST_INCREASE)); parameters.setCurativeMinObjImprovement(config.getDoubleProperty(CURATIVE_MIN_OBJ_IMPROVEMENT, DEFAULT_CURATIVE_MIN_OBJ_IMPROVEMENT)); parameters.setPreventiveStopCriterion(config.getEnumProperty(PREVENTIVE_STOP_CRITERION, PreventiveStopCriterion.class, DEFAULT_PREVENTIVE_STOP_CRITERION)); diff --git a/ra-optimisation/rao-api/src/test/java/com/powsybl/openrao/raoapi/json/JsonRaoParametersTest.java b/ra-optimisation/rao-api/src/test/java/com/powsybl/openrao/raoapi/json/JsonRaoParametersTest.java index 0b8df7d4ee..27d7fdfdef 100644 --- a/ra-optimisation/rao-api/src/test/java/com/powsybl/openrao/raoapi/json/JsonRaoParametersTest.java +++ b/ra-optimisation/rao-api/src/test/java/com/powsybl/openrao/raoapi/json/JsonRaoParametersTest.java @@ -53,7 +53,6 @@ void roundTrip() throws IOException { RaoParameters parameters = new RaoParameters(); // Objective Function parameters parameters.getObjectiveFunctionParameters().setType(ObjectiveFunctionParameters.ObjectiveFunctionType.MAX_MIN_MARGIN_IN_AMPERE); - parameters.getObjectiveFunctionParameters().setForbidCostIncrease(true); parameters.getObjectiveFunctionParameters().setPreventiveStopCriterion(ObjectiveFunctionParameters.PreventiveStopCriterion.MIN_OBJECTIVE); parameters.getObjectiveFunctionParameters().setCurativeStopCriterion(ObjectiveFunctionParameters.CurativeStopCriterion.PREVENTIVE_OBJECTIVE_AND_SECURE); parameters.getObjectiveFunctionParameters().setCurativeMinObjImprovement(983); diff --git a/ra-optimisation/rao-api/src/test/java/com/powsybl/openrao/raoapi/parameters/RaoParametersConfigTest.java b/ra-optimisation/rao-api/src/test/java/com/powsybl/openrao/raoapi/parameters/RaoParametersConfigTest.java index 21931b9955..90ad9a330d 100644 --- a/ra-optimisation/rao-api/src/test/java/com/powsybl/openrao/raoapi/parameters/RaoParametersConfigTest.java +++ b/ra-optimisation/rao-api/src/test/java/com/powsybl/openrao/raoapi/parameters/RaoParametersConfigTest.java @@ -41,7 +41,6 @@ public void setUp() { void checkObjectiveFunctionConfig() { MapModuleConfig objectiveFunctionModuleConfig = platformCfg.createModuleConfig("rao-objective-function"); objectiveFunctionModuleConfig.setStringProperty("type", "MAX_MIN_RELATIVE_MARGIN_IN_AMPERE"); - objectiveFunctionModuleConfig.setStringProperty("forbid-cost-increase", Objects.toString(true)); objectiveFunctionModuleConfig.setStringProperty("curative-min-obj-improvement", Objects.toString(123.0)); objectiveFunctionModuleConfig.setStringProperty("preventive-stop-criterion", "MIN_OBJECTIVE"); objectiveFunctionModuleConfig.setStringProperty("curative-stop-criterion", "PREVENTIVE_OBJECTIVE"); @@ -50,7 +49,6 @@ void checkObjectiveFunctionConfig() { RaoParameters parameters = new RaoParameters(); RaoParameters.load(parameters, platformCfg); ObjectiveFunctionParameters objectiveFunctionParameters = parameters.getObjectiveFunctionParameters(); - assertTrue(objectiveFunctionParameters.getForbidCostIncrease()); assertEquals(ObjectiveFunctionParameters.ObjectiveFunctionType.MAX_MIN_RELATIVE_MARGIN_IN_AMPERE, objectiveFunctionParameters.getType()); assertEquals(123, objectiveFunctionParameters.getCurativeMinObjImprovement(), DOUBLE_TOLERANCE); assertEquals(ObjectiveFunctionParameters.PreventiveStopCriterion.MIN_OBJECTIVE, objectiveFunctionParameters.getPreventiveStopCriterion()); diff --git a/ra-optimisation/rao-api/src/test/java/com/powsybl/openrao/raoapi/parameters/RaoParametersYamlConfigTest.java b/ra-optimisation/rao-api/src/test/java/com/powsybl/openrao/raoapi/parameters/RaoParametersYamlConfigTest.java index 76d65bb1df..ef6b62e36f 100644 --- a/ra-optimisation/rao-api/src/test/java/com/powsybl/openrao/raoapi/parameters/RaoParametersYamlConfigTest.java +++ b/ra-optimisation/rao-api/src/test/java/com/powsybl/openrao/raoapi/parameters/RaoParametersYamlConfigTest.java @@ -42,7 +42,6 @@ void testConfigWithExtensions() throws IOException { RaoParameters parameters = loadRaoParameters("config_withExtensions"); ObjectiveFunctionParameters objectiveFunctionParameters = parameters.getObjectiveFunctionParameters(); - assertTrue(objectiveFunctionParameters.getForbidCostIncrease()); assertEquals(ObjectiveFunctionParameters.ObjectiveFunctionType.MAX_MIN_MARGIN_IN_AMPERE, objectiveFunctionParameters.getType()); assertEquals(3, objectiveFunctionParameters.getCurativeMinObjImprovement(), DOUBLE_TOLERANCE); assertEquals(ObjectiveFunctionParameters.PreventiveStopCriterion.MIN_OBJECTIVE, objectiveFunctionParameters.getPreventiveStopCriterion()); @@ -125,7 +124,6 @@ void testConfigWithoutExtensions() throws IOException { RaoParameters parameters = loadRaoParameters("config_withoutExtensions"); ObjectiveFunctionParameters objectiveFunctionParameters = parameters.getObjectiveFunctionParameters(); - assertTrue(objectiveFunctionParameters.getForbidCostIncrease()); assertEquals(ObjectiveFunctionParameters.ObjectiveFunctionType.MAX_MIN_MARGIN_IN_AMPERE, objectiveFunctionParameters.getType()); assertEquals(3, objectiveFunctionParameters.getCurativeMinObjImprovement(), DOUBLE_TOLERANCE); assertEquals(ObjectiveFunctionParameters.PreventiveStopCriterion.MIN_OBJECTIVE, objectiveFunctionParameters.getPreventiveStopCriterion()); @@ -196,7 +194,6 @@ void testConfigWithPartialExtensions() throws IOException { RaoParameters parameters = loadRaoParameters("config_withPartialExtensions"); ObjectiveFunctionParameters objectiveFunctionParameters = parameters.getObjectiveFunctionParameters(); - assertTrue(objectiveFunctionParameters.getForbidCostIncrease()); assertEquals(ObjectiveFunctionParameters.ObjectiveFunctionType.MAX_MIN_MARGIN_IN_MEGAWATT, objectiveFunctionParameters.getType()); assertEquals(3, objectiveFunctionParameters.getCurativeMinObjImprovement(), DOUBLE_TOLERANCE); assertEquals(ObjectiveFunctionParameters.PreventiveStopCriterion.MIN_OBJECTIVE, objectiveFunctionParameters.getPreventiveStopCriterion()); 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 9955b67d7b..0556eb9a8f 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.4", + "version" : "2.5", "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 10d4d67ff6..0422d7c1e6 100644 --- a/ra-optimisation/rao-api/src/test/resources/RaoParametersSet_v2.json +++ b/ra-optimisation/rao-api/src/test/resources/RaoParametersSet_v2.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : true, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "PREVENTIVE_OBJECTIVE_AND_SECURE", "curative-min-obj-improvement" : 983.0, diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParametersWithCurStopCriterionError_v2.json b/ra-optimisation/rao-api/src/test/resources/RaoParametersWithCurStopCriterionError_v2.json index 8bd4024ebd..ecdda18e3e 100644 --- a/ra-optimisation/rao-api/src/test/resources/RaoParametersWithCurStopCriterionError_v2.json +++ b/ra-optimisation/rao-api/src/test/resources/RaoParametersWithCurStopCriterionError_v2.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "preventive-stop-criterion" : "WRONG", "curative-stop-criterion" : "MIN_OBJECTIVE", "curative-min-obj-improvement" : 0.0 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 d29b7ece76..299d44dcb6 100644 --- a/ra-optimisation/rao-api/src/test/resources/RaoParametersWithExtension_v2.json +++ b/ra-optimisation/rao-api/src/test/resources/RaoParametersWithExtension_v2.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "MIN_OBJECTIVE", "curative-min-obj-improvement" : 0.0, 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 e975ed4642..1ffbec315d 100644 --- a/ra-optimisation/rao-api/src/test/resources/RaoParametersWithLoopFlowError_v2.json +++ b/ra-optimisation/rao-api/src/test/resources/RaoParametersWithLoopFlowError_v2.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "MIN_OBJECTIVE", "curative-min-obj-improvement" : 0.0 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 567e7d965f..8f4fba3851 100644 --- a/ra-optimisation/rao-api/src/test/resources/RaoParametersWithPrevStopCriterionError_v2.json +++ b/ra-optimisation/rao-api/src/test/resources/RaoParametersWithPrevStopCriterionError_v2.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "WRONG", "curative-min-obj-improvement" : 0.0 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 89455f79eb..d9e9896e4d 100644 --- a/ra-optimisation/rao-api/src/test/resources/RaoParametersWithWrongField_v2.json +++ b/ra-optimisation/rao-api/src/test/resources/RaoParametersWithWrongField_v2.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "MIN_OBJECTIVE", "curative-min-obj-improvement" : 0.0 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 97425a24e8..02d92a7d02 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : true, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "PREVENTIVE_OBJECTIVE", "curative-min-obj-improvement" : 3.0, 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 c1ea12b958..0431a93104 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "MIN_OBJECTIVE", "curative-min-obj-improvement" : 0.0, 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 2f1b6652e4..1c67e4d5cf 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : true, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "PREVENTIVE_OBJECTIVE", "curative-min-obj-improvement" : 3.0, 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 155fb13c05..c066ab0c2f 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : true, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "PREVENTIVE_OBJECTIVE", "curative-min-obj-improvement" : 3.0, 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 95ab535aa0..ab39cd98ff 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.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", "preventive-stop-criterion" : "SECURE" 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 b2b3294954..34c57510e4 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.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", "preventive-stop-criterion" : "MIN_OBJECTIVE" 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 983c2268b4..c05a509bd9 100644 --- a/ra-optimisation/rao-api/src/test/resources/RaoParameters_v2.json +++ b/ra-optimisation/rao-api/src/test/resources/RaoParameters_v2.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "MIN_OBJECTIVE", "curative-min-obj-improvement" : 0.0, diff --git a/ra-optimisation/rao-api/src/test/resources/config_withExtensions.yml b/ra-optimisation/rao-api/src/test/resources/config_withExtensions.yml index a70ab0d6e9..f2413d6201 100644 --- a/ra-optimisation/rao-api/src/test/resources/config_withExtensions.yml +++ b/ra-optimisation/rao-api/src/test/resources/config_withExtensions.yml @@ -1,6 +1,5 @@ rao-objective-function: type: MAX_MIN_MARGIN_IN_AMPERE - forbid-cost-increase: true preventive-stop-criterion: MIN_OBJECTIVE curative-stop-criterion: PREVENTIVE_OBJECTIVE curative-min-obj-improvement: 3.0 diff --git a/ra-optimisation/rao-api/src/test/resources/config_withPartialExtensions.yml b/ra-optimisation/rao-api/src/test/resources/config_withPartialExtensions.yml index f29d3217f5..53a2794f9e 100644 --- a/ra-optimisation/rao-api/src/test/resources/config_withPartialExtensions.yml +++ b/ra-optimisation/rao-api/src/test/resources/config_withPartialExtensions.yml @@ -1,5 +1,4 @@ rao-objective-function: - forbid-cost-increase: true preventive-stop-criterion: MIN_OBJECTIVE curative-stop-criterion: PREVENTIVE_OBJECTIVE curative-min-obj-improvement: 3.0 diff --git a/ra-optimisation/rao-api/src/test/resources/config_withoutExtensions.yml b/ra-optimisation/rao-api/src/test/resources/config_withoutExtensions.yml index fdd410a740..229f5ada7e 100644 --- a/ra-optimisation/rao-api/src/test/resources/config_withoutExtensions.yml +++ b/ra-optimisation/rao-api/src/test/resources/config_withoutExtensions.yml @@ -1,6 +1,5 @@ rao-objective-function: type: MAX_MIN_MARGIN_IN_AMPERE - forbid-cost-increase: true preventive-stop-criterion: MIN_OBJECTIVE curative-stop-criterion: PREVENTIVE_OBJECTIVE curative-min-obj-improvement: 3.0 diff --git a/ra-optimisation/search-tree-rao/src/main/java/com/powsybl/openrao/searchtreerao/castor/algorithm/CastorFullOptimization.java b/ra-optimisation/search-tree-rao/src/main/java/com/powsybl/openrao/searchtreerao/castor/algorithm/CastorFullOptimization.java index 38f5e0eed2..b35cce5814 100644 --- a/ra-optimisation/search-tree-rao/src/main/java/com/powsybl/openrao/searchtreerao/castor/algorithm/CastorFullOptimization.java +++ b/ra-optimisation/search-tree-rao/src/main/java/com/powsybl/openrao/searchtreerao/castor/algorithm/CastorFullOptimization.java @@ -234,7 +234,7 @@ private CompletableFuture postCheckResults(RaoResult raoResult, PrePe double finalFunctionalCost = finalRaoResult.getFunctionalCost(lastInstant); double finalVirtualCost = finalRaoResult.getVirtualCost(lastInstant); - if (objectiveFunctionParameters.getForbidCostIncrease() && finalCost > initialCost) { + if (finalCost > initialCost) { BUSINESS_LOGS.info("RAO has increased the overall cost from {} (functional: {}, virtual: {}) to {} (functional: {}, virtual: {}). Falling back to initial solution:", formatDouble(initialCost), formatDouble(initialFunctionalCost), formatDouble(initialVirtualCost), formatDouble(finalCost), formatDouble(finalFunctionalCost), formatDouble(finalVirtualCost)); diff --git a/ra-optimisation/search-tree-rao/src/test/java/com/powsybl/openrao/searchtreerao/castor/algorithm/CastorFullOptimizationTest.java b/ra-optimisation/search-tree-rao/src/test/java/com/powsybl/openrao/searchtreerao/castor/algorithm/CastorFullOptimizationTest.java index 5e2c659772..bac0a988b3 100644 --- a/ra-optimisation/search-tree-rao/src/test/java/com/powsybl/openrao/searchtreerao/castor/algorithm/CastorFullOptimizationTest.java +++ b/ra-optimisation/search-tree-rao/src/test/java/com/powsybl/openrao/searchtreerao/castor/algorithm/CastorFullOptimizationTest.java @@ -673,7 +673,6 @@ void testOptimizationStepsExecutedAndLogsWhenFallbackOnFirstPrev() throws IOExce crac = Crac.read("small-crac-2P_cost_increase.json", getClass().getResourceAsStream("/crac/small-crac-2P_cost_increase.json"), network); RaoInput raoInput = RaoInput.build(network, crac).build(); RaoParameters raoParameters = JsonRaoParameters.read(getClass().getResourceAsStream("/parameters/RaoParameters_2P_v2.json")); - raoParameters.getObjectiveFunctionParameters().setForbidCostIncrease(true); RaoResult raoResult = new CastorFullOptimization(raoInput, raoParameters, null).run().join(); // Test Optimization steps executed 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 c73834b6f2..4bcc3ef4db 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 7bc6e1ef47..d5e79c99bd 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 83104b254e..38af7218b2 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 74b8817246..ad65ede1cd 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "SECURE" 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 0d827d466f..f45bccb8f6 100644 --- a/tests/src/test/resources/files/configurations/common/RaoParameters_default.json +++ b/tests/src/test/resources/files/configurations/common/RaoParameters_default.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 4ef1f8ac0d..bd86a1b087 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 879fcfec02..18aeb43ced 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 534121df80..11f37c9f79 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 37685ea8c8..399f0e4823 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 4326759575..17aa66eef2 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 08b3c44ef8..04be142e7c 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 f2ab5e5779..c9e2b82287 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 ef8915fc36..fd487ecacc 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 8862c19c94..5c6202fde6 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 ff02f10c48..039ccf7775 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 0e0c31145a..6e5f5c6f0e 100644 --- a/tests/src/test/resources/files/configurations/common/RaoParameters_securityAnalysis.json +++ b/tests/src/test/resources/files/configurations/common/RaoParameters_securityAnalysis.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 16e6bce634..2ccf092538 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 3242a53b6d..eb1c314b5f 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_RELATIVE_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 a512b9cf46..94823d453b 100644 --- a/tests/src/test/resources/files/configurations/epic10/conf_ep10us2case1.json +++ b/tests/src/test/resources/files/configurations/epic10/conf_ep10us2case1.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_RELATIVE_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 d8be8733fa..2a5e6a0a50 100644 --- a/tests/src/test/resources/files/configurations/epic10/conf_ep10us2case2.json +++ b/tests/src/test/resources/files/configurations/epic10/conf_ep10us2case2.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_RELATIVE_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 90bc835c6d..8e6f8e0225 100644 --- a/tests/src/test/resources/files/configurations/epic10/conf_ep10us3case1.json +++ b/tests/src/test/resources/files/configurations/epic10/conf_ep10us3case1.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_RELATIVE_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 ef2787412e..f15fbb3d31 100644 --- a/tests/src/test/resources/files/configurations/epic10/conf_ep10us4case1.json +++ b/tests/src/test/resources/files/configurations/epic10/conf_ep10us4case1.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_RELATIVE_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 486966f059..c15888d393 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 8e1b494586..d83fcc6597 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 1269f870fc..ec6869a5a1 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 ec8dce0ebe..1559db9162 100644 --- a/tests/src/test/resources/files/configurations/epic12/raoParametersSweIDCC_minObjective.json +++ b/tests/src/test/resources/files/configurations/epic12/raoParametersSweIDCC_minObjective.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 4e546dba57..70d06af30e 100644 --- a/tests/src/test/resources/files/configurations/epic12/raoParametersSweIDCC_minObjectiveDisabled2P.json +++ b/tests/src/test/resources/files/configurations/epic12/raoParametersSweIDCC_minObjectiveDisabled2P.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 01f51be61e..e4e14b37db 100644 --- a/tests/src/test/resources/files/configurations/epic12/raoParametersSweIDCC_minObjectiveWithGlobal2P.json +++ b/tests/src/test/resources/files/configurations/epic12/raoParametersSweIDCC_minObjectiveWithGlobal2P.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 1ff456111e..3f874d10cb 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "PREVENTIVE_OBJECTIVE" 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 50e5509180..8267ce1a5b 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 7da8f6095f..9877e663ab 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 300.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "PREVENTIVE_OBJECTIVE_AND_SECURE" 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 38a06a10af..eb0fcdc9fa 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 500.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "PREVENTIVE_OBJECTIVE" 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 d51f315c8b..310fa200f5 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 628.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "PREVENTIVE_OBJECTIVE" 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 c4d387eeb2..4bcd2e354c 100644 --- a/tests/src/test/resources/files/configurations/epic13/RaoParameters_ep13us6case8.json +++ b/tests/src/test/resources/files/configurations/epic13/RaoParameters_ep13us6case8.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 430d54b6e5..650ca44b1f 100644 --- a/tests/src/test/resources/files/configurations/epic13/RaoParameters_ep13us7case6.json +++ b/tests/src/test/resources/files/configurations/epic13/RaoParameters_ep13us7case6.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 11f4333014..62a0a12c23 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 987d5ca460..ac57dd11e5 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 fc64c5ef7e..872622a915 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 20854f0d18..814b3adffb 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_RELATIVE_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 3067b8b81b..750e190141 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "PREVENTIVE_OBJECTIVE" 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 8edd24f9f2..6bd88615fd 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "SECURE" 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 54ed17663c..86b24c56c4 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 2db7bf0fd0..4ae52f1333 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 01a8c2509d..a1a261658e 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "SECURE" 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 c4390a01b8..faf195c545 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 66b7ddad40..0caf50c0a4 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case1.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case1.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 04bead7208..619048ab81 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case10.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case10.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 e1f895743d..37bee2f618 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case2.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case2.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 0dce4c0231..fa7f516fc3 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case5.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case5.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 f993039fc8..de6bb291b8 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case6.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case6.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 0398cac308..b342ec4aeb 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case7.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case7.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 c392fe3a48..b62006e0fc 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case8.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case8.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 8e4f1f7210..ece67003bf 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case10.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case10.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "SECURE" 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 8e4f1f7210..ece67003bf 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case11.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case11.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "SECURE" 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 42a8e757a2..33a70428d6 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case12.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case12.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 99f5c3e282..7be7b2d665 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case2.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case2.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "SECURE" 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 99f5c3e282..7be7b2d665 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case6.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case6.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "SECURE" 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 de68e6abda..3d4a6533fc 100644 --- a/tests/src/test/resources/files/configurations/epic15/raoParametersSweIDCC_withoutPsts.json +++ b/tests/src/test/resources/files/configurations/epic15/raoParametersSweIDCC_withoutPsts.json @@ -1,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "SECURE" 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 260d029d5a..3d8df46e53 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 4e41145898..5b33107bec 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 f2b0bb85f6..95138ef84c 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 7a908516e1..c5ac7c6d31 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 4001319285..d806a66959 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 c610eee629..683c788d60 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 6e3b95195c..a741808d75 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_RELATIVE_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 de4db63827..6c1e5ad214 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_RELATIVE_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 32c32048e6..0fe8706bec 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_RELATIVE_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 1ba1cb3af6..9904e03010 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_RELATIVE_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 1ef1c6dc10..d2c84cf807 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "PREVENTIVE_OBJECTIVE" 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 ac03d7605e..42f84d3e39 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 7e46ad1d1e..bd8fcefbdd 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 8999b7d8d6..b140383053 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 50.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "PREVENTIVE_OBJECTIVE_AND_SECURE" 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 a73aa8d6e4..b914550ed7 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : true, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 032432cf8b..bd86a1b087 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : true, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 3cd9c60903..ca6265b397 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 283b03224d..60b4d7c477 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 e87b7bf33b..1b95b4d32b 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 6ba9b05270..1ec2e9698f 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 17a5c93b0e..a021239045 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 becec5e470..fdfd674f8e 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 262dc8f7eb..37dab04520 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 c94fef6621..b4ab1e6470 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 5bd596317b..5538785330 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 8fc3f35091..b3b02f9607 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 21d458595f..5155e886a1 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 42caab0306..694ea72f00 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 53e69e8ee3..aabbc0056c 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 db5e556dbe..045bd0f42b 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 60296c86a0..95f2050a45 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 e62847933c..97c5a8a9cb 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 03d17ce8d8..6ca3089e6a 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 4df81c89cc..1086b79451 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 14ef1203f0..756e48d25c 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 7bee959627..4949a354f0 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "SECURE" 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 79db028d20..c1457f5861 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "SECURE" 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 dfb9779140..c088e2934b 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "SECURE" 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 045ad17a0f..cf41d51c42 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 26a3848b8d..665d802f8c 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 7ab3061eb3..517f2e21ff 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 b7d50fec01..17e235efad 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 297c34dfaf..b08396edea 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 f033eb9fc7..29d1fb763e 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "SECURE" 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 74ea7200b4..776c8e7812 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "SECURE", "curative-stop-criterion" : "SECURE" 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 abc7c4c7ad..0f2c178a94 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 94eaba803c..6b05a4eaa3 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_MEGAWATT", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE" 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 7d080c876d..2c03926ed8 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,8 +1,7 @@ { - "version" : "2.4", + "version" : "2.5", "objective-function" : { "type" : "MAX_MIN_MARGIN_IN_AMPERE", - "forbid-cost-increase" : false, "curative-min-obj-improvement" : 0.0, "preventive-stop-criterion" : "MIN_OBJECTIVE", "curative-stop-criterion" : "MIN_OBJECTIVE"