powsybl
diff --git a/‎tests/src/test/java/com/powsybl/openrao/tests/RunCucumberTest.java‎
Lines changed: 2 additions & 1 deletion b/‎tests/src/test/java/com/powsybl/openrao/tests/RunCucumberTest.java‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎tests/src/test/java/com/powsybl/openrao/tests/steps/CommonTestData.java‎
Lines changed: 5 additions & 0 deletions b/‎tests/src/test/java/com/powsybl/openrao/tests/steps/CommonTestData.java‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎…nrao/tests/steps/SearchTreeRaoSteps.java‎ ‎…owsybl/openrao/tests/steps/RaoSteps.java‎tests/src/test/java/com/powsybl/openrao/tests/steps/SearchTreeRaoSteps.java renamed to tests/src/test/java/com/powsybl/openrao/tests/steps/RaoSteps.java
Lines changed: 45 additions & 33 deletions b/‎…nrao/tests/steps/SearchTreeRaoSteps.java‎ ‎…owsybl/openrao/tests/steps/RaoSteps.java‎tests/src/test/java/com/powsybl/openrao/tests/steps/SearchTreeRaoSteps.java renamed to tests/src/test/java/com/powsybl/openrao/tests/steps/RaoSteps.java
Lines changed: 45 additions & 33 deletions
diff --git a/‎tests/src/test/resources/com/powsybl/openrao/tests/features/epic10_relative_margin/US10_1.feature‎
Lines changed: 3 additions & 3 deletions b/‎tests/src/test/resources/com/powsybl/openrao/tests/features/epic10_relative_margin/US10_1.feature‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎tests/src/test/resources/com/powsybl/openrao/tests/features/epic10_relative_margin/US10_2.feature‎
Lines changed: 2 additions & 2 deletions b/‎tests/src/test/resources/com/powsybl/openrao/tests/features/epic10_relative_margin/US10_2.feature‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎tests/src/test/resources/com/powsybl/openrao/tests/features/epic10_relative_margin/US10_3.feature‎
Lines changed: 1 addition & 1 deletion b/‎tests/src/test/resources/com/powsybl/openrao/tests/features/epic10_relative_margin/US10_3.feature‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎tests/src/test/resources/com/powsybl/openrao/tests/features/epic10_relative_margin/US10_4.feature‎
Lines changed: 1 addition & 1 deletion b/‎tests/src/test/resources/com/powsybl/openrao/tests/features/epic10_relative_margin/US10_4.feature‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎tests/src/test/resources/com/powsybl/openrao/tests/features/epic10_relative_margin/US10_5.feature‎
Lines changed: 2 additions & 2 deletions b/‎tests/src/test/resources/com/powsybl/openrao/tests/features/epic10_relative_margin/US10_5.feature‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎tests/src/test/resources/com/powsybl/openrao/tests/features/epic10_relative_margin/US10_6.feature‎
Lines changed: 1 addition & 1 deletion b/‎tests/src/test/resources/com/powsybl/openrao/tests/features/epic10_relative_margin/US10_6.feature‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎tests/src/test/resources/com/powsybl/openrao/tests/features/epic11_mnec/US11_1.feature‎
Lines changed: 4 additions & 4 deletions b/‎tests/src/test/resources/com/powsybl/openrao/tests/features/epic11_mnec/US11_1.feature‎
Lines changed: 4 additions & 4 deletions
@@ -18,6 +18,7 @@
 @SelectPackages("com.powsybl.openrao.tests")
 @ConfigurationParameter(key = PLUGIN_PROPERTY_NAME, value = "pretty")
 @ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "com.powsybl.openrao.tests")
-@ConfigurationParameter(key = FILTER_TAGS_PROPERTY_NAME, value = "not @flaky")
+@ConfigurationParameter(key = FILTER_TAGS_PROPERTY_NAME, value = "not @flaky and not @fast-rao") // For SearchTreeRao testing
+//@ConfigurationParameter(key = FILTER_TAGS_PROPERTY_NAME, value = "not @flaky and not @multi-curative and not @search-tree-rao") // For FastRao testing
 public class RunCucumberTest {
 }
@@ -25,6 +25,7 @@
 import com.powsybl.openrao.monitoring.results.RaoResultWithAngleMonitoring;
 import com.powsybl.openrao.raoapi.json.JsonRaoParameters;
 import com.powsybl.openrao.raoapi.parameters.RaoParameters;
