Merge pull request #14 from bashtage/reorg-mod

REF: Reorganize module

Author: bashtage

randomstate/__init__.py

@@ -1,9 +1,9 @@
 from __future__ import division, absolute_import, print_function
 
-from randomstate.mt19937 import *
-import randomstate.mlfg_1279_861 as mlfg_1279_861
-import randomstate.mrg32k3a as mrg32k3a
-import randomstate.pcg32 as pcg32
-import randomstate.pcg64 as pcg64
-import randomstate.xorshift1024 as xorshift1024
-import randomstate.xorshift128 as xorshift128
+from randomstate.prng.mt19937.mt19937 import *
+from randomstate.prng.mlfg_1279_861 import mlfg_1279_861
+from randomstate.prng.mrg32k3a import mrg32k3a
+from randomstate.prng.pcg32 import pcg32
+from randomstate.prng.pcg64 import pcg64
+from randomstate.prng.xorshift1024 import xorshift1024
+from randomstate.prng.xorshift128 import xorshift128

randomstate/performance.py

@@ -9,6 +9,12 @@
 rs.random_sample()
 '''
 
+SETUP_RS = '''
+import {mod}.{rng}
+rs = {mod}.{rng}.RandomState()
+rs.random_sample()
+'''
+
 scale_32 = scale_64 = 1
 if sys.maxsize < 2 ** 32:
     # 32 bit
@@ -34,7 +40,7 @@ def run_timer(dist, command, numpy_command=None, setup='', random_type=''):
 
     res = {}
     for rng in RNGS:
-        mod = 'randomstate' if rng != 'random' else 'numpy'
+        mod = 'randomstate.prng.' + rng if rng != 'random' else 'numpy'
         key = '-'.join((mod, rng, dist)).replace('"', '')
         command = numpy_command if 'numpy' in mod else command
         res[key] = timer(command.format(dist=dist), setup=setup.format(mod=mod, rng=rng))