Changeset 628 for branches

Timestamp:

12/31/12 10:58:48 (3 years ago)

Author:

mmckerns

Message:

discrete decorator for ndarrays; updated test_wrapper for discrete

Location:

branches/decorate

Files:

• test_wrapper.py (modified) (1 diff)
• wrapper.py (modified) (3 diffs)

branches/decorate/test_wrapper.py

@@ -133 +133 @@
 
   assert discrete_squared(5.6) == 5.5**2
-  assert all(discrete_squared([1, 3]) == asarray([1.0, 3.5])**2)
+  assert all(discrete_squared(asarray([1, 3])) == asarray([1.0, 3.5])**2)
   discrete_squared.samples([1.0, 7.0])
   assert discrete_squared(5.6) == 7.0**2

branches/decorate/wrapper.py

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