Update QP test tags & XPRESS

ampl · Jul 27, 2023 · ff2c103 · ff2c103
1 parent 1977617
commit ff2c103
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/solvers/xpress/CHANGES.xpress.md b/solvers/xpress/CHANGES.xpress.md
@@ -1,8 +1,13 @@
 Summary of recent updates to Xpress for AMPL
 ============================================
 
+## 20230727
+- Fixed a memory leak #217
+- Fixed quadratic constraints
+
+
 ## 20230726
-- Fixed inequalities of integer expressions with
+- MP: fixed inequalities of integer expressions with
   non-integer constants, see test_int_non_int.mod.
 
 

diff --git a/test/end2end/cases/categorized/fast/qp/modellist.json b/test/end2end/cases/categorized/fast/qp/modellist.json
@@ -93,15 +93,15 @@
   {
     "name" : "prod_bin_var_01",
     "objective" : 5,
-    "tags" : ["quadratic"],
+    "tags" : ["quadratic", "quadraticnonconvex"],
     "options": {
       "copt_options": "cvt:quadcon=0",
       "comment_copt": "non convex constraint, linearise. But Gurobi convexifies it?"
     }  },
   {
     "name" : "prod_bin_var_02_obj",
     "objective" : 1,
-    "tags" : ["quadratic_obj"],
+    "tags" : ["quadraticnonconvex", "quadratic_obj"],
     "options": {
       "highs_options": "cvt:quadobj=0",
       "copt_options": "cvt:quadobj=0 cvt:quadcon=0",
@@ -110,7 +110,7 @@
   },
   {
     "name" : "prod_01_obj",
-    "tags" : ["quadraticnonconvex"],
+    "tags" : ["quadraticnonconvex", "quadratic_obj"],
     "options": {
       "gurobi_options": "nonconvex=2",
       "highs_options": "cvt:quadobj=0",

diff --git a/test/end2end/scripts/python/Solver.py b/test/end2end/scripts/python/Solver.py
@@ -709,7 +709,8 @@ def __init__(self, exeName, timeout=None, nthreads=None,
                  otherOptions=None):
         stags = {
                  ModelTags.continuous, ModelTags.integer, ModelTags.binary,
-                 ModelTags.sos,  ModelTags.quadratic,
+                 ModelTags.sos,
+                 ModelTags.quadratic, ModelTags.quadratic_obj,
 
                  ModelTags.return_mipgap, ModelTags.multiobj,