Changeset 627 for branches

Timestamp:

12/31/12 10:14:52 (3 years ago)

Author:

mmckerns

Message:

fix: discrete decorator index applies to all when index=None

File:

• branches/decorate/wrapper.py (modified) (2 diffs)

branches/decorate/wrapper.py

@@ -41 +41 @@
 
 
-from numpy import asarray, any, inf, vectorize, choose
+from numpy import asarray, any, inf, vectorize, choose, zeros, ones
 def bounded(min=None, max=None):
     """impose an infinite barrier box constraint on a function
@@ -168 +168 @@
             xp = near(x, samples[0][arglo], samples[0][arghi])
             # create a choice array from given indices
-            mask = xp*False #FIXME: better ways to do this
-            try: mask[sorted(index)] = True #FIXME: better ways to do this
-            except IndexError: pass
+            #FIXME: better ways to do the following
+            if index is None: 
+                mask = ones(xp.size, dtype=bool)
+            else:
+                mask = zeros(xp.size, dtype=bool)
+                try: mask[sorted(index)] = True
+                except IndexError: pass
             xp = xtype(choose(mask, (x,xp)))
             return f(xp, *args, **kwds)