diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-09-14 07:01:46 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-09-14 07:01:46 -0700 |
| commit | 0262a60e3c1b182236a5ef1fd5b686e9d245301b (patch) | |
| tree | 2b9b5cf3a2942d5ff68ab5a9c6e97a6cc76b8402 | |
| parent | 3e80e2a6c740ea8c4053e2000db295d284bb95af (diff) | |
| parent | d4ef9b119f0954123de9acf5cf1fcb5358d99110 (diff) | |
| download | numpy-0262a60e3c1b182236a5ef1fd5b686e9d245301b.tar.gz | |
Merge pull request #3741 from juliantaylor/doc-update
DOC: add isclose and partition to reference and link some docs
| -rw-r--r-- | doc/source/reference/routines.logic.rst | 1 | ||||
| -rw-r--r-- | doc/source/reference/routines.sort.rst | 2 | ||||
| -rw-r--r-- | numpy/add_newdocs.py | 2 | ||||
| -rw-r--r-- | numpy/core/fromnumeric.py | 4 | ||||
| -rw-r--r-- | numpy/core/numeric.py | 2 |
5 files changed, 10 insertions, 1 deletions
diff --git a/doc/source/reference/routines.logic.rst b/doc/source/reference/routines.logic.rst index 56e36f49a..88edde855 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 517ea5897..2b36aec75 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 4916a9611..358c60f7b 100644 --- a/numpy/add_newdocs.py +++ b/numpy/add_newdocs.py @@ -4191,6 +4191,7 @@ add_newdoc('numpy.core.multiarray', 'ndarray', ('sort', argsort : Indirect sort. lexsort : Indirect stable sort on multiple keys. searchsorted : Find elements in sorted array. + partition: Partial sort. Notes ----- @@ -4255,6 +4256,7 @@ add_newdoc('numpy.core.multiarray', 'ndarray', ('partition', -------- 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 8d2c6ac95..abfa99e80 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 1b3d5d5a8..1aa59ce58 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 ----- |