summaryrefslogtreecommitdiff
path: root/numpy/core/fromnumeric.py
diff options
context:
space:
mode:
authorcolinsnyder <47012605+colinsnyder@users.noreply.github.com>2019-08-15 01:48:50 -0700
committerMatti Picus <matti.picus@gmail.com>2019-08-15 11:48:50 +0300
commit4d734a4e6ef29d1f26a00b515f5f892ccdaf7ef9 (patch)
tree26a37fc71fc509fe761a094b808fff4cbb44399e /numpy/core/fromnumeric.py
parentd1a29d2a8416eb15890cc3f3f7c4619c986d8f40 (diff)
downloadnumpy-4d734a4e6ef29d1f26a00b515f5f892ccdaf7ef9.tar.gz
DOC: mention `take_along_axis` in `choose` (#14224)
* DOC: mention take_along_axis in choose
Diffstat (limited to 'numpy/core/fromnumeric.py')
-rw-r--r--numpy/core/fromnumeric.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py
index c9ea44425..bde37fca3 100644
--- a/numpy/core/fromnumeric.py
+++ b/numpy/core/fromnumeric.py
@@ -380,6 +380,7 @@ def choose(a, choices, out=None, mode='raise'):
See Also
--------
ndarray.choose : equivalent method
+ numpy.take_along_axis : Preferable if `choices` is an array
Notes
-----
@@ -908,17 +909,17 @@ def sort(a, axis=-1, kind=None, order=None):
.. versionadded:: 1.12.0
- quicksort has been changed to `introsort <https://en.wikipedia.org/wiki/Introsort>`_.
+ quicksort has been changed to `introsort <https://en.wikipedia.org/wiki/Introsort>`_.
When sorting does not make enough progress it switches to
- `heapsort <https://en.wikipedia.org/wiki/Heapsort>`_.
+ `heapsort <https://en.wikipedia.org/wiki/Heapsort>`_.
This implementation makes quicksort O(n*log(n)) in the worst case.
'stable' automatically chooses the best stable sorting algorithm
- for the data type being sorted.
- It, along with 'mergesort' is currently mapped to
- `timsort <https://en.wikipedia.org/wiki/Timsort>`_
- or `radix sort <https://en.wikipedia.org/wiki/Radix_sort>`_
- depending on the data type.
+ for the data type being sorted.
+ It, along with 'mergesort' is currently mapped to
+ `timsort <https://en.wikipedia.org/wiki/Timsort>`_
+ or `radix sort <https://en.wikipedia.org/wiki/Radix_sort>`_
+ depending on the data type.
API forward compatibility currently limits the
ability to select the implementation and it is hardwired for the different
data types.