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 conditions to restart colgen when using lazy cut gen #502

Merged
merged 5 commits into from
Apr 15, 2021

Conversation

guimarqu
Copy link
Contributor

Fix: Colgen cannot declare the convergence just after an essential cut has been added to the master.

Now, colgen will restart only if we add an essential cut in phase 2.

We still perform essential cut generation as I said in #452 .

@guimarqu guimarqu added the bug Something isn't working label Apr 15, 2021
@guimarqu guimarqu requested a review from rrsadykov April 15, 2021 14:20
@codecov
Copy link

codecov bot commented Apr 15, 2021

Codecov Report

Merging #502 (97ed490) into master (46a36ae) will decrease coverage by 0.07%.
The diff coverage is 95.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #502      +/-   ##
==========================================
- Coverage   83.84%   83.76%   -0.08%     
==========================================
  Files          47       47              
  Lines        4674     4676       +2     
==========================================
- Hits         3919     3917       -2     
- Misses        755      759       +4     
Impacted Files Coverage Δ
src/Algorithm/colgen.jl 96.53% <95.00%> (-0.24%) ⬇️
src/Algorithm/branching/branchinggroup.jl 88.17% <0.00%> (-1.08%) ⬇️
src/Algorithm/branching/branchingalgo.jl 90.32% <0.00%> (-0.81%) ⬇️
src/Algorithm/storage.jl 76.11% <0.00%> (-0.75%) ⬇️

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 46a36ae...97ed490. Read the comment docs.

Copy link
Contributor Author

@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.

Comments to help the reviewer because I formatted the file.

src/Algorithm/colgen.jl Show resolved Hide resolved
src/Algorithm/colgen.jl Show resolved Hide resolved
src/Algorithm/colgen.jl Show resolved Hide resolved
src/Algorithm/colgen.jl Show resolved Hide resolved
src/Algorithm/colgen.jl Outdated Show resolved Hide resolved
deactivate_artificial_vars = false,
enforce_integrality = false,
log_level = 2
deactivate_artificial_vars=false,
Copy link
Collaborator

Choose a reason for hiding this comment

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

why did you remove spaces around =? This is a new convention? I think with spaces it looks better

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's the formatter and it looks like to be the convention : https://github.com/invenia/BlueStyle#keyword-arguments

src/Algorithm/colgen.jl Outdated Show resolved Hide resolved
src/Algorithm/colgen.jl Outdated Show resolved Hide resolved
src/Algorithm/colgen.jl Show resolved Hide resolved
@guimarqu guimarqu requested a review from rrsadykov April 15, 2021 14:57
@guimarqu guimarqu enabled auto-merge (squash) April 15, 2021 14:59
@guimarqu guimarqu merged commit 7664620 into master Apr 15, 2021
@guimarqu guimarqu deleted the colgen_phases_esscuts branch April 15, 2021 15:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants