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

Allow querying conflicts from within JuMP #2300

Merged
merged 14 commits into from
Sep 7, 2020
Merged

Conversation

dourouc05
Copy link
Contributor

This is just to ease access to the conflict machinery in MOI, including documentation. Follows #1035.

By the way, in docs/src/solutions.md, on line 291 (313 after this PR), the docs for MOI.optimize! are called: shouldn't that be JuMP.optimize!?

Also with a simple test for the only error case.

MOI dependency bumped to 0.9.14, as it's the first version supporting conflicts.
@@ -289,6 +311,7 @@ JuMP.dual
JuMP.solve_time
OptimizeNotCalled
MOI.optimize!
Copy link
Member

Choose a reason for hiding this comment

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

Yes, this should be JuMP.optimize!

docs/src/solutions.md Outdated Show resolved Hide resolved
@dourouc05
Copy link
Contributor Author

I tried many things to make Documenter work with the new function, I can't understand what causes the problem(s) and Documenter's output is very far from useful. I'm giving up.

@odow
Copy link
Member

odow commented Aug 9, 2020

I'll take a look

@dourouc05
Copy link
Contributor Author

Thanks! If you can find the root cause, I'm interested!

@dourouc05
Copy link
Contributor Author

@odow: did you have the opportunity to have a look at this? (Supposing you're not on holidays :)!)

@odow
Copy link
Member

odow commented Aug 20, 2020

Yes, you just need to merge this: dourouc05#1

@dourouc05
Copy link
Contributor Author

dourouc05 commented Aug 20, 2020

Sorry, I didn't see that. It's now merged, thanks!

@codecov
Copy link

codecov bot commented Aug 20, 2020

Codecov Report

Merging #2300 into master will decrease coverage by 0.02%.
The diff coverage is 66.66%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2300      +/-   ##
==========================================
- Coverage   91.33%   91.31%   -0.03%     
==========================================
  Files          42       42              
  Lines        4258     4258              
==========================================
- Hits         3889     3888       -1     
- Misses        369      370       +1     
Impacted Files Coverage Δ
src/optimizer_interface.jl 80.55% <66.66%> (-1.27%) ⬇️
src/constraints.jl 90.37% <0.00%> (-0.15%) ⬇️
src/variables.jl 96.82% <0.00%> (-0.02%) ⬇️

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 6c6e4b6...de0b46b. Read the comment docs.

docs/src/solutions.md Outdated Show resolved Hide resolved
docs/src/solutions.md Outdated Show resolved Hide resolved
docs/src/solutions.md Outdated Show resolved Hide resolved
docs/src/solutions.md Outdated Show resolved Hide resolved
docs/src/solutions.md Show resolved Hide resolved
docs/src/solutions.md Show resolved Hide resolved
docs/src/solutions.md Outdated Show resolved Hide resolved
docs/src/solutions.md Outdated Show resolved Hide resolved
@mlubin mlubin merged commit 4f8aaf0 into jump-dev:master Sep 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants