Skip to content

Commit c16a03a

Browse files
authored
Merge pull request #77 from bashtage/doc-fixes
DOC: Doc string fixes
2 parents 35f53bd + 10bc061 commit c16a03a

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ w = rnd.standard_normal(10000, method='zig')
3939
* Normals (`standard_normal`, both Box-Muller and Ziggurat)
4040
* Standard Gammas (via `standard_gamma`)
4141

42-
**WARNING**: The 32-bit generators are **experimental** and subjust
42+
**WARNING**: The 32-bit generators are **experimental** and subject
4343
to change.
4444

4545
**Note**: There are _no_ plans to extend the alternative precision
@@ -78,11 +78,11 @@ The RNGs include:
7878
* `standard_normal`, `normal`, `randn` and `multivariate_normal` all
7979
support an additional `method` keyword argument which can be `bm` or
8080
`zig` where `bm` corresponds to the current method using the Box-Muller
81-
transformation and `zig` uses the much faster (100%+) ziggurat method.
81+
transformation and `zig` uses the much faster (100%+) Ziggurat method.
8282
* Core random number generators can produce either single precision
8383
(`np.float32`) or double precision (`np.float64`, the default) using
8484
an the optional keyword argument `dtype`
85-
* Core random number generators can fill existin arrays using the
85+
* Core random number generators can fill existing arrays using the
8686
`out` keyword argument
8787

8888

README.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Features
3939
- Normals (``standard_normal``, both Box-Muller and Ziggurat)
4040
- Standard Gammas (via ``standard_gamma``)
4141

42-
**WARNING**: The 32-bit generators are **experimental** and subjust to
42+
**WARNING**: The 32-bit generators are **experimental** and subject to
4343
change.
4444

4545
**Note**: There are *no* plans to extend the alternative precision
@@ -82,11 +82,11 @@ New Features
8282
``multivariate_normal`` all support an additional ``method`` keyword
8383
argument which can be ``bm`` or ``zig`` where ``bm`` corresponds to
8484
the current method using the Box-Muller transformation and ``zig``
85-
uses the much faster (100%+) ziggurat method.
85+
uses the much faster (100%+) Ziggurat method.
8686
- Core random number generators can produce either single precision
8787
(``np.float32``) or double precision (``np.float64``, the default)
8888
using an the optional keyword argument ``dtype``
89-
- Core random number generators can fill existin arrays using the
89+
- Core random number generators can fill existing arrays using the
9090
``out`` keyword argument
9191

9292
New Functions

doc/source/change-log.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
Change Log
44
==========
55

6-
Changes since 1.11.4
7-
--------------------
6+
Version 1.12
7+
------------
8+
* Synchronize with NumPy 1.12 release
89
* Add ``out`` argument which allows filling existing arrays. This feature was
910
added to facilitate multithreaded filling of arrays using parallel random
1011
number generators.

doc/source/conf.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858

5959
# General information about the project.
6060
project = 'randomstate'
61-
copyright = '2016, Kevin Sheppard'
61+
copyright = '2017, Kevin Sheppard'
6262
author = 'Kevin Sheppard'
6363

6464
# The version info for the project you're documenting, acts as replacement for
@@ -131,7 +131,7 @@
131131
# Guzzle theme options (see theme.conf for more information)
132132
html_theme_options = {
133133
# Set the name of the project to appear in the sidebar
134-
"project_nav_name": "randomstate",
134+
"project_nav_name": "randomstate " + version,
135135
}
136136

137137
# Add any paths that contain custom themes here, relative to this directory.
@@ -286,8 +286,8 @@
286286
# dir menu entry, description, category)
287287
texinfo_documents = [
288288
(master_doc, 'randomstate', 'randomstate Documentation',
289-
author, 'randomstate', 'One line description of project.',
290-
'Miscellaneous'),
289+
author, 'randomstate', 'NumPy-like random number generation supporting multiple core PRNG.',
290+
'Random Numbers'),
291291
]
292292

293293
# Documents to append as an appendix to all manuals.

doc/source/multithreading.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ Multithreaded Generation
33

44
The four core distributions all allow existing arrays to be filled using the
55
``out`` keyword argument. Existing arrays need to be contiguous and
6-
well-behaved (writable and algined). Under normal circumstances, arrays
6+
well-behaved (writable and aligned). Under normal circumstances, arrays
77
created using the common constructors such as ``numpy.empty`` will satisfy
88
these requirements.
99

1010
This example makes use of Python 3 ``futures`` to fill an array using multiple
1111
threads. Threads are long-lived so that repeated calls do not require any
12-
additional overheads from thread creation. The undelying PRNG is xorshift2014
13-
which is fast, has a long period and supports using ``jump`` to advange the
12+
additional overheads from thread creation. The underlying PRNG is xorshift2014
13+
which is fast, has a long period and supports using ``jump`` to advance the
1414
state. The random numbers generated are reproducible in the sense that the
1515
same seed will produce the same outputs.
1616

randomstate/randomstate.pyx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ cdef object _ensure_string(object s):
172172
cdef class RandomState:
173173
CLASS_DOCSTRING
174174

175-
# cdef rng_t rng
176175
cdef void *rng_loc
177176
cdef binomial_t binomial_info
178177
cdef aug_state rng_state

0 commit comments

Comments
 (0)