summaryrefslogtreecommitdiff
path: root/numpy/lib/shape_base.py
diff options
context:
space:
mode:
authorAlbert <albert.jornet@ic3.cat>2014-03-06 16:17:52 +0100
committerjurnix <albert.jornet@ic3.cat>2014-03-27 12:27:33 +0100
commitddc95d379f410c7ff787c157ded6c40bb873215c (patch)
tree89f67ab367c93beaa7887790a7c81b981da8e0ee /numpy/lib/shape_base.py
parenta6f9b782cd9b60fc1464e6a4a7ef9a7762fcf2d5 (diff)
downloadnumpy-ddc95d379f410c7ff787c157ded6c40bb873215c.tar.gz
ENH: apply_along_axis accepts named arguments
Diffstat (limited to 'numpy/lib/shape_base.py')
-rw-r--r--numpy/lib/shape_base.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/numpy/lib/shape_base.py b/numpy/lib/shape_base.py
index 38b928d57..31232c989 100644
--- a/numpy/lib/shape_base.py
+++ b/numpy/lib/shape_base.py
@@ -12,7 +12,7 @@ from numpy.core.numeric import asarray, zeros, newaxis, outer, \
from numpy.core.fromnumeric import product, reshape
from numpy.core import hstack, vstack, atleast_3d
-def apply_along_axis(func1d,axis,arr,*args):
+def apply_along_axis(func1d,axis,arr,*args,**kwargs):
"""
Apply a function to 1-D slices along the given axis.
@@ -30,6 +30,8 @@ def apply_along_axis(func1d,axis,arr,*args):
Input array.
args : any
Additional arguments to `func1d`.
+ kwargs: any
+ Additional named arguments to `func1d`.
Returns
-------
@@ -78,7 +80,7 @@ def apply_along_axis(func1d,axis,arr,*args):
i[axis] = slice(None, None)
outshape = asarray(arr.shape).take(indlist)
i.put(indlist, ind)
- res = func1d(arr[tuple(i.tolist())],*args)
+ res = func1d(arr[tuple(i.tolist())],*args,**kwargs)
# if res is a number, then we have a smaller output array
if isscalar(res):
outarr = zeros(outshape, asarray(res).dtype)
@@ -94,7 +96,7 @@ def apply_along_axis(func1d,axis,arr,*args):
ind[n] = 0
n -= 1
i.put(indlist, ind)
- res = func1d(arr[tuple(i.tolist())],*args)
+ res = func1d(arr[tuple(i.tolist())],*args,**kwargs)
outarr[tuple(ind)] = res
k += 1
return outarr
@@ -115,7 +117,7 @@ def apply_along_axis(func1d,axis,arr,*args):
ind[n] = 0
n -= 1
i.put(indlist, ind)
- res = func1d(arr[tuple(i.tolist())],*args)
+ res = func1d(arr[tuple(i.tolist())],*args,**kwargs)
outarr[tuple(i.tolist())] = res
k += 1
return outarr