diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2009-08-28 15:36:42 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2009-08-28 15:36:42 +0000 |
| commit | 2b01ee6b966b9ca298247e6717e3a5be16a92970 (patch) | |
| tree | 6bbb8ee8eebdfe2ef3eb26f13994193b313c6fe7 /numpy/lib/info.py | |
| parent | c2191bc97da8a0879cec8d3e9a7a93fe9e66fcd8 (diff) | |
| parent | fddd4b9c3b8f18ba7cf386f766b70ec3328b1c69 (diff) | |
| download | numpy-2b01ee6b966b9ca298247e6717e3a5be16a92970.tar.gz | |
Re-base the date-time branch back to the trunk.
Diffstat (limited to 'numpy/lib/info.py')
| -rw-r--r-- | numpy/lib/info.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/numpy/lib/info.py b/numpy/lib/info.py index f93234d57..4a781a2ca 100644 --- a/numpy/lib/info.py +++ b/numpy/lib/info.py @@ -135,12 +135,11 @@ Set operations for 1D numeric arrays based on sort() function. ================ =================== ediff1d Array difference (auxiliary function). -unique1d Unique elements of 1D array. +unique Unique elements of an array. intersect1d Intersection of 1D arrays with unique elements. -intersect1d_nu Intersection of 1D arrays with any elements. setxor1d Set exclusive-or of 1D arrays with unique elements. -setmember1d Return an array of shape of ar1 containing 1 where - the elements of ar1 are in ar2 and 0 otherwise. +in1d Test whether elements in a 1D array are also present in + another array. union1d Union of 1D arrays with unique elements. setdiff1d Set difference of 1D arrays with unique elements. ================ =================== |