+import com.powsybl.openrao.raoapi.parameters.extensions.FastRaoParameters;
 import com.powsybl.openrao.raoapi.parameters.extensions.OpenRaoSearchTreeParameters;
 import com.powsybl.openrao.raoapi.parameters.extensions.SearchTreeRaoRangeActionsOptimizationParameters;
 import com.powsybl.openrao.tests.utils.CoreCcPreprocessor;
@@ -311,6 +312,10 @@ public static void loadData(String timestamp) throws IOException {
                 .setSolver(SearchTreeRaoRangeActionsOptimizationParameters.Solver.valueOf(overrideLinearSolver.toUpperCase()));
         }
 
+        if (!raoParameters.hasExtension(FastRaoParameters.class)) {
+            raoParameters.addExtension(FastRaoParameters.class, new FastRaoParameters());
+        }
+
         // Loopflow GLSK
         // only work with UCTE GLSK files
         if (loopflowGlskPath != null) {
 
@@ -39,9 +39,11 @@
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.UncheckedIOException;
 import java.util.Comparator;
 import java.util.Objects;
+import java.util.Properties;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -51,9 +53,7 @@
 /**
  * @author Viktor Terrier {@literal <viktor.terrier at rte-france.com>}
  */
-public class SearchTreeRaoSteps {
-
-    private static final String SEARCH_TREE_RAO = "SearchTreeRao";
+public class RaoSteps {
     private static final double TOLERANCE_FLOW_IN_AMPERE = 5.0;
     private static final double TOLERANCE_FLOW_IN_MEGAWATT = 5.0;
     private static final double TOLERANCE_FLOW_RELATIVE = 1.5 / 100;
@@ -65,6 +65,18 @@ public class SearchTreeRaoSteps {
     private LoopFlowResult loopFlowResult;
     private Network network;
     private State preventiveState;
+    private final String raoImplementation;
+
+    {
+        try {
+            final Properties configProperties = new Properties();
+            final InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("steps-config.properties");
+            configProperties.load(inputStream);
+            raoImplementation = (String) configProperties.get("rao-implementation");
+        } catch (final Exception e) {
+            throw new OpenRaoException("Unable to load steps-config.properties", e);
+        }
+    }
 
     private static double flowAmpereTolerance(double expectedValue) {
         return Math.max(TOLERANCE_FLOW_IN_AMPERE, TOLERANCE_FLOW_RELATIVE * Math.abs(expectedValue));
@@ -74,54 +86,54 @@ private static double flowMegawattTolerance(Double expectedValue) {
         return Math.max(TOLERANCE_FLOW_IN_MEGAWATT, TOLERANCE_FLOW_RELATIVE * Math.abs(expectedValue));
     }
 
-    @When("I launch search_tree_rao")
-    public void iLaunchSearchTreeRao() {
-        iLaunchSearchTreeRao(null);
+    @When("I launch rao")
+    public void iLaunchRao() {
+        iLaunchRao(null);
     }
 
-    @When("I launch search_tree_rao with a time limit of {int} seconds")
-    public void iLaunchSearchTreeRaoWithTimeLimit(int timeLimit) {
+    @When("I launch rao with a time limit of {int} seconds")
+    public void iLaunchRaoWithTimeLimit(int timeLimit) {
         launchRao(timeLimit);
     }
 
-    @When("I launch search_tree_rao at {string}")
-    public void iLaunchSearchTreeRao(String timestamp) {
-        launchRao(null, null, timestamp, SEARCH_TREE_RAO);
+    @When("I launch rao at {string}")
+    public void iLaunchRao(String timestamp) {
+        launchRao(null, null, timestamp, raoImplementation);
     }
 
-    @When("I launch search_tree_rao at {string} on {string}")
-    public void iLaunchSearchTreeRaoAtTimestampOnContingency(String timestamp, String contingencyId) {
-        launchRao(contingencyId, null, timestamp, SEARCH_TREE_RAO);
+    @When("I launch rao at {string} on {string}")
+    public void iLaunchRaoAtTimestampOnContingency(String timestamp, String contingencyId) {
+        launchRao(contingencyId, null, timestamp, raoImplementation);
     }
 
-    @When("I launch search_tree_rao at {string} on preventive state")
-    public void iLaunchSearchTreeRaoOnPreventiveState(String timestamp) {
-        launchRao(null, InstantKind.PREVENTIVE, timestamp, SEARCH_TREE_RAO);
+    @When("I launch rao at {string} on preventive state")
+    public void iLaunchRaoOnPreventiveState(String timestamp) {
+        launchRao(null, InstantKind.PREVENTIVE, timestamp, raoImplementation);
     }
 
-    @When("I launch search_tree_rao at {string} after {string} at {string}")
-    public void iLaunchSearchTreeRao(String timestamp, String contingencyId, String instantKind) {
-        launchRao(contingencyId, InstantKind.valueOf(instantKind.toUpperCase()), timestamp, SEARCH_TREE_RAO);
+    @When("I launch rao at {string} after {string} at {string}")
+    public void iLaunchRao(String timestamp, String contingencyId, String instantKind) {
+        launchRao(contingencyId, InstantKind.valueOf(instantKind.toUpperCase()), timestamp, raoImplementation);
     }
 
-    @When("I launch search_tree_rao on preventive state")
-    public void iLaunchSearchTreeRaoOnPreventiveState() {
-        launchRao(null, InstantKind.PREVENTIVE, null, SEARCH_TREE_RAO);
+    @When("I launch rao on preventive state")
+    public void iLaunchRaoOnPreventiveState() {
+        launchRao(null, InstantKind.PREVENTIVE, null, raoImplementation);
     }
 
-    @When("I launch search_tree_rao after {string} at {string}")
-    public void iLaunchSearchTreeRao(String contingencyId, String instantKind) {
-        launchRao(contingencyId, InstantKind.valueOf(instantKind.toUpperCase()), null, null, SEARCH_TREE_RAO, null);
+    @When("I launch rao after {string} at {string}")
+    public void iLaunchRao(String contingencyId, String instantKind) {
+        launchRao(contingencyId, InstantKind.valueOf(instantKind.toUpperCase()), null, null, raoImplementation, null);
     }
 
-    @When("I launch loopflow search_tree_rao with default loopflow limit as {double} percent of pmax")
-    public void iLaunchSearchTreeRaoWithDefaultLoopflowLimit(double percentage) {
-        launchRao(null, null, null, percentage, SEARCH_TREE_RAO, null);
+    @When("I launch loopflow rao with default loopflow limit as {double} percent of pmax")
+    public void iLaunchRaoWithDefaultLoopflowLimit(double percentage) {
+        launchRao(null, null, null, percentage, raoImplementation, null);
     }
 
-    @When("I launch loopflow search_tree_rao at {string} with default loopflow limit as {double} percent of pmax")
-    public void iLaunchSearchTreeRaoWithDefaultLoopflowLimit(String timestamp, double percentage) {
-        launchRao(null, null, timestamp, percentage, SEARCH_TREE_RAO, null);
+    @When("I launch loopflow rao at {string} with default loopflow limit as {double} percent of pmax")
+    public void iLaunchRaoWithDefaultLoopflowLimit(String timestamp, double percentage) {
+        launchRao(null, null, timestamp, percentage, raoImplementation, null);
     }
 
     @When("I launch loopflow_computation with OpenLoadFlow")
@@ -621,7 +633,7 @@ public void absPtdfSumAfterInstant(String cnecId, String instantKind, Double exp
     }
 
     private void launchRao(int timeLimit) {
-        launchRao(null, null, null, null, SEARCH_TREE_RAO, timeLimit);
+        launchRao(null, null, null, null, raoImplementation, timeLimit);
     }
 
     private void launchRao(String contingencyId, InstantKind instantKind, String timestamp, String raoType) {
 
@@ -11,7 +11,7 @@ Feature: US 10.1: Linear RAO with relative margin
     Given crac file is "epic10/ls_relative_margin_unsecure.json"
     Given configuration file is "epic10/RaoParameters_relMargin_megawatt.json"
     Given loopflow glsk file is "common/glsk_proportional_12nodes.xml"
-    When I launch search_tree_rao
+    When I launch rao
     Then its security status should be "UNSECURED"
     And the value of the objective function after CRA should be 275.8
     And the tap of PstRangeAction "PRA_PST_BE" should be -16 in preventive
@@ -25,7 +25,7 @@ Feature: US 10.1: Linear RAO with relative margin
     Given crac file is "epic10/ls_relative_margin.json"
     Given configuration file is "epic10/RaoParameters_relMargin_megawatt.json"
     Given loopflow glsk file is "common/glsk_proportional_12nodes.xml"
-    When I launch search_tree_rao
+    When I launch rao
     Then its security status should be "SECURED"
     And the value of the objective function after CRA should be -2383.0
     And the tap of PstRangeAction "PRA_PST_BE" should be -3 in preventive
@@ -40,7 +40,7 @@ Feature: US 10.1: Linear RAO with relative margin
     Given crac file is "epic10/ls_relative_margin_with_open_branch.json"
     Given configuration file is "epic10/RaoParameters_relMargin_megawatt.json"
     Given loopflow glsk file is "common/glsk_proportional_12nodes.xml"
-    When I launch search_tree_rao
+    When I launch rao
     Then its security status should be "SECURED"
     And the value of the objective function after CRA should be -2385.0
     And the tap of PstRangeAction "PRA_PST_BE" should be -3 in preventive
 
@@ -11,7 +11,7 @@ Feature: US 10.2: define ptdfBoundaries with EIcode instead of Country codes
     Given crac file is "epic10/cbcora_ep10us2case1.xml"
     Given configuration file is "epic10/conf_ep10us2case1.json"
     Given loopflow glsk file is "common/glsk_proportional_12nodes.xml"
-    When I launch search_tree_rao at "2019-01-08 12:00"
+    When I launch rao at "2019-01-08 12:00"
     Then its security status should be "SECURED"
     And the value of the objective function after CRA should be -164
     And the tap of PstRangeAction "PRA_PST_BE" should be -16 in preventive
@@ -31,7 +31,7 @@ Feature: US 10.2: define ptdfBoundaries with EIcode instead of Country codes
     Given crac file is "epic10/cbcora_ep10us2case1.xml"
     Given configuration file is "epic10/conf_ep10us2case2.json"
     Given loopflow glsk file is "epic10/glsk_ep10us2case2.xml"
-    When I launch search_tree_rao at "2019-01-08 12:00"
+    When I launch rao at "2019-01-08 12:00"
     Then its security status should be "SECURED"
     And the value of the objective function after CRA should be -164
     And the tap of PstRangeAction "PRA_PST_BE" should be -16 in preventive
 
@@ -12,7 +12,7 @@ Feature: US 10.3: handle GLSK on Xnodes
     Given crac file is "epic10/cbcora_ep10us2case1.xml"
     Given configuration file is "epic10/conf_ep10us3case1.json"
     Given loopflow glsk file is "epic10/glsk_proportional_12nodes_hvdc.xml"
-    When I launch search_tree_rao at "2019-01-08 12:00"
+    When I launch rao at "2019-01-08 12:00"
     And the value of the objective function after CRA should be -300
     And the tap of PstRangeAction "PRA_PST_BE" should be -16 in preventive
     And the remedial action "Open FR1 FR2" is used in preventive
 
@@ -11,7 +11,7 @@ Feature: US 10.4: PTDF boundaries with more than two zones
     Given crac file is "epic10/cbcora_ep10us2case1.xml"
     Given configuration file is "epic10/conf_ep10us4case1.json"
     Given loopflow glsk file is "epic10/glsk_proportional_12nodes_hvdc.xml"
-    When I launch search_tree_rao at "2019-01-08 12:00"
+    When I launch rao at "2019-01-08 12:00"
     And the value of the objective function after CRA should be -413
     And the tap of PstRangeAction "PRA_PST_BE" should be -16 in preventive
     And the remedial action "Open FR1 FR2" is used in preventive
 
@@ -11,7 +11,7 @@ Feature: US 10.5: GLSK on disconnected Xnode
     Given crac file is "epic10/cbcora_ep10us2case1.xml"
     Given configuration file is "epic10/conf_ep10us4case1.json"
     Given loopflow glsk file is "epic10/glsk_proportional_12nodes_hvdc.xml"
-    When I launch search_tree_rao at "2019-01-08 12:00"
+    When I launch rao at "2019-01-08 12:00"
     And the value of the objective function after CRA should be -122
     And the tap of PstRangeAction "PRA_PST_BE" should be -16 in preventive
     And the remedial action "Open FR1 FR2" is used in preventive
@@ -30,7 +30,7 @@ Feature: US 10.5: GLSK on disconnected Xnode
     Given crac file is "epic10/cbcora_ep10us5case2.xml"
     Given configuration file is "epic10/conf_ep10us4case1.json"
     Given loopflow glsk file is "epic10/glsk_proportional_12nodes_hvdc.xml"
-    When I launch search_tree_rao at "2019-01-08 12:00"
+    When I launch rao at "2019-01-08 12:00"
     And the value of the objective function after CRA should be -122
     And the tap of PstRangeAction "PRA_PST_BE" should be -16 in preventive
     And the remedial action "Open FR1 FR2" is used in preventive
 
@@ -12,6 +12,6 @@ Feature: US 10.6: Add minimum relative margin binary variable
     Given crac file is "epic10/SL_ep10us6case1.json"
     Given configuration file is "epic10/RaoParameters_relMargin_megawatt.json"
     Given loopflow glsk file is "common/glsk_proportional_12nodes.xml"
-    When I launch search_tree_rao
+    When I launch rao
     And the worst margin is -1188.90 MW
     And the value of the objective function after CRA should be 1188.90
@@ -10,7 +10,7 @@ Feature: US 11.1: Handle mnecs in linear RAO
     Given network file is "common/TestCase12Nodes.uct" for CORE CC
     Given crac file is "epic11/ls_mnec_linearRao_ref.json"
     Given configuration file is "common/RaoParameters_maxMargin_megawatt_dc.json"
-    When I launch search_tree_rao
+    When I launch rao
     Then its security status should be "SECURED"
     And the tap of PstRangeAction "PRA_PST_BE" should be -16 in preventive
     And PST "BBE2AA1  BBE3AA1  1" in network file with PRA is on tap -16
@@ -23,7 +23,7 @@ Feature: US 11.1: Handle mnecs in linear RAO
     Given network file is "common/TestCase12Nodes.uct" for CORE CC
     Given crac file is "epic11/ls_mnec_linearRao_1_2.json"
     Given configuration file is "common/RaoParameters_maxMargin_megawatt_dc.json"
-    When I launch search_tree_rao
+    When I launch rao
     Then its security status should be "SECURED"
     And the tap of PstRangeAction "PRA_PST_BE" should be -9 in preventive
     And PST "BBE2AA1  BBE3AA1  1" in network file with PRA is on tap -9
@@ -36,7 +36,7 @@ Feature: US 11.1: Handle mnecs in linear RAO
     Given network file is "common/TestCase12Nodes.uct" for CORE CC
     Given crac file is "epic11/ls_mnec_linearRao_1_3.json"
     Given configuration file is "common/RaoParameters_maxMargin_megawatt_dc.json"
-    When I launch search_tree_rao
+    When I launch rao
     Then its security status should be "SECURED"
     And the tap of PstRangeAction "PRA_PST_BE" should be -7 in preventive
     And PST "BBE2AA1  BBE3AA1  1" in network file with PRA is on tap -7
@@ -48,7 +48,7 @@ Feature: US 11.1: Handle mnecs in linear RAO
     Given network file is "common/TestCase12Nodes.uct" for CORE CC
     Given crac file is "epic11/ls_mnec_linearRao_1_4.json"
     Given configuration file is "common/RaoParameters_maxMargin_megawatt_dc.json"
-    When I launch search_tree_rao
+    When I launch rao
     Then its security status should be "SECURED"
     And the tap of PstRangeAction "PRA_PST_BE" should be -7 in preventive
     And PST "BBE2AA1  BBE3AA1  1" in network file with PRA is on tap -7
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`@SelectPackages("com.powsybl.openrao.tests")`
`19`	`19`	`@ConfigurationParameter(key = PLUGIN_PROPERTY_NAME, value = "pretty")`
`20`	`20`	`@ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "com.powsybl.openrao.tests")`
`21`		`-@ConfigurationParameter(key = FILTER_TAGS_PROPERTY_NAME, value = "not @flaky")`
	`21`	`+@ConfigurationParameter(key = FILTER_TAGS_PROPERTY_NAME, value = "not @flaky and not @fast-rao") // For SearchTreeRao testing`
	`22`	`+//@ConfigurationParameter(key = FILTER_TAGS_PROPERTY_NAME, value = "not @flaky and not @multi-curative and not @search-tree-rao") // For FastRao testing`
`22`	`23`	`public class RunCucumberTest {`
`23`	`24`	`}`