summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Taylor <jtaylor.debian@googlemail.com>2015-03-01 13:31:08 +0100
committerJulian Taylor <jtaylor.debian@googlemail.com>2015-03-01 13:31:08 +0100
commitd685309b388ad1f92a443be4e262343ca26efd44 (patch)
treea3da442eac151e92a2e2d0d159a9899e4d10c9a3
parentbf6f80d994a154f25eb5e8beca5babdf31b13eca (diff)
parentda3c6a28f651877dfb4cfdbbbe76dab985669252 (diff)
downloadnumpy-d685309b388ad1f92a443be4e262343ca26efd44.tar.gz
Merge pull request #5619 from jaimefrio/unique_docstring
DOC: Describe return_counts keyword in np.unique docstring
-rw-r--r--numpy/lib/arraysetops.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/numpy/lib/arraysetops.py b/numpy/lib/arraysetops.py
index 2d98c35d2..e63da519b 100644
--- a/numpy/lib/arraysetops.py
+++ b/numpy/lib/arraysetops.py
@@ -97,10 +97,11 @@ def unique(ar, return_index=False, return_inverse=False, return_counts=False):
"""
Find the unique elements of an array.
- Returns the sorted unique elements of an array. There are two optional
+ Returns the sorted unique elements of an array. There are three optional
outputs in addition to the unique elements: the indices of the input array
- that give the unique values, and the indices of the unique array that
- reconstruct the input array.
+ that give the unique values, the indices of the unique array that
+ reconstruct the input array, and the number of times each unique value
+ comes up in the input array.
Parameters
----------