Changeset 3041

Timestamp:

Sep 23, 2010 11:10:03 PM (11 years ago)

Author:

wehart

Message:

Resolving #4057. If a function with <name>_rule is
in the same scope as a model component, then the component.rule attribute
is set to the function.

The parameter and set classes are specialized to use this self.rule
attribute when self.initialize is None.

Location:

coopr.pyomo/trunk/coopr/pyomo/base

Files:

• block.py (modified) (8 diffs)
• param.py (modified) (1 diff)
• sets.py (modified) (3 diffs)

coopr.pyomo/trunk/coopr/pyomo/base/block.py

@@ -56 +56 @@
     def __init__(self, *args, **kwargs):
         """Constructor"""
-        if 'ctype' in kwargs:
-            tkwargs = {'ctype':kwargs['ctype']}
-        else:
-            tkwargs = {'ctype':Block}
+        if 'ctype' in kwargs:
+            tkwargs = {'ctype':kwargs['ctype']}
+        else:
+            tkwargs = {'ctype':Block}
         IndexedComponent.__init__(self, *args, **tkwargs)
-        #
+        #
         self.name=kwargs.get('name', 'unknown')
         self._defer_construction=True
-        self._parent_block = None
+        self._parent_block = None
         #
         # Define component dictionary: component type -> instance
@@ -83 +83 @@
 
     def concrete_mode(self):
-        """Configure block to immediately construct components"""
+        """Configure block to immediately construct components"""
         self._defer_construction=False
 
     def symbolic_mode(self):
-        """Configure block to defer construction of components"""
+        """Configure block to defer construction of components"""
         self._defer_construction=True
 
     def components(self, ctype=None):
-        """
-        Return information about the block components.  If ctype is None, return the dictionary
-        that maps {component type -> {name -> instance}}.  Otherwise, return the dictionary
-        that maps {name -> instance} for the specified component type.
-        """
+        """
+        Return information about the block components.  If ctype is None, return the dictionary
+        that maps {component type -> {name -> instance}}.  Otherwise, return the dictionary
+        that maps {name -> instance} for the specified component type.
+        """
         if ctype is None:
             return self._component
@@ -103 +103 @@
 
     def active_components(self, _ctype=None):
-        """
-        Returns the active components in this block.  If _ctype is None, return the
-        dictionary that maps {component type -> {name -> instance}}.  Otherwise, return
-        the dictionary that maps {name -> instance} for the specified component type.
-        """
+        """
+        Returns the active components in this block.  If _ctype is None, return the
+        dictionary that maps {component type -> {name -> instance}}.  Otherwise, return
+        the dictionary that maps {name -> instance} for the specified component type.
+        """
         tmp = {}
         if _ctype is None:
@@ -159 +159 @@
 
     def _clear_attribute(self,name):
-        """
+        """
         Cleanup the pre-existing model attribute
-        """
+        """
         if name in self._declarations:
             self.__dict__[name]=None
-            del self._component[ self._declarations[name].type() ][name]
+            del self._component[ self._declarations[name].type() ][name]
             del self._declarations[name]
 
@@ -203 +203 @@
 #                curr = self._parent_block
 
+        frame = sys._getframe(2)
+        locals_ = frame.f_locals
+        if getattr(val,'rule',None) is None and val.name+'_rule' in locals_:
+            val.rule = locals_[val.name+'_rule']
         if not self._defer_construction:
             val.construct(None)
@@ -289 +293 @@
         else:
             print >>ostream, "Model "+self.name
-        #
+        #
         print >>ostream, ""
         print >>ostream, "  Variables:"
@@ -298 +302 @@
             for ndx in VAR:
                 VAR[ndx].display(prefix="    ",ostream=ostream)
-        #
+        #
         print >>ostream, ""
         print >>ostream, "  Objectives:"
@@ -308 +312 @@
                 OBJ[ndx].display(prefix="    ",ostream=ostream)
         print >>ostream, ""
-        #
+        #
         CON = self.active_components(Constraint)
         print >>ostream, "  Constraints:"

coopr.pyomo/trunk/coopr/pyomo/base/param.py

@@ -210 +210 @@
         except:
             pass
+
+        if self._initialize is None:
+            self._initialize = getattr(self,'rule',None)
 
         #

coopr.pyomo/trunk/coopr/pyomo/base/sets.py

@@ -227 +227 @@
             return
         self._constructed=True
+
+        if self.initialize is None:
+            self.initialize = getattr(self,'rule',None)
         #
         # Construct using the values list
@@ -837 +840 @@
         if self.virtual:                                #pragma:nocover
            raise TypeError, "It doesn't make sense to create a virtual set array"
+
+        if self.initialize is None:
+            self.initialize = getattr(self,'rule',None)
         #
         # Construct using the values list
@@ -974 +980 @@
             return
         self._constructed=True
+
+        if self.initialize is None:
+            self.initialize = getattr(self,'rule',None)
+
         if self.virtual:
            if len(self.set_tuple) == 0: