Changeset 1963

Timestamp:

Dec 6, 2009 12:01:57 PM (11 years ago)

Author:

wehart

Message:

Reworking SetArray? constructor to create temporary set objects for non-set
index arguments. These arguments are passed into a Set object
with the 'initialize' argument.

File:

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

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

@@ -603 +603 @@
         self._ndim=len(args)
         if len(args) == 1:
-           self._index=args[0]
-        else:
-           self._index=None
-           self._index_set=args
+            if isinstance(args[0],_BaseSet):
+                self._index=args[0]
+            else:
+                self._index=Set(initialize=args[0])
+        else:
+            self._index=None
+            tmp = []
+            for arg in args:
+                if isinstance(arg,_BaseSet):
+                    tmp.append(arg)
+                else:
+                    tmp.append( Set(initialize=arg) )
+            self._index_set=tuple(tmp)
         _BaseSet.__init__(self,**kwds)
         self.value={}