diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2015-11-02 12:38:54 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2015-11-02 12:38:54 -0700 |
| commit | 2bc5cb9a19027704d13f06b02c0bbd07e6aebd29 (patch) | |
| tree | ea3bce5c9fa3eb66553a28ee2be5a91fff01f8f0 | |
| parent | f2f61b84b78909aa8c8aa6574b643de937d3348b (diff) | |
| parent | 6a09c85cae64417dec7d2e757bfe034673acd23d (diff) | |
| download | numpy-2bc5cb9a19027704d13f06b02c0bbd07e6aebd29.tar.gz | |
Merge pull request #6614 from charris/update-random-all
BUG: Add choice and dirichlet to numpy.random.__all__.
| -rw-r--r-- | doc/release/1.10.2-notes.rst | 2 | ||||
| -rw-r--r-- | numpy/random/info.py | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/release/1.10.2-notes.rst b/doc/release/1.10.2-notes.rst index d508e7bc2..efd57d927 100644 --- a/doc/release/1.10.2-notes.rst +++ b/doc/release/1.10.2-notes.rst @@ -31,6 +31,7 @@ Issues Fixed * gh-6563 Intent(out) broken in recent versions of f2py. * gh-6575 BUG: Split produces empty arrays with wrong number of dimensions * gh-6590 Fortran Array problem in numpy 1.10. +* gh-6602 Random __all__ missing choice and dirichlet. Merged PRs ========== @@ -65,6 +66,7 @@ The following PRs in master have been backported to 1.10.2 * gh-6579 MAINT: Fix mistake in doc upload rule. * gh-6596 BUG: Fix swig for relaxed stride checking. * gh-6606 DOC: Update 1.10.2 release notes. +* gh-6614 BUG: Add choice and dirichlet to numpy.random.__all__. Initial support for mingwpy was reverted as it was causing problems for non-windows builds. diff --git a/numpy/random/info.py b/numpy/random/info.py index 396e62381..be9c8d9bd 100644 --- a/numpy/random/info.py +++ b/numpy/random/info.py @@ -13,6 +13,8 @@ random_integers Uniformly distributed integers in a given range. permutation Randomly permute a sequence / generate a random sequence. shuffle Randomly permute a sequence in place. seed Seed the random number generator. +choice Random sample from 1-D array. + ==================== ========================================================= ==================== ========================================================= @@ -91,6 +93,8 @@ __all__ = [ 'binomial', 'bytes', 'chisquare', + 'choice', + 'dirichlet', 'exponential', 'f', 'gamma', |