From a4a94962f24d86d6297d00953dd2ad62e5032ccb Mon Sep 17 00:00:00 2001 From: Bernard Knueven Date: Thu, 11 Apr 2024 13:58:30 -0600 Subject: [PATCH] simplifying the code --- pyomo/contrib/iis/mis.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pyomo/contrib/iis/mis.py b/pyomo/contrib/iis/mis.py index 6b7eab63ef2..bc0bccdd5cf 100644 --- a/pyomo/contrib/iis/mis.py +++ b/pyomo/contrib/iis/mis.py @@ -49,8 +49,6 @@ logger = logging.getLogger("pyomo.contrib.iis") logger.setLevel(logging.INFO) -_default_nl_writer = WriterFactory.get_class("nl") - class _VariableBoundsAsConstraints(IsomorphicTransformation): """Replace all variables bounds and domain information with constraints. @@ -87,7 +85,7 @@ def _apply_to(self, instance, **kwds): def compute_infeasibility_explanation( - model, solver=None, tee=False, tolerance=1e-8, logger=logger + model, solver, tee=False, tolerance=1e-8, logger=logger ): """ This function attempts to determine why a given model is infeasible. It deploys @@ -105,7 +103,7 @@ def compute_infeasibility_explanation( Args ---- model: A pyomo block - solver (optional): A pyomo solver, a string, or None + solver: A pyomo solver object or a string for SolverFactory tee (optional): Display intermediate solves conducted (False) tolerance (optional): The feasibility tolerance to use when declaring a constraint feasible (1e-08) @@ -267,10 +265,6 @@ def _constraint_generator(): ) # Phase 2 -- deletion filter - # TODO: the model created here seems to mess with the nl_v2 - # writer sometimes. So we temporarily switch to nl_v1 writer. - WriterFactory.register("nl")(WriterFactory.get_class("nl_v1")) - # remove slacks by fixing them to 0 for v in slack_block.component_data_objects(pyo.Var): v.fix(0) @@ -319,8 +313,6 @@ def _constraint_generator(): msg += "Constraints / bounds in guards for stability:" msg = _get_results(guards, msg) - WriterFactory.register("nl")(_default_nl_writer) - logger.info(msg)