Skip to content

Commit

Permalink
Minimal Updates for JuMP v0.20 (#18)
Browse files Browse the repository at this point in the history
* updates for JuMP v0.20
  • Loading branch information
ccoffrin authored Aug 27, 2019
1 parent 0fdbbb4 commit 364c105
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 20 deletions.
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,4 @@ os:
julia:
- 1.0
- 1.1
addons:
apt_packages:
- gfortran
- 1.2
6 changes: 3 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
name = "MINLPTests"
uuid = "ee0a3090-8ee9-5cdb-b8cb-8eeba3165522"
repo = "https://github.com/JuliaOpt/MINLPTests.jl.git"
version = "0.3.0"
version = "0.4.0"

[deps]
JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[compat]
Ipopt = "≥ 0.5"
JuMP = "~0.19"
Ipopt = "≥ 0.6"
JuMP = "~0.20"
Juniper = "≥ 0.4"
julia = "^1"

Expand Down
18 changes: 4 additions & 14 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,17 @@ const MIPOLY_SOLVERS = [JUNIPER]

@testset "JuMP Model Tests" begin
@testset "$(solver.constructor): nlp" for solver in NLP_SOLVERS
#MINLPTests.test_nlp(solver)
MINLPTests.test_nlp(solver, exclude = [
"005_010", # Ipopt needs relaxed tolerances.
"005_011", # Uses the function `\`
"008_011" # Requires quadratic duals
])
@testset "nlp_cvx_005_010" begin
MINLPTests.nlp_005_010(solver, 1e-5, 1e-5, 1e-5)
end
MINLPTests.test_nlp_cvx(solver, exclude = [
"109_011" # Ipopt needs relaxed tolerances.
])
@testset "nlp_cvx_109_011" begin
MINLPTests.nlp_cvx_109_011(solver, 1e-7, 1e-6, 1e-7,
termination_target = JuMP.MOI.ALMOST_LOCALLY_SOLVED,
primal_target = JuMP.MOI.NEARLY_FEASIBLE_POINT)
end
MINLPTests.test_nlp_cvx(solver)
end
@testset "$(solver.constructor): nlp_mi" for solver in MINLP_SOLVERS
#MINLPTests.test_nlp_mi(solver)
MINLPTests.test_nlp_mi(solver, exclude = [
"005_011", # Uses the function `\`
"003_013", # Bug in Juniper - handling of expression graph?
"005_011", # Uses the function `\`
"006_010" # Bug in Juniper - handling of user-defined functions.
])
MINLPTests.test_nlp_mi_cvx(solver)
Expand Down

0 comments on commit 364c105

Please sign in to comment.