Organize test fixtures; handle infeasibility in DropRedundant

tests/solvers/__init__.py

@@ -3,11 +3,8 @@
 #  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 List, Callable
 
-from pyomo import environ as pe
-
-from miplearn.instance import Instance
 from miplearn.problems.knapsack import KnapsackInstance, GurobiKnapsackInstance
 from miplearn.solvers.gurobi import GurobiSolver
 from miplearn.solvers.internal import InternalSolver
@@ -16,27 +13,6 @@ from miplearn.solvers.pyomo.gurobi import GurobiPyomoSolver
 from miplearn.solvers.pyomo.xpress import XpressPyomoSolver
 
 
-class InfeasiblePyomoInstance(Instance):
-    def to_model(self) -> pe.ConcreteModel:
-        model = pe.ConcreteModel()
-        model.x = pe.Var([0], domain=pe.Binary)
-        model.OBJ = pe.Objective(expr=model.x[0], sense=pe.maximize)
-        model.eq = pe.Constraint(expr=model.x[0] >= 2)
-        return model
-
-
-class InfeasibleGurobiInstance(Instance):
-    def to_model(self) -> Any:
-        import gurobipy as gp
-        from gurobipy import GRB
-
-        model = gp.Model()
-        x = model.addVars(1, vtype=GRB.BINARY, name="x")
-        model.addConstr(x[0] >= 2)
-        model.setObjective(x[0])
-        return model
-
-
 def _is_subclass_or_instance(obj, parent_class):
     return isinstance(obj, parent_class) or (
         isclass(obj) and issubclass(obj, parent_class)
@@ -59,12 +35,5 @@ def _get_knapsack_instance(solver):
     assert False
 
 
-def _get_infeasible_instance(solver):
-    if _is_subclass_or_instance(solver, BasePyomoSolver):
-        return InfeasiblePyomoInstance()
-    if _is_subclass_or_instance(solver, GurobiSolver):
-        return InfeasibleGurobiInstance()
-
-
 def _get_internal_solvers() -> List[Callable[[], InternalSolver]]:
     return [GurobiPyomoSolver, GurobiSolver, XpressPyomoSolver]

tests/solvers/test_internal_solver.py

@@ -14,8 +14,8 @@ from miplearn.solvers.pyomo.base import BasePyomoSolver
 from . import (
     _get_knapsack_instance,
     _get_internal_solvers,
-    _get_infeasible_instance,
 )
+from ..fixtures.infeasible import get_infeasible_instance
 
 logger = logging.getLogger(__name__)
 
@@ -186,7 +186,7 @@ def test_relax():
 
 def test_infeasible_instance():
     for solver_class in _get_internal_solvers():
-        instance = _get_infeasible_instance(solver_class)
+        instance = get_infeasible_instance(solver_class)
         solver = solver_class()
         solver.set_instance(instance)
         stats = solver.solve()