diff options
| author | Gabor Kovacs <kgabor79@gmail.com> | 2014-08-23 17:50:10 +0100 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2015-06-21 15:44:25 -0600 |
| commit | 4e5545f0bcc654fb0c6752dcf72120e6e7340d28 (patch) | |
| tree | 83775e28968635ac9588c021280469599b0a520b /numpy/core/numeric.py | |
| parent | e3b2bc0b0f31482cd112660393245116ae55ecbf (diff) | |
| download | numpy-4e5545f0bcc654fb0c6752dcf72120e6e7340d28.tar.gz | |
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
Diffstat (limited to 'numpy/core/numeric.py')
| -rw-r--r-- | numpy/core/numeric.py | 15 |
1 files changed, 7 insertions, 8 deletions
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 ------- |