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

fix most frac branching + cvrp demo for ci tests #352

Merged
merged 6 commits into from
May 28, 2020
Merged

Conversation

guimarqu
Copy link
Contributor

@guimarqu guimarqu commented May 25, 2020

@codecov
Copy link

codecov bot commented May 28, 2020

Codecov Report

Merging #352 into master will increase coverage by 0.42%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            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     
Impacted Files Coverage Δ
src/Algorithm/branching/branchingrule.jl 28.57% <ø> (ø)
src/Algorithm/branching/branchingalgo.jl 88.54% <100.00%> (ø)
src/Algorithm/branching/varbranching.jl 97.36% <100.00%> (ø)
src/Algorithm/conquer.jl 69.64% <100.00%> (+0.55%) ⬆️
src/globals.jl 100.00% <100.00%> (ø)
src/MathProg/decomposition.jl 94.30% <0.00%> (+0.51%) ⬆️
src/Algorithm/treesearch.jl 87.83% <0.00%> (+0.67%) ⬆️
src/MathProg/varconstr.jl 80.82% <0.00%> (+1.36%) ⬆️
src/Algorithm/formstorages.jl 38.51% <0.00%> (+2.22%) ⬆️
src/MathProg/formulation.jl 71.73% <0.00%> (+2.89%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0ad2c75...2e124e0. Read the comment docs.

@guimarqu guimarqu marked this pull request as ready for review May 28, 2020 13:42
@guimarqu guimarqu changed the title cvrp demo for ci tests fix most frac branching + cvrp demo for ci tests May 28, 2020
@guimarqu guimarqu requested a review from rrsadykov May 28, 2020 13:43
@@ -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
Copy link
Collaborator

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.

Copy link
Contributor Author

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 ?

Copy link
Collaborator

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

@guimarqu guimarqu requested a review from rrsadykov May 28, 2020 15:15
@guimarqu guimarqu merged commit 281ecc3 into master May 28, 2020
@guimarqu guimarqu deleted the cvrpcutcb branch May 28, 2020 21:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

TreeSearchAlgorithm infinite branching loop when restricted LP master infeasible
2 participants