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 0fe6d552bc..fd53451546 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..c26b2cd13c --- /dev/null +++ b/python-util/rao_parameter_modification.py @@ -0,0 +1,31 @@ +# 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.getcwd() + + +def rao_parameters_file(file_path): + 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: + 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): + if file_path.endswith(".json"): + with open(file_path, 'r') as file: + data = json.load(file) + lines = [line for line in lines if "forbid-cost-increase" not in line] + 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..b423ec0130 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 @@ -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 790b978006..b8d2da9409 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 463cc84a87..24a54847fd 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 51a824dafd..714779a535 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/RaoParametersSet_v2.json b/ra-optimisation/rao-api/src/test/resources/RaoParametersSet_v2.json index 10d4d67ff6..7ae383fc8d 100644 --- a/ra-optimisation/rao-api/src/test/resources/RaoParametersSet_v2.json +++ b/ra-optimisation/rao-api/src/test/resources/RaoParametersSet_v2.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..02bd813f6b 100644 --- a/ra-optimisation/rao-api/src/test/resources/RaoParametersWithCurStopCriterionError_v2.json +++ b/ra-optimisation/rao-api/src/test/resources/RaoParametersWithCurStopCriterionError_v2.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..a1780fc6f3 100644 --- a/ra-optimisation/rao-api/src/test/resources/RaoParametersWithExtension_v2.json +++ b/ra-optimisation/rao-api/src/test/resources/RaoParametersWithExtension_v2.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..bf9edb2d07 100644 --- a/ra-optimisation/rao-api/src/test/resources/RaoParametersWithLoopFlowError_v2.json +++ b/ra-optimisation/rao-api/src/test/resources/RaoParametersWithLoopFlowError_v2.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..42e00049a7 100644 --- a/ra-optimisation/rao-api/src/test/resources/RaoParametersWithPrevStopCriterionError_v2.json +++ b/ra-optimisation/rao-api/src/test/resources/RaoParametersWithPrevStopCriterionError_v2.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..db2a6c9323 100644 --- a/ra-optimisation/rao-api/src/test/resources/RaoParametersWithWrongField_v2.json +++ b/ra-optimisation/rao-api/src/test/resources/RaoParametersWithWrongField_v2.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..03b5c11b7c 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..095628d551 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..0b9e01fcbd 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..5b769bb9e9 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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_oldVersion.json b/ra-optimisation/rao-api/src/test/resources/RaoParameters_oldVersion.json index 0ca29b10c6..9f5110c69c 100644 --- a/ra-optimisation/rao-api/src/test/resources/RaoParameters_oldVersion.json +++ b/ra-optimisation/rao-api/src/test/resources/RaoParameters_oldVersion.json @@ -2,7 +2,6 @@ "version" : "2.0", "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_v2.json b/ra-optimisation/rao-api/src/test/resources/RaoParameters_v2.json index 983c2268b4..d81c5150c3 100644 --- a/ra-optimisation/rao-api/src/test/resources/RaoParameters_v2.json +++ b/ra-optimisation/rao-api/src/test/resources/RaoParameters_v2.json @@ -2,7 +2,6 @@ "version" : "2.4", "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 a16ad12fff..dd934e0b9f 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 @@ -239,7 +239,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 4cdc864935..f3f66c795c 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 @@ -667,7 +667,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..1d0c4b0d94 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..525605270d 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..20e61a5c1a 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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_default.json b/tests/src/test/resources/files/configurations/common/RaoParameters_default.json index 0d827d466f..9e0ac5a2ef 100644 --- a/tests/src/test/resources/files/configurations/common/RaoParameters_default.json +++ b/tests/src/test/resources/files/configurations/common/RaoParameters_default.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..8c1c4f85fe 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..dd116995c9 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..25d9e75990 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..5d433ed786 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..995c9d0d9d 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..665ce88003 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..47169ace12 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..bc28de02fa 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..afb9659d4e 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..35617e2741 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..2227e62a10 100644 --- a/tests/src/test/resources/files/configurations/common/RaoParameters_securityAnalysis.json +++ b/tests/src/test/resources/files/configurations/common/RaoParameters_securityAnalysis.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..9a6c30f6d0 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..5dcd572aea 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..a3856e0bac 100644 --- a/tests/src/test/resources/files/configurations/epic10/conf_ep10us2case1.json +++ b/tests/src/test/resources/files/configurations/epic10/conf_ep10us2case1.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..ed4ee55ff9 100644 --- a/tests/src/test/resources/files/configurations/epic10/conf_ep10us2case2.json +++ b/tests/src/test/resources/files/configurations/epic10/conf_ep10us2case2.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..26ac3fb1a5 100644 --- a/tests/src/test/resources/files/configurations/epic10/conf_ep10us3case1.json +++ b/tests/src/test/resources/files/configurations/epic10/conf_ep10us3case1.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..119c44d4f7 100644 --- a/tests/src/test/resources/files/configurations/epic10/conf_ep10us4case1.json +++ b/tests/src/test/resources/files/configurations/epic10/conf_ep10us4case1.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..0f9e88660d 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..b2d8e0a5ed 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..425ee12354 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..2e9a8109ea 100644 --- a/tests/src/test/resources/files/configurations/epic12/raoParametersSweIDCC_minObjective.json +++ b/tests/src/test/resources/files/configurations/epic12/raoParametersSweIDCC_minObjective.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..ea2940feb6 100644 --- a/tests/src/test/resources/files/configurations/epic12/raoParametersSweIDCC_minObjectiveDisabled2P.json +++ b/tests/src/test/resources/files/configurations/epic12/raoParametersSweIDCC_minObjectiveDisabled2P.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..7046571fa2 100644 --- a/tests/src/test/resources/files/configurations/epic12/raoParametersSweIDCC_minObjectiveWithGlobal2P.json +++ b/tests/src/test/resources/files/configurations/epic12/raoParametersSweIDCC_minObjectiveWithGlobal2P.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..cdabf71ae2 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..db255b52a2 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..02b6465c3f 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..8ec6abad32 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..8ebcc687de 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..4641b8b25b 100644 --- a/tests/src/test/resources/files/configurations/epic13/RaoParameters_ep13us6case8.json +++ b/tests/src/test/resources/files/configurations/epic13/RaoParameters_ep13us6case8.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..66b6419eba 100644 --- a/tests/src/test/resources/files/configurations/epic13/RaoParameters_ep13us7case6.json +++ b/tests/src/test/resources/files/configurations/epic13/RaoParameters_ep13us7case6.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..03365256aa 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..9d7b6651e0 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..70006cf93d 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..93768e5243 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 @@ -2,7 +2,6 @@ "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" : "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..56bb151094 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..7fb5f124fa 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..7a4b9d0d07 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..ab5f1dde47 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..7a49214f71 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..efdfd4f26d 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..01c77d7fe7 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case1.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case1.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..7bfa2c2bc0 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case10.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case10.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..7925aea5c1 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case2.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case2.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..34229c42dd 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case5.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case5.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..dfde7cd74d 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case6.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case6.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..07f50cea5b 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case7.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case7.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..1cee2dce99 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case8.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us13case8.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..c483237292 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case10.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case10.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..c483237292 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case11.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case11.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..962c96b181 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case12.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case12.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..1e01897d37 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case2.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case2.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..1e01897d37 100644 --- a/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case6.json +++ b/tests/src/test/resources/files/configurations/epic15/RaoParameters_ep15us17case6.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..834977df2c 100644 --- a/tests/src/test/resources/files/configurations/epic15/raoParametersSweIDCC_withoutPsts.json +++ b/tests/src/test/resources/files/configurations/epic15/raoParametersSweIDCC_withoutPsts.json @@ -2,7 +2,6 @@ "version" : "2.4", "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..52968c05ba 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..8aba789fae 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..f5ad64a864 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..5e0fbd16c9 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..2866e3965d 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..d0eef81979 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..9d7e080262 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 @@ -2,7 +2,6 @@ "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" : "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..d62cf6397b 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 @@ -2,7 +2,6 @@ "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" : "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..cf6f387ec2 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..563ca1e990 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..924871b337 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..7c0c1ef192 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..2e741066c1 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..f9a1eaa8ef 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..8b45f7ba04 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..8c1c4f85fe 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..af719b49f4 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..192cc8c01d 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..c32dbc79e7 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..05f0fab54c 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..b4452cf8ec 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..50c6dc4d1c 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..4fd6bdd297 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..705aef00be 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..034a43da40 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..2cd8d88f35 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..5b0323f3d9 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..48b5a69737 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..ab354df98d 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..e2788dcc60 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..0bccbc42df 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..8f689f1394 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..9fef1d2c6b 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..02d5780b7f 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..f7538691b6 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..be1690c65f 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..8db4306490 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..a15531ea49 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..5d240725c7 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..603ceaed12 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..b449b1c5a6 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..c8e35b7997 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..7939a6743f 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..0b3783961e 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..c25ae8d3f3 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..098ceb9018 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..d61f254914 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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..b1d0dcae85 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 @@ -2,7 +2,6 @@ "version" : "2.4", "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"