ForbidCostIncrease should always be true (for the optim results to be…

… acceptable) Signed-off-by: Pauline Jean-Marie <pauline.jean-marie@artelys.com>
powsybl · Oct 2, 2024 · 03680d7 · 03680d7
1 parent 1925c36
commit 03680d7
Show file tree

Hide file tree

Showing 134 changed files with 163 additions and 279 deletions.
diff --git 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
@@ -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
@@ -0,0 +1,40 @@
+#  Copyright (c) 2024, RTE (http://www.rte-france.com)
+#  This Source Code Form is subject to the terms of the Mozilla Public
+#  License, v. 2.0. If a copy of the MPL was not distributed with this
+#  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#  SPDX-License-Identifier: MPL-2.0
+
+import os
+import json
+
+root_directory = os.path.join(os.getcwd(), "..")
+
+
+def rao_parameters_file(file_path):
+    correct_version = False
+    obj_fun = False
+    if file_path.endswith(".json") or file_path.endswith(".yml"):
+        with open(os.path.join(dirpath, filename), 'r') as file:
+            for line in file:
+                if "objective-function" in line:
+                    obj_fun = True
+                if '"version" : "2.4"' in line or '"version" : "2.5"' in line:
+                    correct_version = True
+                if correct_version and obj_fun:
+                    return True
+    return False
+
+
+for dirpath, dirnames, filenames in os.walk(root_directory):
+    for filename in filenames:
+        file_path = os.path.join(dirpath, filename)
+        if rao_parameters_file(file_path):
+            print("file to change : " + file_path)
+            lines = None
+            if file_path.endswith(".json"):
+                with open(file_path, 'r') as file:
+                    lines = file.readlines()
+                    lines = [line.replace('"version" : "2.4"', '"version" : "2.5"') for line in lines if "forbid-cost-increase" not in line]
+            if lines is not None:
+                with open(file_path, 'w') as file:
+                    file.writelines(lines)
diff --git a/ra-optimisation/rao-api/src/main/java/com/powsybl/openrao/raoapi/RaoParametersCommons.java b/ra-optimisation/rao-api/src/main/java/com/powsybl/openrao/raoapi/RaoParametersCommons.java
@@ -16,7 +16,7 @@ public final class RaoParametersCommons {
     private RaoParametersCommons() {
     }
 
-    public static final String RAO_PARAMETERS_VERSION = "2.4";
+    public static final String RAO_PARAMETERS_VERSION = "2.5";
 
     // header
     public static final String VERSION = "version";
@@ -25,7 +25,6 @@ private RaoParametersCommons() {
     public static final String OBJECTIVE_FUNCTION = "objective-function";
     public static final String OBJECTIVE_FUNCTION_SECTION = "rao-objective-function";
     public static final String TYPE = "type";
-    public static final String FORBID_COST_INCREASE = "forbid-cost-increase";
     public static final String CURATIVE_MIN_OBJ_IMPROVEMENT = "curative-min-obj-improvement";
     public static final String PREVENTIVE_STOP_CRITERION = "preventive-stop-criterion";
     public static final String CURATIVE_STOP_CRITERION = "curative-stop-criterion";

diff --git a/...ao-api/src/main/java/com/powsybl/openrao/raoapi/json/JsonObjectiveFunctionParameters.java b/...ao-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/...-api/src/main/java/com/powsybl/openrao/raoapi/parameters/ObjectiveFunctionParameters.java b/...-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/...misation/rao-api/src/test/java/com/powsybl/openrao/raoapi/json/JsonRaoParametersTest.java b/...misation/rao-api/src/test/java/com/powsybl/openrao/raoapi/json/JsonRaoParametersTest.java
@@ -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/.../rao-api/src/test/java/com/powsybl/openrao/raoapi/parameters/RaoParametersConfigTest.java b/.../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/...-api/src/test/java/com/powsybl/openrao/raoapi/parameters/RaoParametersYamlConfigTest.java b/...-api/src/test/java/com/powsybl/openrao/raoapi/parameters/RaoParametersYamlConfigTest.java
@@ -42,7 +42,6 @@ void testConfigWithExtensions() throws IOException {
         RaoParameters parameters = loadRaoParameters("config_withExtensions");
 
         ObjectiveFunctionParameters objectiveFunctionParameters = parameters.getObjectiveFunctionParameters();
-        assertTrue(objectiveFunctionParameters.getForbidCostIncrease());
         assertEquals(ObjectiveFunctionParameters.ObjectiveFunctionType.MAX_MIN_MARGIN_IN_AMPERE, objectiveFunctionParameters.getType());
         assertEquals(3, objectiveFunctionParameters.getCurativeMinObjImprovement(), DOUBLE_TOLERANCE);
         assertEquals(ObjectiveFunctionParameters.PreventiveStopCriterion.MIN_OBJECTIVE, objectiveFunctionParameters.getPreventiveStopCriterion());
@@ -125,7 +124,6 @@ void testConfigWithoutExtensions() throws IOException {
         RaoParameters parameters = loadRaoParameters("config_withoutExtensions");
 
         ObjectiveFunctionParameters objectiveFunctionParameters = parameters.getObjectiveFunctionParameters();
-        assertTrue(objectiveFunctionParameters.getForbidCostIncrease());
         assertEquals(ObjectiveFunctionParameters.ObjectiveFunctionType.MAX_MIN_MARGIN_IN_AMPERE, objectiveFunctionParameters.getType());
         assertEquals(3, objectiveFunctionParameters.getCurativeMinObjImprovement(), DOUBLE_TOLERANCE);
         assertEquals(ObjectiveFunctionParameters.PreventiveStopCriterion.MIN_OBJECTIVE, objectiveFunctionParameters.getPreventiveStopCriterion());
@@ -196,7 +194,6 @@ void testConfigWithPartialExtensions() throws IOException {
         RaoParameters parameters = loadRaoParameters("config_withPartialExtensions");
 
         ObjectiveFunctionParameters objectiveFunctionParameters = parameters.getObjectiveFunctionParameters();
-        assertTrue(objectiveFunctionParameters.getForbidCostIncrease());
         assertEquals(ObjectiveFunctionParameters.ObjectiveFunctionType.MAX_MIN_MARGIN_IN_MEGAWATT, objectiveFunctionParameters.getType());
         assertEquals(3, objectiveFunctionParameters.getCurativeMinObjImprovement(), DOUBLE_TOLERANCE);
         assertEquals(ObjectiveFunctionParameters.PreventiveStopCriterion.MIN_OBJECTIVE, objectiveFunctionParameters.getPreventiveStopCriterion());

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParametersError_v2.json b/ra-optimisation/rao-api/src/test/resources/RaoParametersError_v2.json
@@ -1,4 +1,4 @@
 {
-  "version" : "2.4",
+  "version" : "2.5",
   "unknownField" : "abcd"
 }
diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParametersSet_v2.json b/ra-optimisation/rao-api/src/test/resources/RaoParametersSet_v2.json
@@ -1,8 +1,7 @@
 {
-  "version" : "2.4",
+  "version" : "2.5",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN_IN_AMPERE",
-    "forbid-cost-increase" : true,
     "preventive-stop-criterion" : "MIN_OBJECTIVE",
     "curative-stop-criterion" : "PREVENTIVE_OBJECTIVE_AND_SECURE",
     "curative-min-obj-improvement" : 983.0,

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParametersWithCurStopCriterionError_v2.json b/ra-optimisation/rao-api/src/test/resources/RaoParametersWithCurStopCriterionError_v2.json
@@ -1,8 +1,7 @@
 {
-  "version" : "2.4",
+  "version" : "2.5",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN_IN_MEGAWATT",
-    "forbid-cost-increase" : false,
     "preventive-stop-criterion" : "WRONG",
     "curative-stop-criterion" : "MIN_OBJECTIVE",
     "curative-min-obj-improvement" : 0.0

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParametersWithExtension_v2.json b/ra-optimisation/rao-api/src/test/resources/RaoParametersWithExtension_v2.json
@@ -1,8 +1,7 @@
 {
-  "version" : "2.4",
+  "version" : "2.5",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN_IN_MEGAWATT",
-    "forbid-cost-increase" : false,
     "preventive-stop-criterion" : "SECURE",
     "curative-stop-criterion" : "MIN_OBJECTIVE",
     "curative-min-obj-improvement" : 0.0,

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParametersWithLoopFlowError_v2.json b/ra-optimisation/rao-api/src/test/resources/RaoParametersWithLoopFlowError_v2.json
@@ -1,8 +1,7 @@
 {
-  "version" : "2.4",
+  "version" : "2.5",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN_IN_MEGAWATT",
-    "forbid-cost-increase" : false,
     "preventive-stop-criterion" : "SECURE",
     "curative-stop-criterion" : "MIN_OBJECTIVE",
     "curative-min-obj-improvement" : 0.0

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParametersWithPrevStopCriterionError_v2.json b/ra-optimisation/rao-api/src/test/resources/RaoParametersWithPrevStopCriterionError_v2.json
@@ -1,8 +1,7 @@
 {
-  "version" : "2.4",
+  "version" : "2.5",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN_IN_MEGAWATT",
-    "forbid-cost-increase" : false,
     "preventive-stop-criterion" : "SECURE",
     "curative-stop-criterion" : "WRONG",
     "curative-min-obj-improvement" : 0.0

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParametersWithWrongField_v2.json b/ra-optimisation/rao-api/src/test/resources/RaoParametersWithWrongField_v2.json
@@ -1,8 +1,7 @@
 {
-  "version" : "2.4",
+  "version" : "2.5",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN_IN_MEGAWATT",
-    "forbid-cost-increase" : false,
     "preventive-stop-criterion" : "SECURE",
     "curative-stop-criterion" : "MIN_OBJECTIVE",
     "curative-min-obj-improvement" : 0.0

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withExtensions.json b/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withExtensions.json
@@ -1,8 +1,7 @@
 {
-  "version" : "2.4",
+  "version" : "2.5",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN_IN_AMPERE",
-    "forbid-cost-increase" : true,
     "preventive-stop-criterion" : "MIN_OBJECTIVE",
     "curative-stop-criterion" : "PREVENTIVE_OBJECTIVE",
     "curative-min-obj-improvement" : 3.0,

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withOLFParams.json b/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withOLFParams.json
@@ -1,8 +1,7 @@
 {
-  "version" : "2.4",
+  "version" : "2.5",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN_IN_MEGAWATT",
-    "forbid-cost-increase" : false,
     "preventive-stop-criterion" : "SECURE",
     "curative-stop-criterion" : "MIN_OBJECTIVE",
     "curative-min-obj-improvement" : 0.0,

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withPartialExtensions.json b/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withPartialExtensions.json
@@ -1,8 +1,7 @@
 {
-  "version" : "2.4",
+  "version" : "2.5",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN_IN_MEGAWATT",
-    "forbid-cost-increase" : true,
     "preventive-stop-criterion" : "MIN_OBJECTIVE",
     "curative-stop-criterion" : "PREVENTIVE_OBJECTIVE",
     "curative-min-obj-improvement" : 3.0,

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withoutExtensions.json b/ra-optimisation/rao-api/src/test/resources/RaoParameters_config_withoutExtensions.json
@@ -1,8 +1,7 @@
 {
-  "version" : "2.4",
+  "version" : "2.5",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN_IN_AMPERE",
-    "forbid-cost-increase" : true,
     "preventive-stop-criterion" : "MIN_OBJECTIVE",
     "curative-stop-criterion" : "PREVENTIVE_OBJECTIVE",
     "curative-min-obj-improvement" : 3.0,

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParameters_default_v2.json b/ra-optimisation/rao-api/src/test/resources/RaoParameters_default_v2.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.4",
+  "version" : "2.5",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN_IN_MEGAWATT",
     "preventive-stop-criterion" : "SECURE"

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParameters_update_v2.json b/ra-optimisation/rao-api/src/test/resources/RaoParameters_update_v2.json
@@ -1,5 +1,5 @@
 {
-  "version" : "2.4",
+  "version" : "2.5",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN_IN_MEGAWATT",
     "preventive-stop-criterion" : "MIN_OBJECTIVE"

diff --git a/ra-optimisation/rao-api/src/test/resources/RaoParameters_v2.json b/ra-optimisation/rao-api/src/test/resources/RaoParameters_v2.json
@@ -1,8 +1,7 @@
 {
-  "version" : "2.4",
+  "version" : "2.5",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN_IN_MEGAWATT",
-    "forbid-cost-increase" : false,
     "preventive-stop-criterion" : "SECURE",
     "curative-stop-criterion" : "MIN_OBJECTIVE",
     "curative-min-obj-improvement" : 0.0,

diff --git a/ra-optimisation/rao-api/src/test/resources/config_withExtensions.yml b/ra-optimisation/rao-api/src/test/resources/config_withExtensions.yml
@@ -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
@@ -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
@@ -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/.../main/java/com/powsybl/openrao/searchtreerao/castor/algorithm/CastorFullOptimization.java b/.../main/java/com/powsybl/openrao/searchtreerao/castor/algorithm/CastorFullOptimization.java
@@ -234,7 +234,7 @@ private CompletableFuture<RaoResult> 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/...t/java/com/powsybl/openrao/searchtreerao/castor/algorithm/CastorFullOptimizationTest.java b/...t/java/com/powsybl/openrao/searchtreerao/castor/algorithm/CastorFullOptimizationTest.java
@@ -673,7 +673,6 @@ void testOptimizationStepsExecutedAndLogsWhenFallbackOnFirstPrev() throws IOExce
         crac = Crac.read("small-crac-2P_cost_increase.json", getClass().getResourceAsStream("/crac/small-crac-2P_cost_increase.json"), network);
         RaoInput raoInput = RaoInput.build(network, crac).build();
         RaoParameters raoParameters = JsonRaoParameters.read(getClass().getResourceAsStream("/parameters/RaoParameters_2P_v2.json"));
-        raoParameters.getObjectiveFunctionParameters().setForbidCostIncrease(true);
         RaoResult raoResult = new CastorFullOptimization(raoInput, raoParameters, null).run().join();
 
         // Test Optimization steps executed

diff --git a/ra-optimisation/search-tree-rao/src/test/resources/parameters/RaoParameters_2P_v2.json b/ra-optimisation/search-tree-rao/src/test/resources/parameters/RaoParameters_2P_v2.json
@@ -1,8 +1,7 @@
 {
-  "version" : "2.4",
+  "version" : "2.5",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN_IN_AMPERE",
-    "forbid-cost-increase" : false,
     "curative-min-obj-improvement" : 0.0,
     "preventive-stop-criterion" : "MIN_OBJECTIVE",
     "curative-stop-criterion" : "MIN_OBJECTIVE"

diff --git a/ra-optimisation/search-tree-rao/src/test/resources/parameters/RaoParameters_DC.json b/ra-optimisation/search-tree-rao/src/test/resources/parameters/RaoParameters_DC.json
@@ -1,8 +1,7 @@
 {
-  "version" : "2.4",
+  "version" : "2.5",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN_IN_MEGAWATT",
-    "forbid-cost-increase" : false,
     "curative-min-obj-improvement" : 0.0,
     "preventive-stop-criterion" : "MIN_OBJECTIVE",
     "curative-stop-criterion" : "MIN_OBJECTIVE"

diff --git a/...misation/search-tree-rao/src/test/resources/parameters/RaoParameters_oneIteration_v2.json b/...misation/search-tree-rao/src/test/resources/parameters/RaoParameters_oneIteration_v2.json
@@ -1,8 +1,7 @@
 {
-  "version" : "2.4",
+  "version" : "2.5",
   "objective-function" : {
     "type" : "MAX_MIN_MARGIN_IN_AMPERE",
-    "forbid-cost-increase" : false,
     "curative-min-obj-improvement" : 0.0,
     "preventive-stop-criterion" : "MIN_OBJECTIVE",
     "curative-stop-criterion" : "MIN_OBJECTIVE"