From bc9e90c56a708e0e1c7cedd944d2e650c9748225 Mon Sep 17 00:00:00 2001 From: odow Date: Tue, 27 Jun 2023 15:17:36 +1200 Subject: [PATCH 1/4] Update version of MINLPTests --- test/MINLPTests/Project.toml | 3 ++- test/MINLPTests/run_minlptests.jl | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/test/MINLPTests/Project.toml b/test/MINLPTests/Project.toml index 7cdeb9b..802cb67 100644 --- a/test/MINLPTests/Project.toml +++ b/test/MINLPTests/Project.toml @@ -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" @@ -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" diff --git a/test/MINLPTests/run_minlptests.jl b/test/MINLPTests/run_minlptests.jl index 2901db1..f383842 100644 --- a/test/MINLPTests/run_minlptests.jl +++ b/test/MINLPTests/run_minlptests.jl @@ -3,6 +3,10 @@ # 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 JuMP#master" +Pkg.pkg"add MINLPTests#od/nlp-expr" + import AmplNLWriter import MINLPTests using Test From a32a182b210edd55b6107a23e925de8d185aba35 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Fri, 15 Sep 2023 13:44:12 +1200 Subject: [PATCH 2/4] Update run_minlptests.jl --- test/MINLPTests/run_minlptests.jl | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/test/MINLPTests/run_minlptests.jl b/test/MINLPTests/run_minlptests.jl index f383842..b8bf719 100644 --- a/test/MINLPTests/run_minlptests.jl +++ b/test/MINLPTests/run_minlptests.jl @@ -114,6 +114,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( @@ -125,6 +134,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 @@ -137,6 +155,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 From 9adbc34d387da95074db9f8fef865002f71bb1f8 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Fri, 15 Sep 2023 13:44:29 +1200 Subject: [PATCH 3/4] Update run_minlptests.jl --- test/MINLPTests/run_minlptests.jl | 1 - 1 file changed, 1 deletion(-) diff --git a/test/MINLPTests/run_minlptests.jl b/test/MINLPTests/run_minlptests.jl index b8bf719..fac1c73 100644 --- a/test/MINLPTests/run_minlptests.jl +++ b/test/MINLPTests/run_minlptests.jl @@ -4,7 +4,6 @@ # in the LICENSE.md file or at https://opensource.org/licenses/MIT. import Pkg -Pkg.pkg"add JuMP#master" Pkg.pkg"add MINLPTests#od/nlp-expr" import AmplNLWriter From d35e92e8d409affe5b53915f429b6897bf32602e Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Fri, 15 Sep 2023 14:46:21 +1200 Subject: [PATCH 4/4] Apply suggestions from code review --- test/MINLPTests/Project.toml | 3 +-- test/MINLPTests/run_minlptests.jl | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/test/MINLPTests/Project.toml b/test/MINLPTests/Project.toml index 802cb67..50d6548 100644 --- a/test/MINLPTests/Project.toml +++ b/test/MINLPTests/Project.toml @@ -4,7 +4,6 @@ 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" @@ -13,6 +12,6 @@ Bonmin_jll = "100.800.801" Couenne_jll = "0.500.801" Ipopt_jll = "=300.1400.400" JuMP = "1" -MINLPTests = "0.5, 0.6" +MINLPTests = "0.6" SHOT_jll = "100.100.0" julia = "1.6" diff --git a/test/MINLPTests/run_minlptests.jl b/test/MINLPTests/run_minlptests.jl index fac1c73..2ed7594 100644 --- a/test/MINLPTests/run_minlptests.jl +++ b/test/MINLPTests/run_minlptests.jl @@ -3,9 +3,6 @@ # 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