From 9926083dcc5f6865f9a9747377c0592fce321ad3 Mon Sep 17 00:00:00 2001 From: azakir <32519851+a-zakir@users.noreply.github.com> Date: Tue, 29 Mar 2022 17:54:56 +0200 Subject: [PATCH] delete method option in ini file && check (#417) * delete method option in ini file && check * fix unit_launcher tests * delete comments --- .../user/expansion/settings.ini | 1 - .../user/expansion/settings.ini | 1 - .../user/expansion/settings.ini | 1 - .../user/expansion/settings.ini | 1 - .../user/expansion/settings.ini | 1 - .../user/expansion/settings.ini | 1 - .../user/expansion/settings.ini | 1 - .../user/expansion/settings.ini | 1 - .../user/expansion/settings.ini | 1 - .../user/expansion/settings.ini | 1 - .../user/expansion/settings.ini | 1 - .../user/expansion/settings.ini | 1 - .../user/expansion/settings.ini | 1 - .../user/expansion/settings.ini | 1 - .../other_inputs_for_test/settings-1.ini | 11 ++++---- .../other_inputs_for_test/settings-2.ini | 11 ++++---- .../other_inputs_for_test/settings-3.ini | 11 ++++---- .../settings-accurate.ini | 11 ++++---- .../other_inputs_for_test/settings-error.ini | 11 ++++---- .../other_inputs_for_test/settings-fast.ini | 11 ++++---- .../settings-nonnumericgap.ini | 11 ++++---- .../settings-nottruefalse.ini | 11 ++++---- .../settings-relaxed_accurate.ini | 11 ++++---- .../settings-relaxed_fast.ini | 11 ++++---- .../settings-unknowncuttype.ini | 11 ++++---- .../settings-unknownopt.ini | 13 +++++---- .../user/expansion/settings.ini | 11 ++++---- .../user/expansion/settings.ini | 1 - .../user/expansion/settings.ini | 1 - .../user/expansion/settings.ini | 1 - .../user/expansion/settings.ini | 1 - .../user/expansion/settings.ini | 1 - .../user/expansion/settings.ini | 1 - .../user/expansion/settings.ini | 1 - .../user/expansion/settings.ini | 1 - .../user/expansion/settings.ini | 1 - .../user/expansion/settings.ini | 1 - .../user/expansion/settings.ini | 1 - .../user/expansion/settings.ini | 1 - .../user/expansion/settings.ini | 1 - .../user/expansion/settings.ini | 1 - src/python/antares_xpansion/input_checker.py | 10 ++++--- tests/python/test_input_checker.py | 27 +++---------------- 43 files changed, 76 insertions(+), 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 index 6e6cb0576..3939f828d 100644 --- 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 index b263f06b3..a993b237c 100644 --- 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 index c71d0909b..d9dd78eb4 100644 --- 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 index d81e68e44..584269ebb 100644 --- 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 index c71d0909b..d9dd78eb4 100644 --- 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 index f2fe6260f..5ebe01bdd 100644 --- 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 index ea2cb08f7..15de8db45 100644 --- 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 index f2fe6260f..5ebe01bdd 100644 --- 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 index 05ced8677..0dd675a52 100644 --- 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 index 9609821aa..9d2266df9 100644 --- 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 index 27e5c7638..47a979a57 100644 --- 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 index f2fe6260f..5ebe01bdd 100644 --- 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 index 90e74c92f..62d4ec4c2 100644 --- 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 \ No newline at end of file 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 index d81e68e44..584269ebb 100644 --- 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 index 11a573fc1..a6a27fd39 100644 --- 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% \ No newline at end of file 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 index 6636419eb..f486a2fa2 100644 --- 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% \ No newline at end of file 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 index 2c183635c..cca5a822e 100644 --- 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 \ No newline at end of file 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 index d0b8351dc..3bd046c35 100644 --- 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% \ No newline at end of file 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 index 924724308..da4b543da 100644 --- 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% \ No newline at end of file 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 index 74edf15dc..f09f72594 100644 --- 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% \ No newline at end of file diff --git a/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-nonnumericgap.ini b/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-nonnumericgap.ini index 63b2b7f61..74b9162c1 100644 --- a/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-nonnumericgap.ini +++ b/data_test/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% \ No newline at end of file diff --git a/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-nottruefalse.ini b/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-nottruefalse.ini index 0bf2b5e01..dec2a2c73 100644 --- a/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-nottruefalse.ini +++ b/data_test/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% \ No newline at end of file diff --git a/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-relaxed_accurate.ini b/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-relaxed_accurate.ini index beee78776..f01ac348e 100644 --- a/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-relaxed_accurate.ini +++ b/data_test/test_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% \ No newline at end of file diff --git a/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-relaxed_fast.ini b/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-relaxed_fast.ini index 514d45400..ca771a3cd 100644 --- a/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-relaxed_fast.ini +++ b/data_test/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% \ No newline at end of file diff --git a/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-unknowncuttype.ini b/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-unknowncuttype.ini index 5c6dbd9c8..1f21fd28b 100644 --- a/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-unknowncuttype.ini +++ b/data_test/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% \ No newline at end of file diff --git a/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-unknownopt.ini b/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-unknownopt.ini index 9b4f588f7..5cd5486d1 100644 --- a/data_test/test_case_7.1_structure/user/expansion/other_inputs_for_test/settings-unknownopt.ini +++ b/data_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 \ No newline at end of file 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 index 924724308..da4b543da 100644 --- 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% \ No newline at end of file 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 index a58d23ff8..e9ea56cbf 100644 --- 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/data_test/tests_lpnamer/tests_integer/test_one_link_one_candidate_1week/user/expansion/settings.ini b/data_test/tests_lpnamer/tests_integer/test_one_link_one_candidate_1week/user/expansion/settings.ini index d81e68e44..584269ebb 100644 --- a/data_test/tests_lpnamer/tests_integer/test_one_link_one_candidate_1week/user/expansion/settings.ini +++ b/data_test/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/data_test/tests_lpnamer/tests_integer/test_one_link_two_candidates_1week/user/expansion/settings.ini b/data_test/tests_lpnamer/tests_integer/test_one_link_two_candidates_1week/user/expansion/settings.ini index d81e68e44..584269ebb 100644 --- a/data_test/tests_lpnamer/tests_integer/test_one_link_two_candidates_1week/user/expansion/settings.ini +++ b/data_test/tests_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/data_test/tests_lpnamer/tests_integer/test_one_link_two_candidates_simple_prob/user/expansion/settings.ini b/data_test/tests_lpnamer/tests_integer/test_one_link_two_candidates_simple_prob/user/expansion/settings.ini index d81e68e44..584269ebb 100644 --- a/data_test/tests_lpnamer/tests_integer/test_one_link_two_candidates_simple_prob/user/expansion/settings.ini +++ b/data_test/tests_lpnamer/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/data_test/tests_lpnamer/tests_integer/test_one_link_two_candidates_simple_prob_hurdle_cost/user/expansion/settings.ini b/data_test/tests_lpnamer/tests_integer/test_one_link_two_candidates_simple_prob_hurdle_cost/user/expansion/settings.ini index d81e68e44..584269ebb 100644 --- a/data_test/tests_lpnamer/tests_integer/test_one_link_two_candidates_simple_prob_hurdle_cost/user/expansion/settings.ini +++ b/data_test/tests_lpnamer/tests_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/data_test/tests_lpnamer/tests_integer/test_one_link_two_candidates_simple_prob_null_profile/user/expansion/settings.ini b/data_test/tests_lpnamer/tests_integer/test_one_link_two_candidates_simple_prob_null_profile/user/expansion/settings.ini index d81e68e44..584269ebb 100644 --- a/data_test/tests_lpnamer/tests_integer/test_one_link_two_candidates_simple_prob_null_profile/user/expansion/settings.ini +++ b/data_test/tests_lpnamer/tests_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/data_test/tests_lpnamer/tests_relaxed/SmallTestSixCandidatesWithAlreadyInstalledCapacity-relaxed/user/expansion/settings.ini b/data_test/tests_lpnamer/tests_relaxed/SmallTestSixCandidatesWithAlreadyInstalledCapacity-relaxed/user/expansion/settings.ini index bde2cb5bc..17fad973e 100644 --- a/data_test/tests_lpnamer/tests_relaxed/SmallTestSixCandidatesWithAlreadyInstalledCapacity-relaxed/user/expansion/settings.ini +++ b/data_test/tests_lpnamer/tests_relaxed/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/data_test/tests_lpnamer/tests_relaxed/test_one_link_one_candidate-relaxed/user/expansion/settings.ini b/data_test/tests_lpnamer/tests_relaxed/test_one_link_one_candidate-relaxed/user/expansion/settings.ini index 35c8c3798..7ab2bfbfc 100644 --- a/data_test/tests_lpnamer/tests_relaxed/test_one_link_one_candidate-relaxed/user/expansion/settings.ini +++ b/data_test/tests_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 index f2fe6260f..5ebe01bdd 100644 --- 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 index ea2cb08f7..15de8db45 100644 --- 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 index bde2cb5bc..17fad973e 100644 --- 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 index 9609821aa..9d2266df9 100644 --- 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 index 6e6cb0576..3939f828d 100644 --- 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 index b263f06b3..a993b237c 100644 --- 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 index de14a5ba6..69aa0d2a6 100644 --- 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), diff --git a/tests/python/test_input_checker.py b/tests/python/test_input_checker.py index e2ee084e5..89db30b3d 100644 --- a/tests/python/test_input_checker.py +++ b/tests/python/test_input_checker.py @@ -175,7 +175,7 @@ def test_duplicated_candidate_name_ini_file(self, tmp_path): unit-size = 400\n""") with pytest.raises(CandidateNameDuplicatedError): - check_candidates_file(ini_file, "") + check_candidates_file(ini_file, "") def test_non_null_max_units_and_max_investment_simultaneaously(self, tmp_path): @@ -219,25 +219,6 @@ def test_profile_file_existence(self, tmp_path): with pytest.raises(ProfileFileNotExists): check_candidates_file(ini_file, capacity_dir_path=tmp_path) - # def test_remove_candidate(self, tmp_path): - - # ini_file = tmp_path / "a.ini" - # ini_file.touch() - # ini_file.write_text(f"""[5] \n - # name = alpha \n - # link = a - b \n - # max-units = 1\n - # unit-size = 23\n - # link-profile = 1""") - - # # with pytest.raises(ProfileFileNotExists): - # check_candidates_file(ini_file, capacity_dir_path=tmp_path) - - # with open(ini_file) as ini: - # print(ini.readlines()) - - # assert False - class TestCheckSettingOptionType: @@ -248,8 +229,9 @@ def test_check_setting_option_type(self): def test_str_options(self): - assert _check_setting_option_type("method", "sequential") == True - assert _check_setting_option_type("method", 123) == False + assert _check_setting_option_type( + "uc_type", "expansion_accurate") == True + assert _check_setting_option_type("uc_type", 123) == False def test_int_options(self): @@ -292,7 +274,6 @@ def test_negative_max_iteration(self): with pytest.raises(MaxIterValueError): _check_setting_option_value("max_iteration", -2) - def test_wrong_time_limit(self): with pytest.raises(TimelimitValueError):