Expanded expression template support

pyomo/contrib/mcpp/pyomo_mcpp.py

@@ -310,7 +310,7 @@ def exitNode(self, node, data):
 
         return ans
 
-    def beforeChild(self, node, child):
+    def beforeChild(self, node, child, child_idx):
         if type(child) in nonpyomo_leaf_types:
             # This means the child is POD
             # i.e., int, float, string
@@ -322,7 +322,7 @@ def beforeChild(self, node, child):
             # this is an expression node
             return True, None
 
-    def acceptChildResult(self, node, data, child_result):
+    def acceptChildResult(self, node, data, child_result, child_idx):
         self.refs.add(child_result)
         data.append(child_result)
         return data

pyomo/contrib/satsolver/satsolver.py

@@ -277,20 +277,20 @@ def exitNode(self, node, data):
             raise NotImplementedError(str(type(node)) + " expression not handled by z3 interface")
         return ans
 
-    def beforeChild(self, node, child):
+    def beforeChild(self, node, child, child_idx):
         if type(child) in nonpyomo_leaf_types:
             # This means the child is POD
             # i.e., int, float, string
             return False, str(child)
-        elif child.is_variable_type():
-            return False, str(self.variable_label_map.getSymbol(child))
-        elif child.is_parameter_type():
-            return False, str(value(child))
-        elif not child.is_expression_type():
-            return False, str(child)
-        else:
-            # this is an expression node
+        elif child.is_expression_type():
             return True, ""
+        elif child.is_numeric_type():
+            if child.is_fixed():
+                return False, str(value(child))
+            else:
+                return False, str(self.variable_label_map.getSymbol(child))
+        else:
+            return False, str(child)
 
     def finalizeResult(self, node_result):
         return node_result

pyomo/core/base/component.py

@@ -22,6 +22,7 @@
 
 import pyomo.common
 from pyomo.common import deprecated
+from pyomo.core.pyomoobject import PyomoObject
 from pyomo.core.base.misc import tabular_writer, sorted_robust
 
 logger = logging.getLogger('pyomo.core')
@@ -75,7 +76,7 @@ def cname(*args, **kwds):
 class CloneError(pyomo.common.errors.PyomoException):
     pass
 
