Merge 987ab69 into 916d089

bashtage · Jun 11, 2019 · 463b1c0 · 463b1c0
2 parents 916d089 + 987ab69
commit 463b1c0
Show file tree

Hide file tree

Showing 22 changed files with 3,343 additions and 44 deletions.
diff --git a/doc/source/bit_generators/aesctr.rst b/doc/source/bit_generators/aesctr.rst
@@ -0,0 +1,41 @@
+AES Counter-based RNG
+---------------------
+
+.. module:: randomgen.aes
+
+.. currentmodule:: randomgen.aes
+
+.. autoclass:: AESCounter
+
+Seeding and State
+=================
+
+.. autosummary::
+   :toctree: generated/
+
+   ~AESCounter.seed
+   ~AESCounter.state
+
+Parallel generation
+===================
+.. autosummary::
+   :toctree: generated/
+
+   ~AESCounter.advance
+   ~AESCounter.jump
+   ~AESCounter.jumped
+
+Extending
+=========
+.. autosummary::
+   :toctree: generated/
+
+   ~AESCounter.cffi
+   ~AESCounter.ctypes
+
+Testing
+=======
+.. autosummary::
+   :toctree: generated/
+
+   ~AESCounter.random_raw
diff --git a/doc/source/bit_generators/index.rst b/doc/source/bit_generators/index.rst
@@ -22,6 +22,7 @@ These RNGs will be included in future releases.
 .. toctree::
    :maxdepth: 1
 
+   AES Counter <aesctr>
    DSFMT <dsfmt>
    MT19937 <mt19937>
    MT64 <mt64>

diff --git a/doc/source/performance.py b/doc/source/performance.py
@@ -5,12 +5,12 @@
 import pandas as pd
 
 from randomgen import MT19937, DSFMT, ThreeFry, PCG64, Philox, Xoshiro256, \
-    Xoshiro512, MT64, SFMT
+    Xoshiro512, MT64, SFMT, AESCounter
 
 NUMBER = 100
 REPEAT = 10
 SIZE = 25000
-PRNGS = [DSFMT, MT19937, MT64, Philox, PCG64, ThreeFry, SFMT,
+PRNGS = [AESCounter, DSFMT, MT19937, MT64, Philox, PCG64, ThreeFry, SFMT,
          Xoshiro256, Xoshiro512]
 
 funcs = OrderedDict()

diff --git a/randomgen/__init__.py b/randomgen/__init__.py
@@ -14,14 +14,16 @@
 from randomgen.xorshift1024 import Xorshift1024
 from randomgen.xoshiro256 import Xoshiro256
 from randomgen.xoshiro512 import Xoshiro512
+from randomgen.aes import AESCounter
+
 
 from randomgen.rdrand import RDRAND
 from ._version import get_versions
 
 __all__ = ['DSFMT', 'Generator', 'MT19937', 'MT64', 'PCG32', 'PCG64', 'Philox',
            'Philox4x32', 'RDRAND', 'RandomState', 'SFMT', 'ThreeFry',
            'ThreeFry32', 'Xoroshiro128', 'Xorshift1024', 'Xoshiro256',
-           'Xoshiro512']
+           'Xoshiro512', 'AESCounter']
 
 __version__ = get_versions()['version']
 del get_versions
diff --git a/randomgen/_pickle.py b/randomgen/_pickle.py
@@ -1,3 +1,4 @@
+from randomgen.aes import AESCounter
 from randomgen.dsfmt import DSFMT
 from randomgen.generator import Generator
 from randomgen.mt19937 import MT19937
@@ -16,7 +17,8 @@
 from randomgen.xoshiro512 import Xoshiro512
 from randomgen.rdrand import RDRAND
 
-BitGenerators = {'MT19937': MT19937,
+BitGenerators = {'AESCounter': AESCounter,
+                 'MT19937': MT19937,
                  'MT64': MT64,
                  'DSFMT': DSFMT,
                  'PCG32': PCG32,