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

initial implementation of new default solvers; passing on Julia 0.6 #959

Merged
merged 9 commits into from
Feb 15, 2017

Conversation

mlubin
Copy link
Member

@mlubin mlubin commented Feb 6, 2017

Default solver stuff needs to be tidied up (docs and examples), but this should now be passing on 0.6.

@codecov
Copy link

codecov bot commented Feb 6, 2017

Codecov Report

Merging #959 into master will increase coverage by 2.23%.
The diff coverage is 85.86%.

@@            Coverage Diff             @@
##           master     #959      +/-   ##
==========================================
+ Coverage   87.79%   90.02%   +2.23%     
==========================================
  Files          18       18              
  Lines        4513     4854     +341     
==========================================
+ Hits         3962     4370     +408     
+ Misses        551      484      -67
Impacted Files Coverage Δ
src/JuMPArray.jl 80% <ø> (ø)
src/parsenlp.jl 68.75% <ø> (+6.96%)
src/affexpr.jl 93.33% <100%> (+2.66%)
src/print.jl 92.96% <100%> (ø)
src/nlp.jl 91.6% <100%> (ø)
src/sos.jl 66.66% <100%> (ø)
src/macros.jl 91.19% <100%> (+4.83%)
src/quadexpr.jl 70% <100%> (ø)
src/JuMPContainer.jl 79.06% <100%> (ø)
src/solvers.jl 92.45% <65.71%> (+0.59%)
... and 9 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 9bef25f...4e1a016. Read the comment docs.

@mlubin
Copy link
Member Author

mlubin commented Feb 15, 2017

And we have tests passing on 0.6!

@mlubin
Copy link
Member Author

mlubin commented Feb 15, 2017

@joehuchette, any objection to merging this and bikeshedding and documenting the default solver stuff in a separate PR?

@mlubin mlubin changed the title WIP: initial implementation of new default solvers; passing on Julia 0.6 initial implementation of new default solvers; passing on Julia 0.6 Feb 15, 2017
src/solvers.jl Outdated
solvers = Symbol(solvertype*"solvers")
functionname = Symbol("default"*solvertype*"solver")
if VERSION > v"0.6.0-"
@eval function ($functionname)()
Copy link
Contributor

Choose a reason for hiding this comment

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

Indentation here is confusing

if VERSION < v"0.6.0-dev"
@objective(mod, Max, obj[1])
else
@objective(mod, Max, obj)
Copy link
Contributor

Choose a reason for hiding this comment

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

Oh, this is nice

Copy link
Member Author

Choose a reason for hiding this comment

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

Vector transposes are taken seriously now

@constraint(m, x'*A*x .>= 1)
else
# force vector output
@constraint(m, reshape(x,(1,3))*A*x .>= 1)
Copy link
Contributor

Choose a reason for hiding this comment

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

This...not so much

Copy link
Member Author

Choose a reason for hiding this comment

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

It's just to test the vector pathway.

@joehuchette
Copy link
Contributor

No objections, looks good to me

@mlubin mlubin merged commit 134b372 into master Feb 15, 2017
@mlubin mlubin deleted the ml/06 branch February 15, 2017 21:36
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.

2 participants