Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update imports of native_types and pyomo_constant_types in scaling module #1366

Merged
merged 4 commits into from
Mar 13, 2024
Merged

Update imports of native_types and pyomo_constant_types in scaling module #1366

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ed3eb3a
update imports of native_types and pyomo_constant_types (which is dep…
Robbybp Mar 6, 2024
2227273
dont check if node is in pyomo_constant_types
Robbybp Mar 11, 2024
aa91e5d
dont import now-unused pyomo_constant_types
Robbybp Mar 11, 2024
1951915
Merge branch 'main' into consttype-import
lbianchi-lbl Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions idaes/core/util/scaling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
from pyomo.dae.flatten import slice_component_along_sets
from pyomo.util.calc_var_value import calculate_variable_from_constraint
from pyomo.core import expr as EXPR
from pyomo.core.expr.numvalue import native_types, pyomo_constant_types
from pyomo.common.numeric_types import native_types
from pyomo.core.base.units_container import _PyomoUnit

import idaes.logger as idaeslog
Expand Down Expand Up @@ -1509,7 +1509,7 @@ def exitNode(self, node, data):
# first check if the node is a leaf
nodetype = type(node)

if nodetype in native_types or nodetype in pyomo_constant_types:
if nodetype in native_types:
return [node]

node_func = self.node_type_method_map.get(nodetype, None)
Expand Down
Loading