Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge classical and by batch benders #738

Merged
merged 25 commits into from
Feb 7, 2024
+113 −315
Merged

merge classical and by batch benders #738

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
bb6e2aa
prepare merge
a-zakir Dec 26, 2023
1e6ff4c
update test
a-zakir Dec 26, 2023
3038d90
remove extra-qualifer
a-zakir Dec 26, 2023
7a4f296
remove by batch exe
a-zakir Dec 26, 2023
8317259
remove deprecated line
a-zakir Dec 26, 2023
9dd08af
update conf
a-zakir Dec 26, 2023
7ff6897
fix
a-zakir Dec 26, 2023
d7737d0
remove deprecated CLI option
a-zakir Dec 26, 2023
40d8d0c
remove deprecated CLI option
a-zakir Dec 26, 2023
2efc11a
fix tests
a-zakir Dec 27, 2023
e3103ca
fix tests
a-zakir Dec 27, 2023
2e6cca3
fix
a-zakir Dec 27, 2023
1a38b11
fix test
a-zakir Dec 27, 2023
fdcb14e
test failure
a-zakir Dec 27, 2023
bd8aae3
fix
a-zakir Dec 27, 2023
c30019d
fix
a-zakir Dec 27, 2023
64f10ef
pr comments
a-zakir Jan 30, 2024
ffd251e
Merge branch 'develop' into feature/merge-classical-and-by-batch-benders
a-zakir Jan 30, 2024
6a653cd
resolve conflict
a-zakir Jan 30, 2024
03a5a21
replace enum
a-zakir Jan 30, 2024
222bda2
parse --xpress option as boolean
a-zakir Jan 31, 2024
42922ca
runtime option
a-zakir Jan 31, 2024
38a8b3e
resolve conflict
a-zakir Feb 6, 2024
f1d1ff5
fix
a-zakir Feb 6, 2024
47b7b9e
pr remarks
a-zakir Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix test
@a-zakir
a-zakir committed Dec 27, 2023
commit 1a38b119ab311c197ea33adb69612feacb9b41aa
16 changes: 6 additions & 10 deletions tests/end_to_end/examples/example_test.py
View file
Original file line number Diff line number Diff line change
@@ -351,7 +351,7 @@ def test_full_study_long_sequential(
tmp_study = tmp_path / study_path.name
shutil.copytree(study_path, tmp_study)
launch_xpansion(install_dir, tmp_study,
BendersMethod.BENDERS, allow_run_as_root, 1)
allow_run_as_root, 1)
verify_solution(tmp_study, expected_values, expected_investment_solution)
verify_study_update(
tmp_study, expected_investment_solution, antares_version)
@@ -373,8 +373,7 @@ def test_full_study_long_mpi(
):
tmp_study = tmp_path / study_path.name
shutil.copytree(study_path, tmp_study)
launch_xpansion(install_dir, tmp_study,
BendersMethod.BENDERS, allow_run_as_root)
launch_xpansion(install_dir, tmp_study, allow_run_as_root)
verify_solution(tmp_study, expected_values, expected_investment_solution)
verify_study_update(
tmp_study, expected_investment_solution, antares_version)
@@ -566,8 +565,7 @@ def test_full_study_medium_sequential(
):
tmp_study = tmp_path / study_path.name
shutil.copytree(study_path, tmp_study)
launch_xpansion(install_dir, tmp_study,
BendersMethod.BENDERS, allow_run_as_root, 1)
launch_xpansion(install_dir, tmp_study, allow_run_as_root, 1)
verify_solution(tmp_study, expected_values, expected_investment_solution)
verify_study_update(
tmp_study, expected_investment_solution, antares_version)
@@ -589,8 +587,7 @@ def test_full_study_medium_parallel(
):
tmp_study = tmp_path / study_path.name
shutil.copytree(study_path, tmp_study)
launch_xpansion(install_dir, tmp_study,
BendersMethod.BENDERS, allow_run_as_root)
launch_xpansion(install_dir, tmp_study, allow_run_as_root)
verify_solution(tmp_study, expected_values, expected_investment_solution)
verify_study_update(
tmp_study, expected_investment_solution, antares_version)
@@ -681,7 +678,7 @@ def test_full_study_short_sequential(
):
tmp_study = tmp_path / study_path.name
shutil.copytree(study_path, tmp_study)
launch_xpansion(install_dir, tmp_study, BendersMethod.BENDERS,
launch_xpansion(install_dir, tmp_study,
allow_run_as_root, nproc=1)
verify_solution(tmp_study, expected_values, expected_investment_solution)
verify_study_update(
@@ -704,8 +701,7 @@ def test_full_study_short_parallel(
):
tmp_study = tmp_path / study_path.name
shutil.copytree(study_path, tmp_study)
launch_xpansion(install_dir, tmp_study,
BendersMethod.BENDERS, allow_run_as_root)
launch_xpansion(install_dir, tmp_study, allow_run_as_root)
verify_solution(tmp_study, expected_values, expected_investment_solution)
verify_study_update(
tmp_study, expected_investment_solution, antares_version)