Changeset 2655

Timestamp:

Jun 11, 2010 10:08:09 AM (11 years ago)

Author:

khunter

Message:

No functional, just cleanup/formatting.

File:

• coopr.pyomo/trunk/coopr/pyomo/base/constraint.py (modified) (2 diffs)

coopr.pyomo/trunk/coopr/pyomo/base/constraint.py

@@ -25 +25 @@
 from set_types import *
 from component import Component
+from sets import _SetContainer
 
 
@@ -53 +54 @@
     alias("Objective", "Expressions that are minimized or maximized in a model.")
 
-    def __init__(self, *args, **kwd):
+    def __init__(self, *args, **kwargs):
         """Construct an objective expression with rule to construct the
            expression
         """
-        tkwd = {'ctype':Objective}
-        IndexedComponent.__init__(self, *args, **tkwd)
-        tmpname="unknown"
-        tmpsense = minimize
-        tmprule = None
+        tkwargs = {'ctype':Objective}
+        IndexedComponent.__init__(self, *args, **tkwargs)
+
         self._data = {}
-        # a flag specified by the user to indicate that no construction
-        # rule will be specified, and that constraints will be explicitly
-        # added by the user. set via the "noruleinit" keyword. value doesn't
-        # matter, as long as it isn't "None".
-        self._no_rule_init = None         
         if args == ():
-           self._data[None] = ObjectiveData()
-        self._quad_subexpr = None # this is a hack for now; we eventually want a "QuadraticObjective" class.        
-        for key in kwd.keys():
-          if key == "name":
-             tmpname=kwd[key]
-          elif key == "doc":
-             self.doc=kwd[key]
-          elif key == "rule":
-             tmprule = kwd[key]
-          elif key == "sense":
-             tmpsense = kwd[key]
-          elif key == "expr":
-             tmprule = kwd[key]
-          elif key == "noruleinit":
-             self._no_rule_init = kwd[key]             
-          else:
-             raise ValueError, "Objective constructor: unknown keyword - "+key
-        NumericValue.__init__(self,name=tmpname)
+            self._data[None] = ObjectiveData()
+
+        # this is a hack for now; we eventually want a
+        # "QuadraticObjective" class.
+        self._quad_subexpr = None
+
+        tmpname  = kwargs.pop('name', 'unknown')
+        tmpsense = kwargs.pop('sense', minimize )
+        tmprule  = kwargs.pop('rule', None )
+        tmprule  = kwargs.pop('expr', tmprule )
+        self.doc = kwargs.pop('doc', None )
+        self._no_rule_init = kwargs.get('noruleinit', None )
+
+        # _no_rule_init is a flag specified by the user to indicate that no
+        # construction rule will be specified, and that constraints will be
+        # explicitly added by the user. set via the "noruleinit" keyword. value
+        # doesn't matter, as long as it isn't "None".
+
+        if ( kwargs ): # if dict not empty, there's an error.  Let user know.
+            msg = "Creating constraint '%s': unknown option(s)\n\t%s"
+            msg = msg % ( tmpname, ', '.join(kwargs.keys()) )
+            raise ValueError, msg
+
+        NumericValue.__init__( self, name=tmpname )
+
         if None in self._data:
             self._data[None].name = tmpname
-        self.sense = tmpsense
-        self.rule = tmprule
-        self.trivial=False
-        self._constructed=False
-
+
+        self.sense   = tmpsense
+        self.rule    = tmprule
+        self.trivial = False
+        self._constructed = False
 
     def clear(self):