From 31881f09df594cf45b9faa191cbde69ce137a47f Mon Sep 17 00:00:00 2001 From: Abdoulbari Zakir Date: Mon, 24 Feb 2025 10:16:45 +0100 Subject: [PATCH 1/2] use sirius --- src/tests/resources/modeler/1_1/parameters.yml | 2 +- src/tests/resources/modeler/1_2/parameters.yml | 2 +- src/tests/resources/modeler/1_3/parameters.yml | 2 +- src/tests/resources/modeler/1_4/parameters.yml | 2 +- src/tests/resources/modeler/1_5/parameters.yml | 2 +- src/tests/resources/modeler/1_6/parameters.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/tests/resources/modeler/1_1/parameters.yml b/src/tests/resources/modeler/1_1/parameters.yml index c52ebe32f0..7f0ec730b0 100644 --- a/src/tests/resources/modeler/1_1/parameters.yml +++ b/src/tests/resources/modeler/1_1/parameters.yml @@ -1,4 +1,4 @@ -solver: xpress +solver: sirius solver-logs: true solver-parameters: THREADS 1 no-output: false diff --git a/src/tests/resources/modeler/1_2/parameters.yml b/src/tests/resources/modeler/1_2/parameters.yml index c52ebe32f0..7f0ec730b0 100644 --- a/src/tests/resources/modeler/1_2/parameters.yml +++ b/src/tests/resources/modeler/1_2/parameters.yml @@ -1,4 +1,4 @@ -solver: xpress +solver: sirius solver-logs: true solver-parameters: THREADS 1 no-output: false diff --git a/src/tests/resources/modeler/1_3/parameters.yml b/src/tests/resources/modeler/1_3/parameters.yml index 693af633d3..baee732d12 100644 --- a/src/tests/resources/modeler/1_3/parameters.yml +++ b/src/tests/resources/modeler/1_3/parameters.yml @@ -1,4 +1,4 @@ -solver: xpress +solver: sirius solver-logs: true solver-parameters: THREADS 1 no-output: false diff --git a/src/tests/resources/modeler/1_4/parameters.yml b/src/tests/resources/modeler/1_4/parameters.yml index c52ebe32f0..7f0ec730b0 100644 --- a/src/tests/resources/modeler/1_4/parameters.yml +++ b/src/tests/resources/modeler/1_4/parameters.yml @@ -1,4 +1,4 @@ -solver: xpress +solver: sirius solver-logs: true solver-parameters: THREADS 1 no-output: false diff --git a/src/tests/resources/modeler/1_5/parameters.yml b/src/tests/resources/modeler/1_5/parameters.yml index c52ebe32f0..7f0ec730b0 100644 --- a/src/tests/resources/modeler/1_5/parameters.yml +++ b/src/tests/resources/modeler/1_5/parameters.yml @@ -1,4 +1,4 @@ -solver: xpress +solver: sirius solver-logs: true solver-parameters: THREADS 1 no-output: false diff --git a/src/tests/resources/modeler/1_6/parameters.yml b/src/tests/resources/modeler/1_6/parameters.yml index 218ac3f17d..a768ab761b 100644 --- a/src/tests/resources/modeler/1_6/parameters.yml +++ b/src/tests/resources/modeler/1_6/parameters.yml @@ -1,4 +1,4 @@ -solver: xpress +solver: sirius solver-logs: true solver-parameters: THREADS 1 no-output: false From 0666b991a20c75083f5724ebe5b38aae635c8913 Mon Sep 17 00:00:00 2001 From: Abdoulbari Zakir Date: Mon, 24 Feb 2025 10:38:19 +0100 Subject: [PATCH 2/2] update --- .../features/modeler-features/epic2/us2.5.feature | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tests/cucumber/features/modeler-features/epic2/us2.5.feature b/src/tests/cucumber/features/modeler-features/epic2/us2.5.feature index 34f98db52f..1ea96d1ca0 100644 --- a/src/tests/cucumber/features/modeler-features/epic2/us2.5.feature +++ b/src/tests/cucumber/features/modeler-features/epic2/us2.5.feature @@ -3,7 +3,7 @@ Feature: 2.5 - Pure modeler simple studies, with no ports and no timeseries Scenario: 2.5.1: One model with one load and two generators, one timestep Given the study path is "modeler/epic2/us2.5/study_2.5.1" When I run antares modeler - Then the modeler simulation succeeds + Then the simulation succeeds And the objective value is 160 And the optimal value of variable node1.gen1_p_0 is 80 And the optimal value of variable node1.gen2_p_0 is 20 @@ -11,7 +11,7 @@ Feature: 2.5 - Pure modeler simple studies, with no ports and no timeseries Scenario: 2.5.2: One model with one load and two generators (minP), three timesteps Given the study path is "modeler/epic2/us2.5/study_2.5.2" When I run antares modeler - Then the modeler simulation succeeds + Then the simulation succeeds And the objective value is 810 And the optimal values of the variables are | component | variable | timestep | value | @@ -23,7 +23,7 @@ Feature: 2.5 - Pure modeler simple studies, with no ports and no timeseries Scenario: 2.5.3: Two libs, one timestep Given the study path is "modeler/epic2/us2.5/study_2.5.3" When I run antares modeler - Then the modeler simulation succeeds + Then the simulation succeeds And the objective value is 15600 And the optimal values of the variables are | component | variable | timestep | value | @@ -37,7 +37,7 @@ Feature: 2.5 - Pure modeler simple studies, with no ports and no timeseries Scenario: 2.5.4: Test with integer variable Given the study path is "modeler/epic2/us2.5/study_2.5.4" When I run antares modeler - Then the modeler simulation succeeds + Then the simulation succeeds And the objective value is 540 And the optimal value of variable node1.gen_total_p_0 is 1000 And the optimal value of variable node1.gen_n_on_0 is 4 \ No newline at end of file