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

Jump to bottom

Merge stable/1.2 features to master #94

Draft
wants to merge 42 commits into
base: master
Choose a base branch
from
Draft

Merge stable/1.2 features to master #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
dea85cb
Some attempted improvements for solving interdiction branching subpro…
tkralphs Dec 18, 2020
86dfab5
Fixing two small bugs
tkralphs Dec 21, 2020
e1969ab
Fixing small bugs
tkralphs Dec 21, 2020
c7cc8a0
Fixing few bugs
tkralphs Sep 5, 2021
b8231c3
Update incObjCut param set
tkralphs Sep 5, 2021
6a71466
Reverting changes to MibSBranchStrategyPseudo.cpp in e1d77b9261
tkralphs Sep 6, 2021
73cf879
Adding colSignsA2 to track column signs of matrix A2
tkralphs Sep 6, 2021
2815e46
New Benders Binary cut utilizing addition of colSignsA2
tkralphs Sep 6, 2021
307c724
Removing faulty assert
tkralphs Sep 6, 2021
cdebd72
Update incObjCut param set
tkralphs Sep 7, 2021
11101f5
Fixing a small bug related to setting problem type
tkralphs Sep 8, 2021
f66258f
Check to make sure lower-level objective is integral for validity of …
tkralphs Oct 18, 2021
4306c9e
Adjust for tolerance
tkralphs Oct 18, 2021
5b2dd1c
Allow the problem of finding a second-level solution for Type II ICs …
tkralphs Oct 18, 2021
c8af6f4
Allow watermelon cuts to be generated even when solution is completel…
tkralphs Oct 18, 2021
0c8a9ac
Fix some typos and add parameter to control fractional watermelong cu…
tkralphs Oct 18, 2021
27a72f9
Fixing weird obvious bug that would not allow increasing objective cu…
tkralphs Oct 18, 2021
44a5453
Fixing some issues with setting parameters, allowing the possibility …
tkralphs Oct 25, 2021
2f29809
Make sure variable bounds on integer variables are integer and fix a …
tkralphs Oct 26, 2021
0e769b2
Turn down SYMPHONY verbosity
tkralphs Oct 26, 2021
794bd63
Tweaking parameters once more
tkralphs Oct 27, 2021
d6a6b0f
Small bug and adding an assert back in
tkralphs Oct 27, 2021
2ae46f3
OK, we probably do need these settings
tkralphs Oct 28, 2021
6dbbfea
Some small fixes and better output. Make tailoff detection happen by …
tkralphs Nov 5, 2021
ea4698f
Make it possible to separate fractional solutions and add parameter f…
tkralphs Nov 24, 2021
1aa4738
Fixes #88
tkralphs Nov 30, 2021
95a51cb
fix bugs in cut generator; clean up instance load
yuxies Jan 18, 2022
46229a7
revert changes on intCosts condition and interdiction cut; modify coe…
yuxies Feb 1, 2022
96ae1ca
change to lowerCol to match lowerRow
yuxies Feb 1, 2022
c7ded90
clean up interdict rowSense; remove unused vars
yuxies Feb 9, 2022
47a9b5b
change instanceStructure and setRequiredFixedList
yuxies Feb 9, 2022
a1bbeee
createBilvl combine LR soln copy block and fix bug
yuxies Mar 17, 2022
76cb6be
bring back lowerSol init in the front
yuxies Mar 17, 2022
e166fac
change model_->solver() to oSolver for consistency
yuxies Mar 17, 2022
0870ef5
fix conditions in !shouldPrune_ blk
yuxies Mar 17, 2022
eea999e
potential memory leak;
yuxies Mar 2, 2022
f735ff2
change heur sol marking in checkbilvlfeas
yuxies Mar 28, 2022
a86c9bf
fix useIncObjCut type in cut generator
yuxies Apr 4, 2022
85077c2
correct solution tag after rearrange
yuxies Apr 7, 2022
ab6e00d
move isUBSolved around to ensure valid soln check
yuxies Apr 8, 2022
7f890b1
explicitly turn off useIncObjCut if not feasible
yuxies Apr 8, 2022
1a38d49
Merge branch 'coin-or:master' into master
yuxies Jan 25, 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
251 changes: 96 additions & 155 deletions src/MibSBilevel.cpp
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion src/MibSBranchStrategyPseudo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,6 @@ MibSBranchStrategyPseudo::createCandBranchObjects(int numPassesLeft, double ub)
else {
preferDir = -1;
}

branchObjects_[i] = infObjects[i]->createBranchObject(model,
preferDir);
score = infObjects[i]->pseudocost().getScore();
Expand Down
Loading
Loading