Skip to content

Commit 6e182be

Browse files
author
Clara Witte
committed
Add MAiNGO to test_perisistent_solvers.py
1 parent 8b380ab commit 6e182be

File tree

1 file changed

+17
-5
lines changed

1 file changed

+17
-5
lines changed

Diff for: pyomo/contrib/appsi/solvers/tests/test_persistent_solvers.py

+17-5
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
parameterized = parameterized.parameterized
1818
from pyomo.contrib.appsi.base import TerminationCondition, Results, PersistentSolver
1919
from pyomo.contrib.appsi.cmodel import cmodel_available
20-
from pyomo.contrib.appsi.solvers import Gurobi, Ipopt, Cplex, Cbc, Highs
20+
from pyomo.contrib.appsi.solvers import Gurobi, Ipopt, Cplex, Cbc, Highs, MAiNGO
2121
from typing import Type
2222
from pyomo.core.expr.numeric_expr import LinearExpression
2323
import os
@@ -36,11 +36,23 @@
3636
('cplex', Cplex),
3737
('cbc', Cbc),
3838
('highs', Highs),
39+
('maingo', MAiNGO),
3940
]
40-
mip_solvers = [('gurobi', Gurobi), ('cplex', Cplex), ('cbc', Cbc), ('highs', Highs)]
41-
nlp_solvers = [('ipopt', Ipopt)]
42-
qcp_solvers = [('gurobi', Gurobi), ('ipopt', Ipopt), ('cplex', Cplex)]
43-
miqcqp_solvers = [('gurobi', Gurobi), ('cplex', Cplex)]
41+
mip_solvers = [
42+
('gurobi', Gurobi),
43+
('cplex', Cplex),
44+
('cbc', Cbc),
45+
('highs', Highs),
46+
('maingo', MAiNGO),
47+
]
48+
nlp_solvers = [('ipopt', Ipopt), ('maingo', MAiNGO)]
49+
qcp_solvers = [
50+
('gurobi', Gurobi),
51+
('ipopt', Ipopt),
52+
('cplex', Cplex),
53+
('maingo', MAiNGO),
54+
]
55+
miqcqp_solvers = [('gurobi', Gurobi), ('cplex', Cplex), ('maingo', MAiNGO)]
4456
only_child_vars_options = [True, False]
4557

4658

0 commit comments

Comments
 (0)