Changeset 629 for branches

Timestamp:

12/31/12 11:35:48 (3 years ago)

Author:

mmckerns

Message:

enable discrete decorator to handle negative index; updated corresponding test

Location:

branches/decorate

Files:

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

branches/decorate/test_wrapper.py

@@ -136 +136 @@
   discrete_squared.samples([1.0, 7.0])
   assert discrete_squared(5.6) == 7.0**2
+  discrete_squared.index([0, -1])
+  assert all(discrete_squared(asarray([0, 3, 6])) == asarray([1.0, 3.0, 7.0])**2)
 
 

branches/decorate/wrapper.py

@@ -147 +147 @@
         samples[0] = alist
 
+    def _index(alist=None):
+        index[0] = alist
+
     #XXX: refactor to use argnear_factory(samples)
     def _argnear(xi):
@@ -175 +178 @@
             else:
                 mask = zeros(xp.size, dtype=bool)
-                try: mask[sorted(index[0])] = True
+                try: mask[sorted(index[0], key=abs)] = True
                 except IndexError: pass
             xp = xtype(choose(mask, (x,xp)))
             return f(xp, *args, **kwds)
         func.samples = _points
+        func.index = _index
         return func
     return dec