diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2005-11-09 01:08:55 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2005-11-09 01:08:55 +0000 |
| commit | 7dcff406209725ac7859d033d0cccca80cee6298 (patch) | |
| tree | a07d0508db14d87f19a86ac10275ac5f76d4e9b1 /scipy/base/shape_base.py | |
| parent | f13e023998e3e61cea04bdb0f39dd763b2c784a4 (diff) | |
| download | numpy-7dcff406209725ac7859d033d0cccca80cee6298.tar.gz | |
Switched order of put and putmask.
Diffstat (limited to 'scipy/base/shape_base.py')
| -rw-r--r-- | scipy/base/shape_base.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scipy/base/shape_base.py b/scipy/base/shape_base.py index 57b0a6333..4ea8f61a4 100644 --- a/scipy/base/shape_base.py +++ b/scipy/base/shape_base.py @@ -28,7 +28,7 @@ def apply_along_axis(func1d,axis,arr,*args): indlist.remove(axis) i[axis] = slice(None,None) outshape = asarray(arr.shape).take(indlist) - i.put(indlist, ind) + i.put(ind, indlist) res = func1d(arr[tuple(i.tolist())],*args) # if res is a number, then we have a smaller output array if isscalar(res): @@ -44,7 +44,7 @@ def apply_along_axis(func1d,axis,arr,*args): ind[n-1] += 1 ind[n] = 0 n -= 1 - i.put(indlist,ind) + i.put(ind,indlist) res = func1d(arr[tuple(i.tolist())],*args) outarr[ind] = res k += 1 @@ -65,7 +65,7 @@ def apply_along_axis(func1d,axis,arr,*args): ind[n-1] += 1 ind[n] = 0 n -= 1 - i.put(indlist,ind) + i.put(ind, indlist) res = func1d(arr[tuple(i.tolist())],*args) outarr[tuple(i.tolist())] = res k += 1 |