Tests: +expcones for Gurobi, +many for MP2NL #237

Enable exp conic tests for Gurobi (although it might not solve them conically); enable many nonlinear tests to MP2NL
ampl · Oct 29, 2024 · dd259f6 · dd259f6
1 parent 3b6df84
commit dd259f6
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/test/end2end/scripts/python/Solver.py b/test/end2end/scripts/python/Solver.py
@@ -894,6 +894,7 @@ def __init__(self, exeName, timeout=None, nthreads=None,
 
                  ModelTags.socp,      ## MP transforms cones to quadratics
                  ModelTags.socp_hard_to_recognize,
+                 ModelTags.expcones,  ## Although might not have the expconic solver
 
                  ModelTags.nonlinear, ModelTags.log, ModelTags.trigonometric,
 
@@ -1029,28 +1030,29 @@ def _setNThreads(self, threads):
 
             def __init__(self, exeName, timeout=None, nthreads=None, otherOptions=None):
                 stags = {ModelTags.continuous, ModelTags.integer, ModelTags.binary,
-#                ModelTags.plinear,
-#                ModelTags.quadratic,
-#                ModelTags.quadratic_obj,
-#                ModelTags.quadraticnonconvex,
+                ModelTags.plinear,
+                ModelTags.quadratic,
+                ModelTags.quadratic_obj,
+                ModelTags.quadraticnonconvex,
 
-#                ModelTags.socp,      ## MP transforms cones to quadratics
-#                ModelTags.socp_hard_to_recognize,
+                ModelTags.socp,      ## MP transforms cones to quadratics
+                ModelTags.socp_hard_to_recognize,
+                ModelTags.expcones,  ## Although might not have the expconic solver
 
-#                ModelTags.nonlinear, ModelTags.log, ModelTags.trigonometric,
+                ModelTags.nonlinear, ModelTags.log, ModelTags.trigonometric,
 
                 ModelTags.unbdd,
                 ModelTags.qcpdual,
 #                ModelTags.return_mipgap,
-#                ModelTags.sos, ModelTags.presosenc,
+                ModelTags.sos, #ModelTags.presosenc,
                 ModelTags.sens,
                 ModelTags.lazy_user_cuts,
 #                ModelTags.funcpieces,
 #                ModelTags.integralityfocus,
 
                 ModelTags.relax, ModelTags.warmstart, ModelTags.mipstart,
 
-#                ModelTags.multiobj,
+                ModelTags.multiobj,
                 ModelTags.obj_priority,
 #                ModelTags.multisol,
                 ModelTags.sstatus,