ANL-CEEESA/MIPLearn
1
0
Fork 0
mirror of https://github.com/ANL-CEEESA/MIPLearn.git synced 2025-12-06 09:28:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes to docstrings; make some classes private

Browse Source
This commit is contained in:
Alinson S. Xavier
2021-01-21 18:54:05 -06:00
parent 7dbbfdc418
commit c342a870d1
8 changed files with 95 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
miplearn/solvers/pyomo/base.py
View File

@@ -15,7 +15,7 @@ from pyomo.opt import TerminationCondition
from pyomo.opt.base.solvers import SolverFactory
from miplearn.instance import Instance
from miplearn.solvers import RedirectOutput
from miplearn.solvers import _RedirectOutput
from miplearn.solvers.internal import (
InternalSolver,
LPSolveStats,
@@ -60,7 +60,7 @@ class BasePyomoSolver(InternalSolver):
streams: List[Any] = [StringIO()]
if tee:
streams += [sys.stdout]
with RedirectOutput(streams):
with _RedirectOutput(streams):
results = self._pyomo_solver.solve(tee=True)
self._restore_integrality()
opt_value = None
@@ -92,7 +92,7 @@ class BasePyomoSolver(InternalSolver):
iteration_cb = lambda: False
while True:
logger.debug("Solving MIP...")
with RedirectOutput(streams):
with _RedirectOutput(streams):
results = self._pyomo_solver.solve(
tee=True,
warmstart=self._is_warm_start_available,