Update version of MINLPTests (#171)

jump-dev · Sep 15, 2023 · 4e1edda · 4e1edda
1 parent b58f5f0
commit 4e1edda
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/test/MINLPTests/Project.toml b/test/MINLPTests/Project.toml
@@ -12,6 +12,6 @@ Bonmin_jll = "100.800.801"
 Couenne_jll = "0.500.801"
 Ipopt_jll = "=300.1400.400"
 JuMP = "1"
-MINLPTests = "0.5"
+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
@@ -110,6 +110,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(
@@ -121,6 +130,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
@@ -133,6 +151,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