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

First version of presolve #1069

Merged
merged 14 commits into from
Sep 29, 2023
Merged

First version of presolve #1069

merged 14 commits into from
Sep 29, 2023

Conversation

guimarqu
Copy link
Contributor

No description provided.

@codecov
Copy link

codecov bot commented Sep 21, 2023 •
edited
Loading

Codecov Report

Attention: 16 lines in your changes are missing coverage. Please review.

Comparison is base (dab4087) 82.69% compared to head (1467de5) 82.68%.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #1069      +/-   ##
==========================================
- Coverage   82.69%   82.68%   -0.01%     
==========================================
  Files          89       89              
  Lines        7182     7179       -3     
==========================================
- Hits         5939     5936       -3     
  Misses       1243     1243
Files Coverage Δ
src/Algorithm/branching/single_var_branching.jl 85.71% <ø> (ø)
src/Algorithm/conquer.jl 63.57% <100.00%> (ø)
src/Algorithm/heuristic/restricted_master.jl 100.00% <100.00%> (ø)
src/Algorithm/interface.jl 86.66% <ø> (ø)
src/Algorithm/treesearch/branch_and_bound.jl 91.04% <100.00%> (ø)
src/Branching/Branching.jl 73.26% <100.00%> (ø)
src/MathProg/varconstr.jl 82.77% <100.00%> (ø)
src/Algorithm/formstorages.jl 91.97% <50.00%> (-0.10%) ⬇️
src/Branching/candidate.jl 0.00% <0.00%> (ø)
src/Heuristic/Heuristic.jl 0.00% <0.00%> (ø)
... and 1 more

... and 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

guimarqu and others added 7 commits September 22, 2023 10:01
@guimarqu
Merge branch 'master' into continue_diving
8374714
@rrsadykov
Adding branching context to Branching.generate_children!()
5cbdcad
@rrsadykov
Merge commit '63a240552490e8d7041205558da74da2144e6ee3' into continue…
47c2505 
…_diving
@guimarqu
Merge branch 'master' into continue_diving
2079096
@rrsadykov
- Improve RestrictedMasterHeuristic
8fbb9ab 
- Heuristics of conquer algorithms should be of type `AbstractHeuristic`
- Branch-and-bound algorithm of Coluna can now work with any `AbstractNode`
@rrsadykov
Make the tests pass
67806c0
@rrsadykov
- Temporarily solving bug with partial solution in the presolve algor…
2097465 
…ithm

- Remove warning about changing lower bound of fixed variable if the variable is a master column
@rrsadykov
Copy link
Collaborator

In the presolve algorithm, we first copy the current partial solution to PresolveFormRepr in create_presolve_reform(), and then we add this partial solution again to the formulation in update_reform_from_presolve!(). Thus, the partial solution is "doubled" each time the presolve algorithm is called. I have corrected this issue in a crude way (I do not copy current partial solution to PresolveFormRepr), we need to check whether this is the right way to do it.

@rrsadykov rrsadykov marked this pull request as ready for review September 28, 2023 13:48
@rrsadykov rrsadykov self-requested a review September 28, 2023 13:49
rrsadykov
rrsadykov approved these changes Sep 28, 2023
View reviewed changes
Copy link
Collaborator

@rrsadykov rrsadykov left a comment

Choose a reason for hiding this comment

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

Ok for me as the first version of presolve, fixes issue #1061.

@guimarqu guimarqu merged commit 5d23d85 into master Sep 29, 2023
@guimarqu guimarqu deleted the continue_diving branch September 29, 2023 08:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rrsadykov rrsadykov rrsadykov approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@guimarqu @rrsadykov