MP2NL: in tests, move options to the subsolver #237

ampl · Oct 30, 2024 · 00d542b · 00d542b
1 parent 4994538
commit 00d542b
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 11 deletions.
diff --git a/test/end2end/cases/categorized/fast/qp/modellist.json b/test/end2end/cases/categorized/fast/qp/modellist.json
@@ -13,7 +13,7 @@
     "name" : "ellipse_max_02",
     "objective" : 0.5312499452945747,
     "tags" : ["quadratic"],
-    "coment_options": "Not all constraints are cones, Mosek needs QP",
+    "comment_options": "Not all constraints are cones, Mosek needs QP",
     "options": {
       "mosek_options": "cvt:socp=0"
     }
@@ -23,7 +23,8 @@
     "objective" : -3.16227757,
     "tags" : ["quadratic", "qcpdual"],
     "options": {
-      "ANYSOLVER_options": "qcpdual=1"
+      "ANYSOLVER_options": "qcpdual=1",
+      "mp2nl_options": "solver_options='qcpdual=1'"
     },
     "values": {
       "_con[1]": -1.5807796451888148
@@ -34,7 +35,8 @@
     "objective" : 1.4928017587112605,
     "tags" : ["quadratic", "qcpdual"],
     "options": {
-      "ANYSOLVER_options": "qcpdual=1"
+      "ANYSOLVER_options": "qcpdual=1",
+      "mp2nl_options": "solver_options='qcpdual=1'"
     },
     "values": {
       "_con[1]": 0.26111523051780217,
@@ -46,7 +48,8 @@
     "objective" : 0.5312499452945747,
     "tags" : ["quadratic", "qcpdual"],
     "options": {
-      "ANYSOLVER_options": "qcpdual=1"
+      "ANYSOLVER_options": "qcpdual=1",
+      "mp2nl_options": "solver_options='qcpdual=1'"
     },
     "values": {
       "_con[3]": 1.000067023601818
@@ -57,7 +60,8 @@
     "objective" : 0.8,
     "tags" : ["quadraticnonconvex", "mipstart"],
     "options": {
-      "ANYSOLVER_options": "debug=1"
+      "ANYSOLVER_options": "debug=1",
+      "mp2nl_options": "solver_options='debug=1'"
     },
     "values": {
       "_var[1].test_ini_mip": 0.5,
@@ -69,7 +73,8 @@
     "objective" : 3.6,
     "tags" : ["quadraticnonconvex", "mipstart"],
     "options": {
-      "ANYSOLVER_options": "debug=1"
+      "ANYSOLVER_options": "debug=1",
+      "mp2nl_options": "solver_options='debug=1'"
     },
     "values": {
       "_var[1].test_ini_mip": 0.5,

diff --git a/test/end2end/cases/categorized/fast/suf_common/modellist.json b/test/end2end/cases/categorized/fast/suf_common/modellist.json
@@ -43,7 +43,10 @@
   {
     "name" : "dietu_stt sensitivity=1",
     "objective" : 74.273820,
-    "options": { "ANYSOLVER_options": "solnsens=1" },
+    "options": {
+      "ANYSOLVER_options": "solnsens=1",
+      "mp2nl_options": "solver_options='solnsens=1'"
+    },
     "tags" : ["linear", "continuous", "sens"],
     "values": {
       "Buy['BEEF'].senslbhi": 7.129251700680272,
@@ -63,7 +66,10 @@
   {
     "name" : "diet_max solnsens=1",
     "files" : ["diet_max.mod", "diet.dat"],
-    "options": { "ANYSOLVER_options": "solnsens=1" },
+    "options": {
+      "ANYSOLVER_options": "solnsens=1",
+      "mp2nl_options": "solver_options='solnsens=1'"
+    },
     "tags" : ["linear", "continuous", "sens"],
     "objective" : 1128.642,
     "values": {
@@ -82,7 +88,10 @@
   {
     "name" : "diet_nonrng_max solnsens=1",
     "files" : ["diet_nonrng_max.mod", "diet.dat"],
-    "options": { "ANYSOLVER_options": "solnsens=1" },
+    "options": {
+      "ANYSOLVER_options": "solnsens=1",
+      "mp2nl_options": "solver_options='solnsens=1'"
+    },
     "tags" : ["linear", "continuous", "sens", "sstatus"],
     "objective" : 1128.642,
     "comment": "Diet_Min{} constraints are converted to <= by AMPL",
@@ -144,7 +153,10 @@
   {
     "name": "mip_lazy_01",
     "tags": [ "linear", "integer", "lazy_user_cuts" ],
-    "options": { "ANYSOLVER_options": "debug=1" },
+    "options": {
+      "ANYSOLVER_options": "debug=1",
+      "mp2nl_options": "debug=1 solver_options='debug=1'"
+    },
     "objective": 1,
     "values": {
       "Initial.test_quad_constr_lazy": 2

diff --git a/test/end2end/cases/categorized/fast/suf_std/modellist.json b/test/end2end/cases/categorized/fast/suf_std/modellist.json
@@ -24,7 +24,10 @@
     "name" : "dietu_stt test sstatus IN",
     "objective" : 74.273820,
     "tags" : ["linear", "continuous", "sstatus"],
-    "options": { "ANYSOLVER_options": "debug=1" },
+    "options": {
+      "ANYSOLVER_options": "debug=1",
+      "mp2nl_options": "solver_options='debug=1'"
+    },
     "values": {
       "Buy['BEEF'].test_sstatus": 1,
       "Buy['MTL'].test_sstatus":  4,