-
Notifications
You must be signed in to change notification settings - Fork 43
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
fix most frac branching + cvrp demo for ci tests #352
Conversation
guimarqu
commented
May 25, 2020
•
edited
Loading
edited
- add cvrp demo tests
- fix TreeSearchAlgorithm infinite branching loop when restricted LP master infeasible #353 (local art var in branching constraints + integer tol for Most frac rule)
Codecov Report
@@ Coverage Diff @@
## master #352 +/- ##
==========================================
+ Coverage 75.29% 75.72% +0.42%
==========================================
Files 50 50
Lines 3672 3674 +2
==========================================
+ Hits 2765 2782 +17
+ Misses 907 892 -15
Continue to review full report at Codecov.
|
@@ -282,13 +283,22 @@ function run!(algo::StrongBranching, data::ReformData, input::DivideInput)::Divi | |||
end | |||
|
|||
# sort branching candidates according to the selection criterion and remove excess ones | |||
nb_candidates_kept = nb_candidates_needed |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it is much better not to generate branching groups with a very small distance to integer. In varbranching.jl, line 92, we check if !isinteger(val)
. Instead, we should check if val
is not within a tolerance to an integer.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do I put a int_tol
parameter in VarBranchingRule
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it is better to keep in StrongBranching and pass it to branching rules inside BranchingRuleInput