Changeset 1958

Timestamp:

Dec 4, 2009 12:50:51 AM (11 years ago)

Author:

wehart

Message:

Reverting the change in r1953, which causes an error in our unit tests.

File:

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

coopr.pyomo/trunk/coopr/pyomo/base/PyomoModelData.py

@@ -277 +277 @@
           if type(cmd[i]) is not tuple:
             if flag:
-               if type(cmd[i]) is not tuple:
-                  raise ValueError, "Problem initializing set="+sname+" with input data="+str(cmd)+" - first element was interpreted as a tuple, but element="+str(i)+" is of type="+str(type(cmd[i]))+"; types must be consistent"
+               #if type(cmd[i]) is not tuple:
+               #   raise ValueError, "Problem initializing set="+sname+" with input data="+str(cmd)+" - first element was interpreted as a tuple, but element="+str(i)+" is of type="+str(type(cmd[i]))+"; types must be consistent"
                tmpval=tmp
                tmpval[ndx] = self._data_eval([cmd[i]])[0]