Pre-CRN refactor cleanup (#272)

* Do the large line change code movement ahead of the CRN algorithm refactor * Couple of doc fixes
ihmeuw · Feb 2, 2023 · cfc1243 · cfc1243
1 parent 8526845
commit cfc1243
Show file tree

Hide file tree

Showing 11 changed files with 298 additions and 306 deletions.
diff --git a/docs/source/api_reference/framework/population/index.rst b/docs/source/api_reference/framework/population/index.rst
@@ -1,3 +1,7 @@
+=====================
+Population Management
+=====================
+
 .. automodule:: vivarium.framework.population
 
 .. toctree::

diff --git a/docs/source/api_reference/framework/randomness/core.rst b/docs/source/api_reference/framework/randomness/core.rst
diff --git a/docs/source/api_reference/framework/randomness/index.rst b/docs/source/api_reference/framework/randomness/index.rst
@@ -1,3 +1,7 @@
+========================
+Random Number Generation
+========================
+
 .. automodule:: vivarium.framework.randomness
 
 .. toctree::

diff --git a/src/vivarium/framework/randomness/__init__.py b/src/vivarium/framework/randomness/__init__.py
@@ -21,11 +21,14 @@
 can be used to create pseudo-random numbers in a repeatable manner.
 
 
-For mor information, see the Common Random Numbers
+For more information, see the Common Random Numbers
 :ref:`concept note <crn_concept>`.
 
 """
-from vivarium.framework.randomness.core import RESIDUAL_CHOICE, choice, get_hash, random
 from vivarium.framework.randomness.exceptions import RandomnessError
 from vivarium.framework.randomness.manager import RandomnessInterface, RandomnessManager
-from vivarium.framework.randomness.stream import RandomnessStream
+from vivarium.framework.randomness.stream import (
+    RESIDUAL_CHOICE,
+    RandomnessStream,
+    get_hash,
+)
diff --git a/src/vivarium/framework/randomness/core.py b/src/vivarium/framework/randomness/core.py
diff --git a/src/vivarium/framework/randomness/manager.py b/src/vivarium/framework/randomness/manager.py
@@ -5,10 +5,9 @@
 """
 import pandas as pd
 
-from vivarium.framework.randomness.core import get_hash
 from vivarium.framework.randomness.exceptions import RandomnessError
 from vivarium.framework.randomness.index_map import IndexMap
-from vivarium.framework.randomness.stream import RandomnessStream
+from vivarium.framework.randomness.stream import RandomnessStream, get_hash
 
 
 class RandomnessManager: