Remove unused classes and methods

This commit is contained in:
2021-05-15 14:29:11 -05:00
parent 91c8db2225
commit 4bf4d09cb5
11 changed files with 19 additions and 195 deletions

View File

@@ -136,10 +136,6 @@ class BasePyomoSolver(InternalSolver):
def build_test_instance_infeasible(self) -> Instance:
return PyomoTestInstanceInfeasible()
@overrides
def build_test_instance_redundancy(self) -> Instance:
return PyomoTestInstanceRedundancy()
@overrides
def build_test_instance_knapsack(self) -> Instance:
return PyomoTestInstanceKnapsack(
@@ -490,7 +486,7 @@ class BasePyomoSolver(InternalSolver):
self,
tee: bool = False,
) -> LPSolveStats:
self.relax()
self._relax()
streams: List[Any] = [StringIO()]
if tee:
streams += [sys.stdout]
@@ -510,15 +506,6 @@ class BasePyomoSolver(InternalSolver):
lp_wallclock_time=results["Solver"][0]["Wallclock time"],
)
@overrides
def relax(self) -> None:
for var in self._bin_vars:
lb, ub = var.bounds
var.setlb(lb)
var.setub(ub)
var.domain = pyomo.core.base.set_types.Reals
self._pyomo_solver.update_var(var)
def _clear_warm_start(self) -> None:
for var in self._all_vars:
if not var.fixed:
@@ -575,6 +562,14 @@ class BasePyomoSolver(InternalSolver):
raise Exception(f"Unknown expression type: {expr.__class__.__name__}")
return lhs
def _relax(self) -> None:
for var in self._bin_vars:
lb, ub = var.bounds
var.setlb(lb)
var.setub(ub)
var.domain = pyomo.core.base.set_types.Reals
self._pyomo_solver.update_var(var)
def _restore_integrality(self) -> None:
for var in self._bin_vars:
var.domain = pyomo.core.base.set_types.Binary
@@ -624,17 +619,6 @@ class PyomoTestInstanceInfeasible(Instance):
return model
class PyomoTestInstanceRedundancy(Instance):
@overrides
def to_model(self) -> pe.ConcreteModel:
model = pe.ConcreteModel()
model.x = pe.Var([0, 1], domain=pe.Binary)
model.OBJ = pe.Objective(expr=model.x[0] + model.x[1], sense=pe.maximize)
model.eq1 = pe.Constraint(expr=model.x[0] + model.x[1] <= 1)
model.eq2 = pe.Constraint(expr=model.x[0] + model.x[1] <= 2)
return model
class PyomoTestInstanceKnapsack(Instance):
"""
Simpler (one-dimensional) Knapsack Problem, used for testing.