Changeset 3071

Timestamp:

Oct 4, 2010 12:13:16 PM (11 years ago)

Author:

wehart

Message:

Bug fixes to param management.

Location:

coopr.pyomo/trunk/coopr/pyomo/base

Files:

• numvalue.py (modified) (1 diff)
• param.py (modified) (4 diffs)

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

@@ -40 +40 @@
     if obj is None:
         return None
-    elif type(obj) in [bool,int,long,float]:
+    elif type(obj) in [bool,int,long,float,str]:
         return obj
     if not isinstance(obj, NumericValue):

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

@@ -154 +154 @@
             return self._default.value
 
-        msg = "Unknown index '%s' in parameter '%s"
-        raise KeyError, msg % (str(ndx), self.name )
+        msg = "Unknown index '%s' in parameter '%s: keys=%s"
+        raise KeyError, msg % (str(ndx), self.name, str(self._index.data()) )
 
     def __setitem__(self,ndx,val):
@@ -186 +186 @@
             raise KeyError, msg % ( self.name, str(ndx) )
         #
-        if not self._valid_indexed_value(val,ndx,False):
-            msg = "Invalid parameter value: %s[%s] = '%s'"
-            raise ValueError, msg % ( self.name, str(ndx), str(val) )
-        #
         if self.mutable:
             if ndx in self._paramval:
@@ -201 +197 @@
         else:
             self._paramval[ndx] = val
+        #
+        # This is at the end, so the user can write their validation
+        # tests as if the data was already added.
+        #
+        if not self._valid_indexed_value(val,ndx,False):
+            msg = "Invalid parameter value: %s[%s] = '%s'"
+            raise ValueError, msg % ( self.name, str(ndx), str(val) )
 
     def construct(self, data=None):
@@ -325 +328 @@
 
            if index is not None:
-              tmp = tmp + list(index)
+              if type(index) is tuple:
+                 tmp = tmp + list(index)
+              else:
+                 tmp = tmp + [ index ]
 
            tmp.append(self.model)