From 4e5545f0bcc654fb0c6752dcf72120e6e7340d28 Mon Sep 17 00:00:00 2001 From: Gabor Kovacs Date: Sat, 23 Aug 2014 17:50:10 +0100 Subject: DOC: Update docs. Update docs for boolean array indexing and nonzero order. Add links to row-major and column-major terms where they appear. Closes #3177 --- numpy/core/numeric.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'numpy/core/numeric.py') diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index 24d92f16f..eb92d7f52 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -398,8 +398,7 @@ matmul = multiarray.matmul def asarray(a, dtype=None, order=None): - """ - Convert the input to an array. + """Convert the input to an array. Parameters ---------- @@ -410,8 +409,9 @@ def asarray(a, dtype=None, order=None): dtype : data-type, optional By default, the data-type is inferred from the input data. order : {'C', 'F'}, optional - Whether to use row-major ('C') or column-major ('F' for FORTRAN) - memory representation. Defaults to 'C'. + Whether to use row-major (C-style) or + column-major (Fortran-style) memory representation. + Defaults to 'C'. Returns ------- @@ -468,8 +468,7 @@ def asarray(a, dtype=None, order=None): return array(a, dtype, copy=False, order=order) def asanyarray(a, dtype=None, order=None): - """ - Convert the input to an ndarray, but pass ndarray subclasses through. + """Convert the input to an ndarray, but pass ndarray subclasses through. Parameters ---------- @@ -480,8 +479,8 @@ def asanyarray(a, dtype=None, order=None): dtype : data-type, optional By default, the data-type is inferred from the input data. order : {'C', 'F'}, optional - Whether to use row-major ('C') or column-major ('F') memory - representation. Defaults to 'C'. + Whether to use row-major (C-style) or column-major + (Fortran-style) memory representation. Defaults to 'C'. Returns ------- -- cgit v1.2.1