diff options
| author | Eric Wieser <wieser.eric@gmail.com> | 2017-04-26 22:33:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-26 22:33:23 +0100 |
| commit | f63e37d8769931f34e080a40f38470b06e72931b (patch) | |
| tree | ea5df436719a2674376770fcb134868fddc35e7a /numpy/random | |
| parent | 1a5bd45571e8bd0cad352545129f771431983a31 (diff) | |
| parent | 1a0f64bc9055fa63d9e399d5430cb67d6c2a421a (diff) | |
| download | python-numpy-f63e37d8769931f34e080a40f38470b06e72931b.tar.gz python-numpy-f63e37d8769931f34e080a40f38470b06e72931b.tar.bz2 python-numpy-f63e37d8769931f34e080a40f38470b06e72931b.zip | |
Merge pull request #8962 from MSeifert04/random_choice_docs
DOC: Wrong return type of np.random.choice and wrong variable name in parameter description.
Diffstat (limited to 'numpy/random')
| -rw-r--r-- | numpy/random/mtrand/mtrand.pyx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/random/mtrand/mtrand.pyx b/numpy/random/mtrand/mtrand.pyx index a93ed8e6e..9f901f14c 100644 --- a/numpy/random/mtrand/mtrand.pyx +++ b/numpy/random/mtrand/mtrand.pyx @@ -1026,7 +1026,7 @@ cdef class RandomState: ----------- a : 1-D array-like or int If an ndarray, a random sample is generated from its elements. - If an int, the random sample is generated as if a was np.arange(n) + If an int, the random sample is generated as if a were np.arange(a) size : int or tuple of ints, optional Output shape. If the given shape is, e.g., ``(m, n, k)``, then ``m * n * k`` samples are drawn. Default is None, in which case a @@ -1040,7 +1040,7 @@ cdef class RandomState: Returns -------- - samples : 1-D ndarray, shape (size,) + samples : single item or ndarray The generated random samples Raises |