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

Update version of MINLPTests #171

Merged
merged 4 commits into from
Sep 15, 2023
Merged

Update version of MINLPTests #171

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bc9e90c
Update version of MINLPTests
odow Jun 27, 2023
a32a182
Update run_minlptests.jl
odow Sep 15, 2023
9adbc34
Update run_minlptests.jl
odow Sep 15, 2023
d35e92e
Apply suggestions from code review
odow Sep 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion test/MINLPTests/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Couenne_jll = "f09e9e23-9010-5c9e-b679-9f1d8f79b85c"
Ipopt_jll = "9cc047cb-c261-5740-88fc-0cf96f7bdcc7"
JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
MINLPTests = "ee0a3090-8ee9-5cdb-b8cb-8eeba3165522"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
SHOT_jll = "c1ab834c-c4a5-50f5-9156-8f0fe7758b0e"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

Expand All @@ -12,6 +13,6 @@ Bonmin_jll = "100.800.801"
Couenne_jll = "0.500.801"
Ipopt_jll = "=300.1400.400"
JuMP = "1"
MINLPTests = "0.5"
MINLPTests = "0.5, 0.6"
SHOT_jll = "100.100.0"
julia = "1.6"
30 changes: 30 additions & 0 deletions test/MINLPTests/run_minlptests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
# Use of this source code is governed by an MIT-style license that can be found
# in the LICENSE.md file or at https://opensource.org/licenses/MIT.

import Pkg
Pkg.pkg"add MINLPTests#od/nlp-expr"

import AmplNLWriter
import MINLPTests
using Test
Expand Down Expand Up @@ -110,6 +113,15 @@ CONFIG["Ipopt"] = Dict(
primal_tol = config["tol"],
dual_tol = config["dual_tol"],
)
MINLPTests.test_nlp_expr(
OPTIMIZER,
exclude = config["nlp_exclude"],
termination_target = TERMINATION_TARGET,
primal_target = PRIMAL_TARGET,
objective_tol = config["tol"],
primal_tol = config["tol"],
dual_tol = config["dual_tol"],
)
end
@testset "NLP-CVX" begin
MINLPTests.test_nlp_cvx(
Expand All @@ -121,6 +133,15 @@ CONFIG["Ipopt"] = Dict(
primal_tol = config["tol"],
dual_tol = config["dual_tol"],
)
MINLPTests.test_nlp_cvx_expr(
OPTIMIZER,
exclude = config["nlpcvx_exclude"],
termination_target = TERMINATION_TARGET,
primal_target = PRIMAL_TARGET,
objective_tol = config["tol"],
primal_tol = config["tol"],
dual_tol = config["dual_tol"],
)
end
if name != "Ipopt"
@testset "NLP-MI" begin
Expand All @@ -133,6 +154,15 @@ CONFIG["Ipopt"] = Dict(
primal_tol = config["tol"],
dual_tol = config["dual_tol"],
)
MINLPTests.test_nlp_mi_expr(
OPTIMIZER,
exclude = config["nlpmi_exclude"],
termination_target = TERMINATION_TARGET,
primal_target = PRIMAL_TARGET,
objective_tol = config["tol"],
primal_tol = config["tol"],
dual_tol = config["dual_tol"],
)
end
end
end