Skip to content

Commit da6eed7

Browse files
authored
Typing Randomness Manager (#572)
* just add a new assert * fix test * Update CHANGELOG.rst
1 parent 1ffa22c commit da6eed7

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

CHANGELOG.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
**3.2.16 - 01/22/25**
2+
3+
- Type-hinting: Fix mypy errors in tests/framework/randomness/test_manager.py
4+
15
**3.2.15 - 01/10/25**
26

37
- Type-hinting: Fix mypy errors in tests/framework/randomness/test_crn.py

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ exclude = [
5454
'tests/framework/population/test_manager.py',
5555
'tests/framework/population/test_population_view.py',
5656
'tests/framework/randomness/test_index_map.py',
57-
'tests/framework/randomness/test_manager.py',
5857
'tests/framework/randomness/test_reproducibility.py',
5958
'tests/framework/randomness/test_stream.py',
6059
'tests/framework/results/helpers.py',

tests/framework/randomness/test_manager.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import pandas as pd
22
import pytest
3+
from layered_config_tree import LayeredConfigTree
34

45
from tests.helpers import ColumnCreator, ColumnRequirer
56
from vivarium import InteractiveContext
@@ -8,12 +9,12 @@
89
from vivarium.framework.randomness.stream import get_hash
910

1011

11-
def mock_clock():
12+
def mock_clock() -> pd.Timestamp:
1213
return pd.Timestamp("1/1/2005")
1314

1415

15-
def test_randomness_manager_get_randomness_stream():
16-
seed = 123456
16+
def test_randomness_manager_get_randomness_stream() -> None:
17+
seed = "123456"
1718
component = ColumnCreator()
1819

1920
rm = RandomnessManager()
@@ -34,8 +35,8 @@ def test_randomness_manager_get_randomness_stream():
3435
rm._get_randomness_stream("test", ColumnRequirer())
3536

3637

37-
def test_randomness_manager_register_simulants():
38-
seed = 123456
38+
def test_randomness_manager_register_simulants() -> None:
39+
seed = "123456"
3940
rm = RandomnessManager()
4041
rm._add_constraint = lambda f, **kwargs: f
4142
rm._seed = seed
@@ -48,14 +49,15 @@ def test_randomness_manager_register_simulants():
4849
rm.register_simulants(bad_df)
4950

5051
good_df = pd.DataFrame({"age": range(10), "sex": [1] * 5 + [2] * 5})
51-
5252
rm.register_simulants(good_df)
53+
54+
assert isinstance(rm._key_mapping._map, pd.Series)
5355
map_index = rm._key_mapping._map.droplevel(rm._key_mapping.SIM_INDEX_COLUMN).index
5456
good_index = good_df.set_index(good_df.columns.tolist()).index
5557
assert map_index.difference(good_index).empty
5658

5759

58-
def test_get_random_seed():
60+
def test_get_random_seed() -> None:
5961
seed = "123456"
6062
decision_point = "test"
6163

@@ -68,7 +70,7 @@ def test_get_random_seed():
6870

6971

7072
@pytest.mark.parametrize("additional_seed", ["789", None])
71-
def test_additional_seed(base_config, additional_seed):
73+
def test_additional_seed(base_config: LayeredConfigTree, additional_seed: str | None) -> None:
7274

7375
input_draw = "123"
7476
seed = "456"

0 commit comments

Comments
 (0)