10000 Allow multiple versions of RandomState: init' work. by anntzer · Pull Request #5911 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

Allow multiple versions of RandomState: init' work. #5911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 10 commits into from
Closed

Allow multiple versions of RandomState: init' work. #5911

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1b24abe
Allow multiple versions of RandomState: init' work.
anntzer May 23, 2015
1b6a469
Strip out support for multiple RNGs for now.
anntzer May 23, 2015
23079cf
{LATEST => HIGHEST}_VERSION; .version is public.
anntzer May 23, 2015
48e5447
Example use of .version: new `.choice` from #5158.
anntzer May 23, 2015
57fda43
Pickling of versioned RandomStates, untested.
anntzer May 23, 2015
e648d0c
Tests for RandomState versioning.
anntzer May 25, 2015
e86c589
ReST, not Markdown.
anntzer Jun 19, 2015
2a0bff0
Change state to (version, rng, ...).
anntzer Jun 25, 2015
86d214a
Tests for version bounds and pickle compatibility.
anntzer Jun 26, 2015
ef9ad34
Fix for Python2 and 32bit builds.
10000 anntzer Jun 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix for Python2 and 32bit builds.
  • Loading branch information
@anntzer
anntzer committed Jun 26, 2015
commit ef9ad3415d7de2b7d58a2847946bb76c2691f653
6 changes: 3 additions & 3 deletions numpy/random/mtrand/mtrand.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ cdef class RandomState:
if version is None:
version = _HIGHEST_VERSION if seed is None else 0
if version not in range(_HIGHEST_VERSION + 1):
raise ValueError("`version` must be an integer between 0 and {}".
raise ValueError("`version` must be an integer between 0 and {0}".
format(_HIGHEST_VERSION))
self.version = version

Expand Down Expand Up @@ -777,13 +777,13 @@ cdef class RandomState:
"""
cdef ndarray obj "arrayObject_obj"
cdef int pos
if isinstance(state[0], str):
if isinstance(state[0], basestring):
version = 0
rng, *rest = state
else:
version, rng, *rest = state
if version not in range(_HIGHEST_VERSION + 1):
raise ValueError("`version` must be an integer between 0 and {}".
raise ValueError("`version` must be an integer between 0 and {0}".
format(_HIGHEST_VERSION))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This error should be split in two, to distinguish "this is not a valid version" and "this version is newer than this version of numpy"

if rng != 'MT19937':
raise ValueError("rng must be 'MT19937'")
Expand Down
Binary file modified numpy/random/tests/randomstate.pkl
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions numpy/random/tests/test_random.py
View file
Open in desktop
5001
Original file line number Diff line number Diff line change
Expand Up @@ -154,15 +154,15 @@ def test_backwards_compatibility_version(self):
assert_(isinstance(state[1], str))

def test_version_bounds(self):
version, *rest = RandomState(version=1).get_state()
state_without_version = RandomState(version=1).get_state()[1:]
assert_raises(ValueError, RandomState().set_state,
(random.HIGHEST_VERSION + 1,) + tuple(rest))
(random.HIGHEST_VERSION + 1,) + state_without_version)

def test_backwards_compatibility_pickle(self):
# Pickled with numpy 1.9.2.
with open(os.path.join(os.path.dirname(__file__), "randomstate.pkl"),
"rb") as f:
assert_(pickle.load(f).tomaxint() == 7272208372766828204)
assert_(pickle.load(f).randint(2 ** 31 - 1) == 103801538)

def test_negative_binomial(self):
# Ensure that the negative binomial results take floating point
Expand Down
0