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

Support of variable branching priorities in the branching algorithm #528

Merged
merged 1 commit into from
May 15, 2021

Conversation

rrsadykov
Copy link
Collaborator

This functionality works, but we also need to change the type of branching priorities in BlockDecomposition from Int to Float.

The idea of fractional branching priorities to have both "soft" and "hard" branching priorities in strong branching:

  • If the number of branching candidates with priority 4.0 is less than the maximum number, no branching candidates with priority 3.0 will be considered.
  • If the number of branching candidates with priority 3.5 is less than the maximum number, then some branching candidates with priority 3.0 will be considered (to bring the total number to the maximum).
  • If the number of branching candidates with priority 3.5 is not less than the maximum number, then no branching candidates with priority 3.0 will be considered.

@rrsadykov rrsadykov requested a review from guimarqu May 15, 2021 12:13
@rrsadykov rrsadykov mentioned this pull request May 15, 2021
Copy link
Contributor

@guimarqu guimarqu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok I'll change the branching priority type in BlockDecomposition. I didn't know this mechanism.

@guimarqu guimarqu enabled auto-merge (squash) May 15, 2021 12:19
@codecov
Copy link

codecov bot commented May 15, 2021

Codecov Report

Merging #528 (5284c84) into master (eca9514) will decrease coverage by 0.03%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #528      +/-   ##
==========================================
- Coverage   84.57%   84.54%   -0.04%     
==========================================
  Files          47       47              
  Lines        4694     4697       +3     
==========================================
+ Hits         3970     3971       +1     
- Misses        724      726       +2     
Impacted Files Coverage Δ
src/Algorithm/branching/branchingalgo.jl 91.12% <ø> (ø)
src/Algorithm/branching/branchingrule.jl 20.00% <ø> (ø)
src/MathProg/clone.jl 100.00% <ø> (ø)
src/MathProg/formulation.jl 74.02% <ø> (ø)
src/MathProg/variable.jl 76.00% <ø> (ø)
src/Algorithm/branching/varbranching.jl 97.50% <100.00%> (+0.06%) ⬆️
src/Algorithm/treesearch.jl 95.06% <100.00%> (ø)
src/MOIwrapper.jl 76.64% <100.00%> (ø)
src/MathProg/varconstr.jl 87.17% <100.00%> (+0.16%) ⬆️
src/Algorithm/branching/branchinggroup.jl 88.17% <0.00%> (-1.08%) ⬇️
... and 2 more

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 eca9514...5284c84. Read the comment docs.

@guimarqu guimarqu merged commit df7d7f0 into master May 15, 2021
@guimarqu guimarqu deleted the var_branching_priority_2 branch May 17, 2021 22:07
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.

2 participants