summaryrefslogtreecommitdiff
path: root/numpy/lib/arraysetops.py
diff options
context:
space:
mode:
authorJulian Taylor <jtaylor.debian@googlemail.com>2015-03-01 13:30:17 +0100
committerJulian Taylor <jtaylor.debian@googlemail.com>2015-03-01 13:30:17 +0100
commit50e4eb87370b77792f1f6d21a5edd6ff20abee68 (patch)
tree8810e9f67869811fe3bc25c9e8b3295b8d08be49 /numpy/lib/arraysetops.py
parenta29f50ef84aa0f3cec0253691dacd9a3cddbb3a6 (diff)
parentda3c6a28f651877dfb4cfdbbbe76dab985669252 (diff)
downloadnumpy-50e4eb87370b77792f1f6d21a5edd6ff20abee68.tar.gz
Merge pull request #5619 from jaimefrio/unique_docstring
DOC: Describe return_counts keyword in np.unique docstring
Diffstat (limited to 'numpy/lib/arraysetops.py')
-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 cb24eb24e..7776d7e76 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
----------