Switch devel.initialization to use vars_from_eexpressions.get_vars; alphabetize imports

Author: jsiirola

pyomo/devel/initialization/bounds/bound_variables.py

@@ -7,11 +7,12 @@
 # software.  This software is distributed under the 3-clause BSD License.
 # ____________________________________________________________________________________
 
-from pyomo.core.base.block import BlockData
-from pyomo.contrib.fbbt.fbbt import fbbt
-from pyomo.devel.initialization.utils import get_vars
 import logging
 
+from pyomo.contrib.fbbt.fbbt import fbbt
+from pyomo.core.base.block import BlockData
+from pyomo.util.vars_from_expressions import get_vars
+
 logger = logging.getLogger(__name__)
 
 

pyomo/devel/initialization/initialize.py

@@ -7,21 +7,22 @@
 # software.  This software is distributed under the 3-clause BSD License.
 # ____________________________________________________________________________________
 
+import logging
+
+from enum import Enum
 from typing import Optional
 from pyomo.core.base.block import BlockData
-from enum import Enum
-from pyomo.devel.initialization.utils import get_vars
 from pyomo.common.collections import ComponentMap
-from pyomo.devel.initialization.pwl_init import (
-    _initialize_with_piecewise_linear_approximation,
-)
-from pyomo.devel.initialization.lp_approx_init import _initialize_with_LP_approximation
 from pyomo.contrib.solver.common.base import SolverBase
-from pyomo.devel.initialization.global_init import _initialize_with_global_solver
 from pyomo.contrib.solver.common.factory import SolverFactory
 from pyomo.contrib.solver.common.results import Results
-import logging
 from pyomo.contrib.solver.common.results import SolutionStatus
+from pyomo.devel.initialization.pwl_init import (
+    _initialize_with_piecewise_linear_approximation,
+)
+from pyomo.devel.initialization.global_init import _initialize_with_global_solver
+from pyomo.devel.initialization.lp_approx_init import _initialize_with_LP_approximation
+from pyomo.util.vars_from_expressions import get_vars
 
 logger = logging.getLogger(__name__)
 

pyomo/devel/initialization/lp_approx_init.py

@@ -60,11 +60,7 @@
     bound_all_nonlinear_variables,
 )
 from pyomo.devel.initialization.pwl_init import _minimize_infeasibility
-from pyomo.devel.initialization.utils import (
-    fix_vars_with_equal_bounds,
-    get_vars,
-    shallow_clone,
-)
+from pyomo.devel.initialization.utils import fix_vars_with_equal_bounds, shallow_clone
 from pyomo.repn.linear import LinearRepn, LinearRepnVisitor
 from pyomo.repn.util import ExitNodeDispatcher
 from pyomo.common.dependencies.scipy import stats

pyomo/devel/initialization/pwl_init.py

@@ -20,7 +20,7 @@
 )
 from pyomo.contrib.piecewise.piecewise_linear_function import PiecewiseLinearFunction
 from pyomo.contrib.solver.common.base import SolverBase
-from pyomo.contrib.solver.common.results import SolutionStatus
+from pyomo.contrib.solver.common.results import SolutionStatus, Results
 from pyomo.core.base.block import BlockData
 from pyomo.core.base.constraint import ConstraintData
 from pyomo.core.base.expression import ExpressionData, ScalarExpression
@@ -52,13 +52,9 @@
 from pyomo.devel.initialization.bounds.bound_variables import (
     bound_all_nonlinear_variables,
 )
-from pyomo.devel.initialization.utils import (
-    fix_vars_with_equal_bounds,
-    get_vars,
-    shallow_clone,
-)
+from pyomo.devel.initialization.utils import fix_vars_with_equal_bounds, shallow_clone
 from pyomo.repn.util import ExitNodeDispatcher
-from pyomo.contrib.solver.common.results import Results
+from pyomo.util.vars_from_expressions import get_vars
 
 logger = logging.getLogger(__name__)
 

pyomo/devel/initialization/utils.py

@@ -13,15 +13,7 @@
 from pyomo.common.collections import ComponentSet
 from pyomo.core.base.block import BlockData
 from pyomo.core.expr.visitor import identify_variables
-from pyomo.util.vars_from_expressions import get_vars_from_components
-
-
-def get_vars(m: BlockData):
-    return ComponentSet(
-        get_vars_from_components(
-            m, ctype=(pyo.Constraint, pyo.Objective), include_fixed=False, active=True
-        )
-    )
+from pyomo.util.vars_from_expressions import get_vars
 
 
 def shallow_clone(m1):