[ANT-1226] Cohérence des solver E2E (#964)

Ensure the same solver is used across all steps of Xpansion: - Use the solver described in user/expansion/settings for Antares Simulator - Use the solver described in user/expansion/settings for ProblemGeneration - No change to Benders Limitation: Solver is not passed to Antares Simulator in case of "in-memory" mode. --------- Co-authored-by: Abdoulbari Zakir <[email protected]> Co-authored-by: Peter Mitri <[email protected]>
AntaresSimulatorTeam · Nov 26, 2024 · 4252b91 · 4252b91
1 parent 62b8903
commit 4252b91
Show file tree

Hide file tree

Showing 203 changed files with 210,027 additions and 71 deletions.
diff --git a/.github/workflows/cucumber-tests/action.yml b/.github/workflows/cucumber-tests/action.yml
@@ -6,7 +6,7 @@ inputs:
     required: false
     default: 'features'
   tags:
-    description: 'Tags to run (default skips tests marked @flaky)'
+    description: 'Tags to run (default skips tests marked @flaky or @xpress)'
     required: false
     default: '~@flaky'
   mpi_path:
@@ -21,4 +21,4 @@ runs:
       run: |
         export PATH="${{ inputs.mpi_path }}:$PATH"
         cd tests/end_to_end
-        behave --tags ${{ inputs.tags }} cucumber/${{ inputs.feature }} --no-capture --no-capture-stderr --format pretty
+        behave --tags ${{ inputs.tags }}  cucumber/${{ inputs.feature }} --no-capture --no-capture-stderr --format pretty
diff --git a/data_test/examples/dummy-3areas-3candidates-3links/Desktop.ini b/data_test/examples/dummy-3areas-3candidates-3links/Desktop.ini
@@ -0,0 +1,4 @@
+[.shellclassinfo]
+iconfile = settings/resources/study.ico
+iconindex = 0
+infotip = Antares Study9.2: 3a-3l
diff --git a/data_test/examples/dummy-3areas-3candidates-3links/input/areas/area 2/adequacy_patch.ini b/data_test/examples/dummy-3areas-3candidates-3links/input/areas/area 2/adequacy_patch.ini
@@ -0,0 +1,3 @@
+[adequacy-patch]
+adequacy-patch-mode = outside
+
diff --git a/data_test/examples/dummy-3areas-3candidates-3links/input/areas/area 2/optimization.ini b/data_test/examples/dummy-3areas-3candidates-3links/input/areas/area 2/optimization.ini
@@ -0,0 +1,11 @@
+[nodal optimization]
+non-dispatchable-power = true
+dispatchable-hydro-power = true
+other-dispatchable-power = true
+spread-unsupplied-energy-cost = 0.000000
+spread-spilled-energy-cost = 0.000000
+
+[filtering]
+filter-synthesis = hourly, daily, weekly, monthly, annual
+filter-year-by-year = hourly, daily, weekly, monthly, annual
+
diff --git a/data_test/examples/dummy-3areas-3candidates-3links/input/areas/area 2/ui.ini b/data_test/examples/dummy-3areas-3candidates-3links/input/areas/area 2/ui.ini
@@ -0,0 +1,15 @@
+[ui]
+x = 652
+y = -200
+color_r = 230
+color_g = 108
+color_b = 44
+layers = 0
+[layerX]
+0 = 652
+
+[layerY]
+0 = -200
+
+[layerColor]
+0 = 223 , 136 , 72
diff --git a/data_test/examples/dummy-3areas-3candidates-3links/input/areas/area 3/adequacy_patch.ini b/data_test/examples/dummy-3areas-3candidates-3links/input/areas/area 3/adequacy_patch.ini
@@ -0,0 +1,3 @@
+[adequacy-patch]
+adequacy-patch-mode = outside
+
diff --git a/data_test/examples/dummy-3areas-3candidates-3links/input/areas/area 3/optimization.ini b/data_test/examples/dummy-3areas-3candidates-3links/input/areas/area 3/optimization.ini
@@ -0,0 +1,11 @@
+[nodal optimization]
+non-dispatchable-power = true
+dispatchable-hydro-power = true
+other-dispatchable-power = true
+spread-unsupplied-energy-cost = 0.000000
+spread-spilled-energy-cost = 0.000000
+
+[filtering]
+filter-synthesis = hourly, daily, weekly, monthly, annual
+filter-year-by-year = hourly, daily, weekly, monthly, annual
+
diff --git a/data_test/examples/dummy-3areas-3candidates-3links/input/areas/area 3/ui.ini b/data_test/examples/dummy-3areas-3candidates-3links/input/areas/area 3/ui.ini
@@ -0,0 +1,15 @@
+[ui]
+x = 406
+y = -204
+color_r = 230
+color_g = 108
+color_b = 44
+layers = 0
+[layerX]
+0 = 406
+
+[layerY]
+0 = -204
+
+[layerColor]
+0 = 223 , 136 , 72
diff --git a/data_test/examples/dummy-3areas-3candidates-3links/input/areas/area/adequacy_patch.ini b/data_test/examples/dummy-3areas-3candidates-3links/input/areas/area/adequacy_patch.ini
@@ -0,0 +1,3 @@
+[adequacy-patch]
+adequacy-patch-mode = outside
+
diff --git a/data_test/examples/dummy-3areas-3candidates-3links/input/areas/area/optimization.ini b/data_test/examples/dummy-3areas-3candidates-3links/input/areas/area/optimization.ini
@@ -0,0 +1,11 @@
+[nodal optimization]
+non-dispatchable-power = true
+dispatchable-hydro-power = true
+other-dispatchable-power = true
+spread-unsupplied-energy-cost = 0.000000
+spread-spilled-energy-cost = 0.000000
+
+[filtering]
+filter-synthesis = hourly, daily, weekly, monthly, annual
+filter-year-by-year = hourly, daily, weekly, monthly, annual
+
diff --git a/data_test/examples/dummy-3areas-3candidates-3links/input/areas/area/ui.ini b/data_test/examples/dummy-3areas-3candidates-3links/input/areas/area/ui.ini
@@ -0,0 +1,15 @@
+[ui]
+x = 594
+y = -143
+color_r = 230
+color_g = 108
+color_b = 44
+layers = 0
+[layerX]
+0 = 594
+
+[layerY]
+0 = -143
+
+[layerColor]
+0 = 223 , 136 , 72
diff --git a/data_test/examples/dummy-3areas-3candidates-3links/input/areas/list.txt b/data_test/examples/dummy-3areas-3candidates-3links/input/areas/list.txt
@@ -0,0 +1,3 @@
+Area
+Area 2
+Area 3
diff --git a/data_test/examples/dummy-3areas-3candidates-3links/input/areas/sets.ini b/data_test/examples/dummy-3areas-3candidates-3links/input/areas/sets.ini
@@ -0,0 +1,6 @@
+[all areas]
+caption = All areas
+comments = Spatial aggregates on all areas
+output = false
+apply-filter = add-all
+
diff --git a/.../examples/dummy-3areas-3candidates-3links/input/bindingconstraints/bindingconstraints.ini b/.../examples/dummy-3areas-3candidates-3links/input/bindingconstraints/bindingconstraints.ini
diff --git a/data_test/examples/dummy-3areas-3candidates-3links/input/hydro/allocation/area 2.ini b/data_test/examples/dummy-3areas-3candidates-3links/input/hydro/allocation/area 2.ini
@@ -0,0 +1,3 @@
+[[allocation]]
+area 2 = 1
+
diff --git a/data_test/examples/dummy-3areas-3candidates-3links/input/hydro/allocation/area 3.ini b/data_test/examples/dummy-3areas-3candidates-3links/input/hydro/allocation/area 3.ini
@@ -0,0 +1,3 @@
+[[allocation]]
+area 3 = 1
+
diff --git a/data_test/examples/dummy-3areas-3candidates-3links/input/hydro/allocation/area.ini b/data_test/examples/dummy-3areas-3candidates-3links/input/hydro/allocation/area.ini
@@ -0,0 +1,3 @@
+[[allocation]]
+area = 1
+
diff --git a/.../dummy-3areas-3candidates-3links/input/hydro/common/capacity/creditmodulations_area 2.txt b/.../dummy-3areas-3candidates-3links/input/hydro/common/capacity/creditmodulations_area 2.txt
@@ -0,0 +1,2 @@
+1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1
+1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1
diff --git a/.../dummy-3areas-3candidates-3links/input/hydro/common/capacity/creditmodulations_area 3.txt b/.../dummy-3areas-3candidates-3links/input/hydro/common/capacity/creditmodulations_area 3.txt
@@ -0,0 +1,2 @@
+1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1
+1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1
diff --git a/...es/dummy-3areas-3candidates-3links/input/hydro/common/capacity/creditmodulations_area.txt b/...es/dummy-3areas-3candidates-3links/input/hydro/common/capacity/creditmodulations_area.txt
@@ -0,0 +1,2 @@
+1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1
+1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		[adequacy-patch]
		adequacy-patch-mode = outside
-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    Area
+    Area 2
+    Area 3
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
		1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1