Changeset 2650

Timestamp:

Jun 8, 2010 2:39:58 PM (11 years ago)

Author:

khunter

Message:

Refactor NumericValue? init function

While researching where and how to implement SOS handling, do a
drive-by cleanup.

• Use more standard kwargs instead of kwd
• Replace kwarg parsing with more standard kwargs.pop handling

File:

• coopr.pyomo/trunk/coopr/pyomo/base/numvalue.py (modified) (1 diff)

coopr.pyomo/trunk/coopr/pyomo/base/numvalue.py

@@ -73 +73 @@
     __hash__ = None
 
-    def __init__(self, **kwds):
-        if 'name' in kwds:
-            self.name=str(kwds['name'])
-        else:
-            self.name="unknown"
-        if 'domain' in kwds:
-            self.domain=kwds['domain']
-        elif 'within' in kwds:
-            self.domain=kwds['within']
-        else:
-            self.domain=None
-        if 'value' in kwds:
-            if pyutilib.math.is_nan(kwds['value']):
-                self.value=pyutilib.math.nan
-            else:
-                self.set_value(kwds['value'])
-        else:
-            self.value=None
+    def __init__(self, **kwargs):
+        self.name   = str(kwargs.pop('name', 'unknown'))
+        self.domain = kwargs.pop('domain', None )
+        self.domain = kwargs.pop('within', self.domain )
+        value       = kwargs.pop('value', None )
+
+        if ( value and pyutilib.math.is_nan(value) ):
+            value = pyutilib.math.nan
+
+        self.set_value(value)
         self.model=None
-        #print "NUMVAL",self.name,self.domain,self.value
+
 
     def is_constant(self):