delete method option in ini file && check (#417)

* delete method option in ini file && check * fix unit_launcher tests * delete comments
AntaresSimulatorTeam · Mar 29, 2022 · 9926083 · 9926083
1 parent b795e52
commit 9926083
Show file tree

Hide file tree

Showing 43 changed files with 76 additions and 134 deletions.
diff --git a/data_test/examples/additionnal-constraints-binary/user/expansion/settings.ini b/data_test/examples/additionnal-constraints-binary/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_fast
 master = integer
 optimality_gap = 10

diff --git a/data_test/examples/additionnal-constraints/user/expansion/settings.ini b/data_test/examples/additionnal-constraints/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_fast
 master = integer
 optimality_gap = 10

diff --git a/data_test/examples/empty-link-profile/user/expansion/settings.ini b/data_test/examples/empty-link-profile/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_fast
 master = integer
 optimality_gap = 1

diff --git a/data_test/examples/hurdles-cost-profile-value-over-one/user/expansion/settings.ini b/data_test/examples/hurdles-cost-profile-value-over-one/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_fast
 master = integer
 optimality_gap = 1000000

diff --git a/data_test/examples/link-profile-with-empty-week/user/expansion/settings.ini b/data_test/examples/link-profile-with-empty-week/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_fast
 master = integer
 optimality_gap = 1

diff --git a/data_test/examples/xpansion-test-01-hurdles-cost/user/expansion/settings.ini b/data_test/examples/xpansion-test-01-hurdles-cost/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_fast
 master = integer
 optimality_gap = 10

diff --git a/data_test/examples/xpansion-test-01-weights/user/expansion/settings.ini b/data_test/examples/xpansion-test-01-weights/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_fast
 master = integer
 optimality_gap = 10

diff --git a/data_test/examples/xpansion-test-01/user/expansion/settings.ini b/data_test/examples/xpansion-test-01/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_fast
 master = integer
 optimality_gap = 10

diff --git a/data_test/examples/xpansion-test-02-new/user/expansion/settings.ini b/data_test/examples/xpansion-test-02-new/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_fast
 master = integer
 optimality_gap = 10000

diff --git a/data_test/examples/xpansion-test-02/user/expansion/settings.ini b/data_test/examples/xpansion-test-02/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_accurate
 master = integer
 optimality_gap = 0

diff --git a/data_test/examples/xpansion-test-03/user/expansion/settings.ini b/data_test/examples/xpansion-test-03/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_accurate
 master = integer
 optimality_gap = 1000000

diff --git a/data_test/examples/xpansion-test-04-mps-rounding/user/expansion/settings.ini b/data_test/examples/xpansion-test-04-mps-rounding/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_fast
 master = integer
 optimality_gap = 10

diff --git a/data_test/examples/xpansion-test-05-area-uppercase/user/expansion/settings.ini b/data_test/examples/xpansion-test-05-area-uppercase/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_fast
 master = relaxed
 optimality_gap = 1000
diff --git a/data_test/examples/xpansion-test-one-link-two-candidates/user/expansion/settings.ini b/data_test/examples/xpansion-test-one-link-two-candidates/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_fast
 master = integer
 optimality_gap = 1000000

diff --git a/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-1.ini b/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-1.ini
@@ -1,7 +1,6 @@
-method = benders_decomposition
-uc_type = expansion_accurate
-master = integer
-optimality_gap = 0.0001%
-cut_type = weekly
-week_selection = false
+uc_type = expansion_accurate
+master = integer
+optimality_gap = 0.0001%
+cut_type = weekly
+week_selection = false
 relaxed_optimality_gap = 1%
diff --git a/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-2.ini b/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-2.ini
@@ -1,7 +1,6 @@
-method = benders_decomposition
-uc_type = expansion_accurate
-master = relaxed
-optimality_gap = 1000000
-cut_type = average
-week_selection = false
+uc_type = expansion_accurate
+master = relaxed
+optimality_gap = 1000000
+cut_type = average
+week_selection = false
 relaxed_optimality_gap = 0.1%
diff --git a/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-3.ini b/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-3.ini
@@ -1,7 +1,6 @@
-method = benders_decomposition
-uc_type = expansion_fast
-master = integer
-optimality_gap = -Inf
-cut_type = yearly
-week_selection = false
+uc_type = expansion_fast
+master = integer
+optimality_gap = -Inf
+cut_type = yearly
+week_selection = false
 relaxed_optimality_gap = 1000000
diff --git a/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-accurate.ini b/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-accurate.ini
@@ -1,7 +1,6 @@
-method = benders_decomposition
-uc_type = accurate
-master = integer
-optimality_gap = -Inf
-cut_type = weekly
-week_selection = false
+uc_type = accurate
+master = integer
+optimality_gap = -Inf
+cut_type = weekly
+week_selection = false
 relaxed_optimality_gap = 1%
diff --git a/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-error.ini b/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-error.ini
@@ -1,7 +1,6 @@
-method = benders_decomposition
-uc_type = expansion_accurate
-master = integer
-optimality_gap = -Inf
-cut_type = weekly
-week_selection = false
+uc_type = expansion_accurate
+master = integer
+optimality_gap = -Inf
+cut_type = weekly
+week_selection = false
 relaxed_optimality_gap = 1%
diff --git a/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-fast.ini b/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-fast.ini
@@ -1,7 +1,6 @@
-method = benders_decomposition
-uc_type = fast
-master = integer
-optimality_gap = -Inf
-cut_type = weekly
-week_selection = false
+uc_type = fast
+master = integer
+optimality_gap = -Inf
+cut_type = weekly
+week_selection = false
 relaxed_optimality_gap = 1%
diff --git a/...t/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-nonnumericgap.ini b/...t/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-nonnumericgap.ini
@@ -1,7 +1,6 @@
-method = benders_decomposition
-uc_type = expansion_accurate
-master = integer
-optimality_gap = nonnumeric
-cut_type = weekly
-week_selection = false
+uc_type = expansion_accurate
+master = integer
+optimality_gap = nonnumeric
+cut_type = weekly
+week_selection = false
 relaxed_optimality_gap = 1%
diff --git a/...st/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-nottruefalse.ini b/...st/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-nottruefalse.ini
@@ -1,7 +1,6 @@
-method = benders_decomposition
-uc_type = expansion_accurate
-master = integer
-optimality_gap = nonnumeric
-cut_type = weekly
-week_selection = neithertruenorfalse
+uc_type = expansion_accurate
+master = integer
+optimality_gap = nonnumeric
+cut_type = weekly
+week_selection = neithertruenorfalse
 relaxed_optimality_gap = 1%
diff --git a/...est_case_7.1_structure/user/expansion/other_inputs_for_test/settings-relaxed_accurate.ini b/...est_case_7.1_structure/user/expansion/other_inputs_for_test/settings-relaxed_accurate.ini
@@ -1,7 +1,6 @@
-method = benders_decomposition
-uc_type = relaxed_accurate
-master = integer
-optimality_gap = -Inf
-cut_type = weekly
-week_selection = false
+uc_type = relaxed_accurate
+master = integer
+optimality_gap = -Inf
+cut_type = weekly
+week_selection = false
 relaxed_optimality_gap = 1%
diff --git a/...st/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-relaxed_fast.ini b/...st/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-relaxed_fast.ini
@@ -1,7 +1,6 @@
-method = benders_decomposition
-uc_type = relaxed_fast
-master = integer
-optimality_gap = -Inf
-cut_type = weekly
-week_selection = false
+uc_type = relaxed_fast
+master = integer
+optimality_gap = -Inf
+cut_type = weekly
+week_selection = false
 relaxed_optimality_gap = 1%
diff --git a/.../test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-unknowncuttype.ini b/.../test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-unknowncuttype.ini
@@ -1,7 +1,6 @@
-method = benders_decomposition
-uc_type = expansion_accurate
-master = relaxed
-optimality_gap = 1000000
-cut_type = daily
-week_selection = false
+uc_type = expansion_accurate
+master = relaxed
+optimality_gap = 1000000
+cut_type = daily
+week_selection = false
 relaxed_optimality_gap = 0.1%
diff --git a/...test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-unknownopt.ini b/...test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-unknownopt.ini
@@ -1,8 +1,7 @@
-method = benders_decomposition
-uc_type = expansion_fast
-master = integer
-optimality_gap = 0.0001%
-cut_type = weekly
-week_selection = false
-relaxed_optimality_gap = 1%
+uc_type = expansion_fast
+master = integer
+optimality_gap = 0.0001%
+cut_type = weekly
+week_selection = false
+relaxed_optimality_gap = 1%
 unknown = nothing
diff --git a/data_test/test_case_7.1_structure/user/expansion/settings.ini b/data_test/test_case_7.1_structure/user/expansion/settings.ini
@@ -1,7 +1,6 @@
-method = benders_decomposition
-uc_type = expansion_accurate
-master = integer
-optimality_gap = -Inf
-cut_type = weekly
-week_selection = false
+uc_type = expansion_accurate
+master = integer
+optimality_gap = -Inf
+cut_type = weekly
+week_selection = false
 relaxed_optimality_gap = 1%
diff --git a/data_test/tests_lpnamer/tests_integer/test_lpnamer_01/user/expansion/settings.ini b/data_test/tests_lpnamer/tests_integer/test_lpnamer_01/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_fast
 master = integer
 optimality_gap = 10

diff --git a/...tests_lpnamer/tests_integer/test_one_link_one_candidate_1week/user/expansion/settings.ini b/...tests_lpnamer/tests_integer/test_one_link_one_candidate_1week/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_fast
 master = integer
 optimality_gap = 1000000

diff --git a/...ests_lpnamer/tests_integer/test_one_link_two_candidates_1week/user/expansion/settings.ini b/...ests_lpnamer/tests_integer/test_one_link_two_candidates_1week/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_fast
 master = integer
 optimality_gap = 1000000

diff --git a/...pnamer/tests_integer/test_one_link_two_candidates_simple_prob/user/expansion/settings.ini b/...pnamer/tests_integer/test_one_link_two_candidates_simple_prob/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_fast
 master = integer
 optimality_gap = 1000000

diff --git a/..._integer/test_one_link_two_candidates_simple_prob_hurdle_cost/user/expansion/settings.ini b/..._integer/test_one_link_two_candidates_simple_prob_hurdle_cost/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_fast
 master = integer
 optimality_gap = 1000000

diff --git a/...integer/test_one_link_two_candidates_simple_prob_null_profile/user/expansion/settings.ini b/...integer/test_one_link_two_candidates_simple_prob_null_profile/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_fast
 master = integer
 optimality_gap = 1000000

diff --git a/...ed/SmallTestSixCandidatesWithAlreadyInstalledCapacity-relaxed/user/expansion/settings.ini b/...ed/SmallTestSixCandidatesWithAlreadyInstalledCapacity-relaxed/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_fast
 master = relaxed
 optimality_gap = 10000

diff --git a/...sts_lpnamer/tests_relaxed/test_one_link_one_candidate-relaxed/user/expansion/settings.ini b/...sts_lpnamer/tests_relaxed/test_one_link_one_candidate-relaxed/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_fast
 master = relaxed
 optimality_gap = 1000000

diff --git a/examples/SmallTestFiveCandidates/user/expansion/settings.ini b/examples/SmallTestFiveCandidates/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_fast
 master = integer
 optimality_gap = 10

diff --git a/examples/SmallTestFiveCandidatesWithWeights/user/expansion/settings.ini b/examples/SmallTestFiveCandidatesWithWeights/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_fast
 master = integer
 optimality_gap = 10

diff --git a/examples/SmallTestSixCandidatesWithAlreadyInstalledCapacity/user/expansion/settings.ini b/examples/SmallTestSixCandidatesWithAlreadyInstalledCapacity/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_fast
 master = relaxed
 optimality_gap = 10000

diff --git a/examples/SmallTestSixCandidatesWithPlaylist/user/expansion/settings.ini b/examples/SmallTestSixCandidatesWithPlaylist/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_accurate
 master = integer
 optimality_gap = 0

diff --git a/examples/additionnal-constraints-binary/user/expansion/settings.ini b/examples/additionnal-constraints-binary/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_fast
 master = integer
 optimality_gap = 10

diff --git a/examples/additionnal-constraints/user/expansion/settings.ini b/examples/additionnal-constraints/user/expansion/settings.ini
@@ -1,4 +1,3 @@
-method = benders_decomposition
 uc_type = expansion_fast
 master = integer
 optimality_gap = 10

diff --git a/src/python/antares_xpansion/input_checker.py b/src/python/antares_xpansion/input_checker.py
@@ -115,7 +115,8 @@ def _check_candidate_option_type(option, value):
                      'already-installed-capacity': 'non-negative',
                      'already-installed-link-profile': 'string',
                      'has-link-profile': 'string'}
