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.

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

[ANT-1224] Preparing loop around benders solver #739

Merged
merged 104 commits into from
Mar 18, 2024
Merged
Changes from 1 commit
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
f5dc864
store cuts data
a-zakir Dec 28, 2023
9706cfe
save & load cuts
a-zakir Dec 28, 2023
b9ab63b
delete
a-zakir Dec 28, 2023
5b8fa64
fix & rename class
a-zakir Dec 28, 2023
b62a103
save and get
a-zakir Dec 29, 2023
42ea52b
store cuts solutions
a-zakir Jan 31, 2024
2d0ee9b
add interfaces
a-zakir Feb 1, 2024
6294f6f
merge dev
a-zakir Feb 1, 2024
ecde37b
restore file
a-zakir Feb 1, 2024
0f6aed2
split into files
a-zakir Feb 1, 2024
9cae27e
update
a-zakir Feb 1, 2024
58db79b
extract benders pre-execution
a-zakir Feb 1, 2024
81915a6
moving headers
a-zakir Feb 1, 2024
5324f2f
fix
a-zakir Feb 1, 2024
24c88d5
update
a-zakir Feb 1, 2024
96cacd8
fix
a-zakir Feb 1, 2024
35730bc
build "ext_loop" exe
a-zakir Feb 2, 2024
98f3d20
retrieve all vars
a-zakir Feb 2, 2024
186c8ee
begin master update
a-zakir Feb 2, 2024
648496f
seems logical
a-zakir Feb 2, 2024
9759c26
ok
a-zakir Feb 2, 2024
95b5b1b
update criterion check
a-zakir Feb 5, 2024
e48878a
small changes
a-zakir Feb 5, 2024
0a0505f
save&load cuts
a-zakir Feb 6, 2024
4b9e987
update
a-zakir Feb 6, 2024
39b0a82
refactor interfaces
a-zakir Feb 7, 2024
6400061
Merge branch 'develop' into feature/benders_loop
a-zakir Feb 7, 2024
3513288
add file
a-zakir Feb 7, 2024
1ce5e1e
External loop: ok update constraint
a-zakir Feb 7, 2024
906caff
work on constraint add/modification
a-zakir Feb 7, 2024
35035c5
add method to rename rows
a-zakir Feb 8, 2024
3ff614c
give a name to the new constraint
a-zakir Feb 8, 2024
4ee2ad6
constraint added
a-zakir Feb 8, 2024
3397dbf
update constr coeff & problems storage
a-zakir Feb 8, 2024
786f2cf
fix
a-zakir Feb 8, 2024
abe1549
use besti it cuts for criterion checks
a-zakir Feb 9, 2024
f24b983
always name additionnal constraint
a-zakir Feb 9, 2024
314b22a
fix new constraint
a-zakir Feb 9, 2024
726b155
re-use, refactor etc...
a-zakir Feb 9, 2024
d6b0c33
try fix
a-zakir Feb 9, 2024
fe7c24f
hmmm
a-zakir Feb 9, 2024
53d78d2
update
a-zakir Feb 9, 2024
7835c10
start with lambda_max = max_invest
a-zakir Feb 12, 2024
51906f6
add missing file
a-zakir Feb 12, 2024
a935155
change obj by ext loop
a-zakir Feb 12, 2024
4cd3d4b
update obj function
a-zakir Feb 12, 2024
81b4bfa
fix log data
a-zakir Feb 12, 2024
37c202f
nullify only cand vars
a-zakir Feb 12, 2024
7c7780c
update
a-zakir Feb 12, 2024
5a31454
deal with last study not being a zip
a-zakir Feb 13, 2024
e057cd9
some changes
a-zakir Feb 13, 2024
4704377
build ext loop as lib
a-zakir Feb 14, 2024
4e54fca
fix seg faults
a-zakir Feb 15, 2024
55ba05e
update
a-zakir Feb 15, 2024
9c176fb
update
a-zakir Feb 15, 2024
e32912e
tuning
a-zakir Feb 15, 2024
9ac6361
dirty
a-zakir Feb 15, 2024
928da6a
add new log cols
a-zakir Feb 16, 2024
ab14af8
initialise benders_time
a-zakir Feb 16, 2024
0486f97
init ext loop data
a-zakir Feb 16, 2024
bacc175
rename criterion enum
a-zakir Feb 16, 2024
aec5c00
fix test
a-zakir Feb 16, 2024
8664213
small changes
a-zakir Feb 19, 2024
5dbb963
clean
a-zakir Feb 22, 2024
e752762
read ext loop options in file
a-zakir Feb 22, 2024
79cd207
extend logs
a-zakir Feb 23, 2024
cdd239d
update
a-zakir Feb 23, 2024
7fd6068
add iteration seprator
a-zakir Feb 23, 2024
261ca6f
pretty print
a-zakir Feb 23, 2024
bb52227
enhance
a-zakir Feb 23, 2024
cd4d388
update
a-zakir Feb 23, 2024
a878b52
disable log
a-zakir Feb 26, 2024
2cf2edc
filter logs
a-zakir Feb 26, 2024
4ea538a
add unit tests
a-zakir Feb 26, 2024
de3a648
ok
a-zakir Feb 26, 2024
0b5dca1
.
a-zakir Feb 26, 2024
ef5cf61
add master updater test
a-zakir Feb 27, 2024
c2f46cd
conditionnal run
a-zakir Feb 27, 2024
0025974
UPDATE
a-zakir Feb 28, 2024
c5afc3f
push
a-zakir Feb 28, 2024
4630184
add master updater test
a-zakir Feb 28, 2024
1468fcb
tuning tests
a-zakir Feb 28, 2024
762a579
disable cuts storage
a-zakir Feb 28, 2024
9bc380a
tets
a-zakir Feb 29, 2024
ff8e93d
update
a-zakir Feb 29, 2024
46be9a7
update
a-zakir Feb 29, 2024
71fc3c9
update
a-zakir Feb 29, 2024
cb57fdd
math-logs print last iteration
a-zakir Feb 29, 2024
af73a4d
clean
a-zakir Feb 29, 2024
cd45fc3
remove old code
a-zakir Feb 29, 2024
2e4e7bb
pretty-print log
a-zakir Feb 29, 2024
0c4416d
Pr remarks
a-zakir Mar 4, 2024
d83a193
tmp
a-zakir Mar 4, 2024
060ce3a
update
a-zakir Mar 5, 2024
51bdddb
test
a-zakir Mar 5, 2024
9b7caa3
update
a-zakir Mar 5, 2024
7cdbb41
move code
a-zakir Mar 5, 2024
dbba59c
specify root proc jobs
a-zakir Mar 7, 2024
fefc0f8
update
a-zakir Mar 7, 2024
d7f3d93
remove unuseful barrier
a-zakir Mar 7, 2024
577b2ed
update
a-zakir Mar 8, 2024
97027c1
fix coin obj coeffs
a-zakir Mar 11, 2024
7c186fb
outer loop add tests with COIN
a-zakir Mar 11, 2024
7c81c89
test coeffs, rhs and sign
a-zakir Mar 18, 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
update
a-zakir committed Mar 7, 2024
commit fefc0f80a1079485f80a0889528f349537a39348
7 changes: 5 additions & 2 deletions src/cpp/benders/external_loop/OuterLoop.cpp
Original file line number Diff line number Diff line change
@@ -22,14 +22,17 @@ void OuterLoop::Run() {
benders_->InitializeProblems();
benders_->InitExternalValues();
CRITERION criterion;
std::vector<double> obj_coeff;
if (world_.rank() == 0) {
auto obj_coeff = benders_->MasterObjectiveFunctionCoeffs();
obj_coeff = benders_->MasterObjectiveFunctionCoeffs();

// /!\ partially
benders_->SetMasterObjectiveFunctionCoeffsToZeros();

PrintLog();
benders_->launch();
}
benders_->launch();
if (world_.rank() == 0) {
benders_->SetMasterObjectiveFunction(obj_coeff.data(), 0,
obj_coeff.size() - 1);
// de-comment for general case