diff options
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/code_generators/ufunc_docstrings.py | 20 | ||||
| -rw-r--r-- | numpy/lib/function_base.py | 8 | ||||
| -rw-r--r-- | numpy/ma/core.py | 2 | ||||
| -rw-r--r-- | numpy/random/mtrand/mtrand.pyx | 10 |
4 files changed, 20 insertions, 20 deletions
diff --git a/numpy/core/code_generators/ufunc_docstrings.py b/numpy/core/code_generators/ufunc_docstrings.py index 1abbb666b..1cd486608 100644 --- a/numpy/core/code_generators/ufunc_docstrings.py +++ b/numpy/core/code_generators/ufunc_docstrings.py @@ -686,7 +686,7 @@ add_newdoc('numpy.core.umath', 'ceil', Returns ------- - y : {ndarray, scalar} + y : ndarray or scalar The ceiling of each element in `x`, with `float` dtype. See Also @@ -716,7 +716,7 @@ add_newdoc('numpy.core.umath', 'trunc', Returns ------- - y : {ndarray, scalar} + y : ndarray or scalar The truncated value of each element in `x`. See Also @@ -931,7 +931,7 @@ add_newdoc('numpy.core.umath', 'divide', Returns ------- - y : {ndarray, scalar} + y : ndarray or scalar The quotient ``x1/x2``, element-wise. Returns a scalar if both ``x1`` and ``x2`` are scalars. @@ -1172,7 +1172,7 @@ add_newdoc('numpy.core.umath', 'fabs', Returns ------- - y : {ndarray, scalar} + y : ndarray or scalar The absolute values of `x`, the returned values are always floats. See Also @@ -1202,7 +1202,7 @@ add_newdoc('numpy.core.umath', 'floor', Returns ------- - y : {ndarray, scalar} + y : ndarray or scalar The floor of each element in `x`. See Also @@ -2193,7 +2193,7 @@ add_newdoc('numpy.core.umath', 'maximum', Returns ------- - y : {ndarray, scalar} + y : ndarray or scalar The maximum of `x1` and `x2`, element-wise. Returns scalar if both `x1` and `x2` are scalars. @@ -2251,7 +2251,7 @@ add_newdoc('numpy.core.umath', 'minimum', Returns ------- - y : {ndarray, scalar} + y : ndarray or scalar The minimum of `x1` and `x2`, element-wise. Returns scalar if both `x1` and `x2` are scalars. @@ -2309,7 +2309,7 @@ add_newdoc('numpy.core.umath', 'fmax', Returns ------- - y : {ndarray, scalar} + y : ndarray or scalar The minimum of `x1` and `x2`, element-wise. Returns scalar if both `x1` and `x2` are scalars. @@ -2366,7 +2366,7 @@ add_newdoc('numpy.core.umath', 'fmin', Returns ------- - y : {ndarray, scalar} + y : ndarray or scalar The minimum of `x1` and `x2`, element-wise. Returns scalar if both `x1` and `x2` are scalars. @@ -2780,7 +2780,7 @@ add_newdoc('numpy.core.umath', 'rint', Returns ------- - out : {ndarray, scalar} + out : ndarray or scalar Output array is same shape and type as `x`. See Also diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py index 36ce94bad..7bab66313 100644 --- a/numpy/lib/function_base.py +++ b/numpy/lib/function_base.py @@ -461,7 +461,7 @@ def average(a, axis=None, weights=None, returned=False): Returns ------- - average, [sum_of_weights] : {array_type, double} + average, [sum_of_weights] : array_type or double Return the average along the specified axis. When returned is `True`, return a tuple with the average as the first element and the sum of the weights as the second element. The return type is `Float` @@ -1147,7 +1147,7 @@ def interp(x, xp, fp, left=None, right=None, period=None): Returns ------- - y : {float, ndarray} + y : float or ndarray The interpolated values, same shape as `x`. Raises @@ -1250,7 +1250,7 @@ def angle(z, deg=0): Returns ------- - angle : {ndarray, scalar} + angle : ndarray or scalar The counterclockwise angle from the positive real axis on the complex plane, with dtype as numpy.float64. @@ -1980,7 +1980,7 @@ def corrcoef(x, y=None, rowvar=1, bias=0, ddof=None): observations (unbiased estimate). If `bias` is 1, then normalization is by ``N``. These values can be overridden by using the keyword ``ddof`` in numpy versions >= 1.5. - ddof : {None, int}, optional + ddof : int, optional .. versionadded:: 1.5 If not ``None`` normalization is by ``(N - ddof)``, where ``N`` is the number of observations; this overrides the value implied by diff --git a/numpy/ma/core.py b/numpy/ma/core.py index 34e52d86e..9ca9136dd 100644 --- a/numpy/ma/core.py +++ b/numpy/ma/core.py @@ -4978,7 +4978,7 @@ class MaskedArray(ndarray): Returns ------- - {ndarray, scalar} + ndarray or scalar If multi-dimension input, returns a new ndarray of indices to the minimum values along the given axis. Otherwise, returns a scalar of index to the minimum values along the given axis. diff --git a/numpy/random/mtrand/mtrand.pyx b/numpy/random/mtrand/mtrand.pyx index c03666527..3f6af86b1 100644 --- a/numpy/random/mtrand/mtrand.pyx +++ b/numpy/random/mtrand/mtrand.pyx @@ -1923,7 +1923,7 @@ cdef class RandomState: Returns ------- - samples : {ndarray, scalar} + samples : ndarray or scalar Samples from the Fisher distribution. See Also @@ -2756,7 +2756,7 @@ cdef class RandomState: Returns ------- - samples : {ndarray, scalar} + samples : ndarray or scalar The returned samples lie in [0, 1]. Raises @@ -3099,7 +3099,7 @@ cdef class RandomState: Returns ------- - samples : {ndarray, scalar} + samples : ndarray or scalar where the values are all integers in [0, n]. See Also @@ -3567,7 +3567,7 @@ cdef class RandomState: Returns ------- - samples : {ndarray, scalar} + samples : ndarray or scalar where the values are all integers in [0, n]. See Also @@ -4127,7 +4127,7 @@ cdef class RandomState: Returns ------- - samples : {ndarray, scalar} + samples : ndarray or scalar where the values are all integers in [0, n]. See Also |