-    obsolete_options = ["c", 'enable', 'candidate-type', 'investment-type', 'relaxed']
+    obsolete_options = ["c", 'enable',
+                        'candidate-type', 'investment-type', 'relaxed']
     option_type = options_types.get(option)
     if option_type is None:
         flushed_print(
@@ -253,10 +254,12 @@ def _check_candidate_exclusive_attributes(ini_file):
         max_units = float(ini_file[each_section]['max-units'].strip())
         if max_invest != 0:
             if max_units != 0 or unit_size != 0:
-                flushed_print(f"Illegal values in section {each_section}: cannot assign non-null values simultaneously to max-investment and (unit-size or max_units)" )
+                flushed_print(
+                    f"Illegal values in section {each_section}: cannot assign non-null values simultaneously to max-investment and (unit-size or max_units)")
                 raise MaxUnitsAndMaxInvestmentNonNullSimultaneously
         elif max_units == 0 or unit_size == 0:
-            flushed_print(f"Illegal values in section {each_section}: need to assign non-null values to max-investment or (unit-size and max_units)")
+            flushed_print(
+                f"Illegal values in section {each_section}: need to assign non-null values to max-investment or (unit-size and max_units)")
             raise MaxUnitsAndMaxInvestmentAreNullSimultaneously
 
 
@@ -346,7 +349,6 @@ class NotHandledValue(Exception):
 
 # "option": (type, legal_value(s))
 options_types_and_legal_values = {
-    "method": (type_str, ["benders_decomposition"]),
     "uc_type": (type_str, ["expansion_accurate", "expansion_fast"]),
     "master": (type_str, ["relaxed", "integer", "full_integer"]),
     "optimality_gap": (type_float, None),