From 1816fa081167bfb363db0146ecf8b00b0c283829 Mon Sep 17 00:00:00 2001 From: Julian Taylor Date: Sat, 14 Sep 2013 14:53:26 +0200 Subject: [PATCH] DOC: add isclose and partition to reference and link some docs also drop sometrue/alltrue link, its equivalent to any/all. --- doc/source/reference/routines.logic.rst | 1 + doc/source/reference/routines.sort.rst | 2 ++ numpy/add_newdocs.py | 2 ++ numpy/core/fromnumeric.py | 4 ++++ numpy/core/numeric.py | 2 +- 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/doc/source/reference/routines.logic.rst b/doc/source/reference/routines.logic.rst index 56e36f49aa77..88edde855e33 100644 --- a/doc/source/reference/routines.logic.rst +++ b/doc/source/reference/routines.logic.rst @@ -50,6 +50,7 @@ Comparison :toctree: generated/ allclose + isclose array_equal array_equiv diff --git a/doc/source/reference/routines.sort.rst b/doc/source/reference/routines.sort.rst index 517ea5897966..2b36aec7510a 100644 --- a/doc/source/reference/routines.sort.rst +++ b/doc/source/reference/routines.sort.rst @@ -14,6 +14,8 @@ Sorting ndarray.sort msort sort_complex + partition + argpartition Searching --------- diff --git a/numpy/add_newdocs.py b/numpy/add_newdocs.py index c0dc56f300ee..ec53c06033e4 100644 --- a/numpy/add_newdocs.py +++ b/numpy/add_newdocs.py @@ -4189,6 +4189,7 @@ def luf(lamdaexpr, *args, **kwargs): argsort : Indirect sort. lexsort : Indirect stable sort on multiple keys. searchsorted : Find elements in sorted array. + partition: Partial sort. Notes ----- @@ -4253,6 +4254,7 @@ def luf(lamdaexpr, *args, **kwargs): -------- numpy.partition : Return a parititioned copy of an array. argpartition : Indirect partition. + sort : Full sort. Notes ----- diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py index ca18d64eaaa4..f8a743247e86 100644 --- a/numpy/core/fromnumeric.py +++ b/numpy/core/fromnumeric.py @@ -576,6 +576,7 @@ def partition(a, kth, axis=-1, kind='introselect', order=None): -------- ndarray.partition : Method to sort an array in-place. argpartition : Indirect partition. + sort : Full sorting Notes ----- @@ -659,6 +660,7 @@ def argpartition(a, kth, axis=-1, kind='introselect', order=None): -------- partition : Describes partition algorithms used. ndarray.partition : Inplace partition. + argsort : Full indirect sort Notes ----- @@ -707,6 +709,7 @@ def sort(a, axis=-1, kind='quicksort', order=None): argsort : Indirect sort. lexsort : Indirect stable sort on multiple keys. searchsorted : Find elements in a sorted array. + partition : Partial sort. Notes ----- @@ -819,6 +822,7 @@ def argsort(a, axis=-1, kind='quicksort', order=None): sort : Describes sorting algorithms used. lexsort : Indirect stable sort with multiple keys. ndarray.sort : Inplace sort. + argpartition : Indirect partial sort. Notes ----- diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index 1b3d5d5a8d1d..1aa59ce58880 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -2083,7 +2083,7 @@ def allclose(a, b, rtol=1.e-5, atol=1.e-8): See Also -------- - all, any, alltrue, sometrue + isclose, all, any Notes -----