Author: Timo Paulssen <timona...@perpetuum-immobile.de> Branch: numpy-random Changeset: r47587:dbf4471a691d Date: 2011-09-24 20:35 +0200 http://bitbucket.org/pypy/pypy/changeset/dbf4471a691d/
Log: merge heads diff --git a/pypy/module/micronumpy/app_random.py b/pypy/module/micronumpy/app_random.py new file mode 100644 --- /dev/null +++ b/pypy/module/micronumpy/app_random.py @@ -0,0 +1,59 @@ +from __future__ import absolute_import + +from numpy import array +import random + +_random = random.Random() + +def get_state(): + return _random.getstate() + +def set_state(state): + _random.setstate(state) + +def seed(seed): + _random.seed(seed) + +def rand(*shape): + assert len(shape) == 1 + + return array(_random.random() for x in range(shape[0])) + +def randn(*shape): + if len(shape) == 0: + return _random.gauss(0, 1) + assert len(shape) == 1 + + return array(_random.gauss(0, 1) for x in range(shape[0])) + +def standard_normal(size=None): + return randn(*size) + +def random_integers(low, high=None, size=None): + print "random_integers called with %s, %s" % (low, high) + + if high is None: + low, high = 1, low + else: + low, high = low, high + + print "values are now %s, %s"% (low, high) + + if size is None: + return _random.randint(low, high) + else: + assert len(size) == 1 + + return array(_random.randint(low, high) for x in range(size[0])) + +def randint(low, high=None, size=None): + print "randint called with %s, %s"% (low, high) + if high is None: + low, high = 0, low - 1 + else: + low, high = low, high - 1 + + print "values are now %s, %s"% (low, high) + + return random_integers(low, high, size) + diff --git a/pypy/module/micronumpy/test/test_random.py b/pypy/module/micronumpy/test/test_random.py new file mode 100644 --- /dev/null +++ b/pypy/module/micronumpy/test/test_random.py @@ -0,0 +1,109 @@ +from pypy.module.micronumpy.test.test_base import BaseNumpyAppTest + +class AppTestRandom(BaseNumpyAppTest): + def test_rand_single(self): + from numpy.random import rand + from numpy import array, dtype + + single = rand(1) + assert isinstance(single, array) + assert single.dtype is dtype(float) + assert single.shape == (1,) + assert single[0] >= 0 + assert single[0] < 1 + + def test_rand_multiple(self): + from numpy.random import rand + from numpy import dtype + + multi = rand(5) + + assert multi.shape == (5,) + assert min(multi) >= 0 + assert max(multi) < 1 + assert multi.dtype is dtype(float) + + def test_randn_single(self): + from numpy.random import randn + + single = randn() + + assert isinstance(single, float) + + def test_randn_multiple(self): + from numpy.random import randn + + multi = randn(6) + + assert multi.shape == (6,) + + def test_state(self): + from numpy.random import set_state, get_state, randn + + state = get_state() + number = randn() + other_number = randn() + + set_state(state) + assert randn() == number + assert randn() == other_number + + def test_seed(self): + from numpy.random import seed, rand + + seed(9001) + number = rand(1)[0] + other_number = rand(1)[0] + + seed(9001) + assert number == rand(1)[0] + assert other_number == rand(1)[0] + + def test_randint_single(self): + from numpy.random import randint + + for i in range(100): + integer = randint(4) + assert isinstance(integer, int) + assert 0 <= integer < 4 + + for i in range(100): + integer = randint(9, 12) + assert isinstance(integer, int) + assert 9 <= integer < 12 + + def test_randint_multi(self): + from numpy.random import randint + + integers = randint(4, size=(100,)) + assert integers.shape == (100,) + for x in integers: + assert 0 <= x < 4 + + integers = randint(9, 12, (100,)) + for x in integers: + assert 9 <= x < 12 + + def test_random_integers_single(self): + from numpy.random import random_integers + + for i in range(100): + integer = random_integers(4) + assert 0 <= integer <= 4 + + for i in range(100): + integer = random_integers(9, 12) + assert 9 <= integer <= 12 + + def test_random_integers_multi(self): + from numpy.random import random_integers + + integers = random_integers(5, size=(100,)) + assert integers.shape == (100,) + for x in integers: + assert 0 <= integers[x] <= 5 + + integers = random_integers(9, 12, (100,)) + assert integers.shape == (100,) + for x in integers: + assert 9 <= x <= 12 _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit
