summaryrefslogtreecommitdiff
path: root/numpy/lib/arraysetops.py
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2006-08-29 06:52:33 +0000
committerTravis Oliphant <oliphant@enthought.com>2006-08-29 06:52:33 +0000
commit936b14b2363d0b57aaa109b255d332d222704640 (patch)
tree3023a450c63efcc3d6441ba0945299859157efec /numpy/lib/arraysetops.py
parent7b9df715cabe56f14d09a97b7b4b2bf524a3706e (diff)
downloadnumpy-936b14b2363d0b57aaa109b255d332d222704640.tar.gz
Add axis argument to usages of take
Diffstat (limited to 'numpy/lib/arraysetops.py')
-rw-r--r--numpy/lib/arraysetops.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/numpy/lib/arraysetops.py b/numpy/lib/arraysetops.py
index 7bd666029..cc9067712 100644
--- a/numpy/lib/arraysetops.py
+++ b/numpy/lib/arraysetops.py
@@ -66,7 +66,7 @@ def unique1d( ar1, retindx = False ):
if retindx:
ar = numpy.array(ar1).ravel()
perm = ar.argsort()
- aux = ar.take(perm)
+ aux = ar.take(perm,0)
flag = ediff1d( aux, 1 ) != 0
return perm.compress(flag), aux.compress(flag)
else:
@@ -113,8 +113,8 @@ def setmember1d( ar1, ar2 ):
tt = concat( (zlike( ar1 ),
zlike( ar2 ) + 1) )
perm = ar.argsort()
- aux = ar.take(perm)
- aux2 = tt.take(perm)
+ aux = ar.take(perm,0)
+ aux2 = tt.take(perm,0)
flag = ediff1d( aux, 1 ) == 0
ii = numpy.where( flag * aux2 )[0]
@@ -124,7 +124,7 @@ def setmember1d( ar1, ar2 ):
indx = perm.argsort()[:len( ar1 )]
- return flag.take( indx )
+ return flag.take( indx , 0)
##
# 03.11.2005, c