-class _ComponentBase(object):
+class _ComponentBase(PyomoObject):
     """A base class for Component and ComponentData
 
     This class defines some fundamental methods and properties that are
@@ -86,6 +87,10 @@ class _ComponentBase(object):
 
     _PPRINT_INDENT = "    "
 
+    def is_component_type(self):
+        """Return True if this class is a Pyomo component"""
+        return True
+
     def __deepcopy__(self, memo):
         # The problem we are addressing is when we want to clone a
         # sub-block in a model.  In that case, the block can have
@@ -594,10 +599,6 @@ def is_indexed(self):
         """Return true if this component is indexed"""
         return False
 
-    def is_component_type(self):
-        """Return True if this class is a Pyomo component"""
-        return True
-
     def clear_suffix_value(self, suffix_or_name, expand=True):
         """Clear the suffix value for this component data"""
         if isinstance(suffix_or_name, six.string_types):
@@ -912,10 +913,6 @@ def is_indexed(self):
         """Return true if this component is indexed"""
         return False
 
-    def is_component_type(self):
-        """Return True if this class is a Pyomo component"""
-        return True
-
     def clear_suffix_value(self, suffix_or_name, expand=True):
         """Set the suffix value for this component data"""
         if isinstance(suffix_or_name, six.string_types):

pyomo/core/base/global_set.py

@@ -46,11 +46,22 @@ def get(self, value, default):
             return value
         return default
     def __iter__(self):
-        yield None
+        return (None,).__iter__()
     def subsets(self):
-        return [self]
+        return [ self ]
     def construct(self):
         pass
     def __len__(self):
         return 1
+    def __eq__(self, other):
+        return self is other
+    def __ne__(self, other):
+        return self is not other
+    def isdiscrete(self):
+        return True
+    def isfinite(self):
+        return True
+    def isordered(self):
+        # As this set only has a single element, it is implicitly "ordered"
+        return True
 UnindexedComponent_set = _UnindexedComponent_set('UnindexedComponent_set')

pyomo/core/base/indexed_component.py

@@ -14,7 +14,7 @@
 
 from pyomo.core.expr.expr_errors import TemplateExpressionError
 from pyomo.core.expr.numvalue import native_types
-from pyomo.core.base.indexed_component_slice import _IndexedComponent_slice
+from pyomo.core.base.indexed_component_slice import IndexedComponent_slice
 from pyomo.core.base.component import Component, ActiveComponent
 from pyomo.core.base.config import PyomoOptions
 from pyomo.core.base.global_set import UnindexedComponent_set
@@ -375,7 +375,7 @@ def __getitem__(self, index):
                 index = TypeError
             if index is TypeError:
                 raise
-            if index.__class__ is _IndexedComponent_slice:
+            if index.__class__ is IndexedComponent_slice:
                 return index
             # The index could have contained constant but nonhashable
             # objects (e.g., scalar immutable Params).
@@ -401,7 +401,7 @@ def __getitem__(self, index):
                 # _processUnhashableIndex could have found a slice, or
                 # _validate could have found an Ellipsis and returned a
                 # slicer
-                if index.__class__ is _IndexedComponent_slice:
+                if index.__class__ is IndexedComponent_slice:
                     return index
                 obj = self._data.get(index, _NotFound)
             #
@@ -438,7 +438,7 @@ def __setitem__(self, index, val):
             # If we didn't find the index in the data, then we need to
             # validate it against the underlying set (as long as
             # _processUnhashableIndex didn't return a slicer)
-            if index.__class__ is not _IndexedComponent_slice:
+            if index.__class__ is not IndexedComponent_slice:
                 index = self._validate_index(index)
         else:
             return self._setitem_impl(index, obj, val)
@@ -447,10 +447,10 @@ def __setitem__(self, index, val):
         # dictionary and set the value
         #
         # Note that we need to RECHECK the class against
-        # _IndexedComponent_slice, as _validate_index could have found
+        # IndexedComponent_slice, as _validate_index could have found
         # an Ellipsis (which is hashable) and returned a slicer
         #
-        if index.__class__ is _IndexedComponent_slice:
+        if index.__class__ is IndexedComponent_slice:
             # support "m.x[:,1] = 5" through a simple recursive call.
             #
             # Assert that this slice was just generated
@@ -480,11 +480,11 @@ def __delitem__(self, index):
             index = self._processUnhashableIndex(index)
 
         if obj is _NotFound:
-            if index.__class__ is not _IndexedComponent_slice:
+            if index.__class__ is not IndexedComponent_slice:
                 index = self._validate_index(index)
 
         # this supports "del m.x[:,1]" through a simple recursive call
-        if index.__class__ is _IndexedComponent_slice:
+        if index.__class__ is IndexedComponent_slice:
             # Assert that this slice ws just generated
             assert len(index._call_stack) == 1
             # Make a copy of the slicer items *before* we start
@@ -525,7 +525,7 @@ def _validate_index(self, idx):
             # indexing set is a complex set operation)!
             return validated_idx
 
-        if idx.__class__ is _IndexedComponent_slice:
+        if idx.__class__ is IndexedComponent_slice:
             return idx
 
         if normalize_index.flatten:
@@ -627,7 +627,7 @@ def _processUnhashableIndex(self, idx):
                     # templatized expression.
                     #
                     from pyomo.core.expr import current as EXPR
-                    return EXPR.GetItemExpression(tuple(idx), self)
+                    return EXPR.GetItemExpression((self,) + tuple(idx))
 
                 except EXPR.NonConstantExpressionError:
                     #
@@ -666,7 +666,7 @@ def _processUnhashableIndex(self, idx):
                 fixed[i - len(idx)] = val
 
         if sliced or ellipsis is not None:
-            return _IndexedComponent_slice(self, fixed, sliced, ellipsis)
+            return IndexedComponent_slice(self, fixed, sliced, ellipsis)
         elif _found_numeric:
             if len(idx) == 1:
                 return fixed[0]