Make internal_solvers into a fixture

This commit is contained in:
2021-04-09 18:35:01 -05:00
parent 31d0a0861d
commit f3fd1e0cda
4 changed files with 63 additions and 36 deletions

View File

@@ -3,15 +3,12 @@
# Released under the modified BSD license. See COPYING.md for more details.
from inspect import isclass
from typing import List, Callable, Any
from typing import Any
from miplearn.instance.base import Instance
from miplearn.problems.knapsack import KnapsackInstance, GurobiKnapsackInstance
from miplearn.solvers.gurobi import GurobiSolver
from miplearn.solvers.internal import InternalSolver
from miplearn.solvers.pyomo.base import BasePyomoSolver
from miplearn.solvers.pyomo.gurobi import GurobiPyomoSolver
from miplearn.solvers.pyomo.xpress import XpressPyomoSolver
def _is_subclass_or_instance(obj: Any, parent_class: Any) -> bool:
@@ -34,11 +31,3 @@ def _get_knapsack_instance(solver: Any) -> Instance:
capacity=67.0,
)
assert False
def get_internal_solvers() -> List[InternalSolver]:
return [
GurobiPyomoSolver(),
GurobiSolver(),
XpressPyomoSolver(),
]