vivarium-public-health 4.0.1__py3-none-any.whl → 4.0.2__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- vivarium_public_health/_version.py +1 -1
- vivarium_public_health/population/data_transformations.py +10 -8
- {vivarium_public_health-4.0.1.dist-info → vivarium_public_health-4.0.2.dist-info}/METADATA +1 -1
- {vivarium_public_health-4.0.1.dist-info → vivarium_public_health-4.0.2.dist-info}/RECORD +7 -7
- {vivarium_public_health-4.0.1.dist-info → vivarium_public_health-4.0.2.dist-info}/WHEEL +1 -1
- {vivarium_public_health-4.0.1.dist-info → vivarium_public_health-4.0.2.dist-info}/licenses/LICENSE.txt +0 -0
- {vivarium_public_health-4.0.1.dist-info → vivarium_public_health-4.0.2.dist-info}/top_level.txt +0 -0
@@ -1 +1 @@
|
|
1
|
-
__version__ = "4.0.
|
1
|
+
__version__ = "4.0.2"
|
@@ -561,22 +561,24 @@ def get_live_births_per_year(builder):
|
|
561
561
|
|
562
562
|
|
563
563
|
def rescale_final_age_bin(builder, population_data):
|
564
|
-
|
565
|
-
if
|
566
|
-
population_data = population_data.loc[
|
567
|
-
|
564
|
+
untracking_age = builder.configuration.population.to_dict().get("untracking_age", None)
|
565
|
+
if untracking_age:
|
566
|
+
population_data = population_data.loc[
|
567
|
+
population_data["age_start"] < untracking_age
|
568
|
+
].copy()
|
569
|
+
cut_bin_idx = untracking_age <= population_data["age_end"]
|
568
570
|
cut_age_start = population_data.loc[cut_bin_idx, "age_start"]
|
569
571
|
cut_age_end = population_data.loc[cut_bin_idx, "age_end"]
|
570
|
-
population_data.loc[cut_bin_idx, "value"] *= (
|
572
|
+
population_data.loc[cut_bin_idx, "value"] *= (untracking_age - cut_age_start) / (
|
571
573
|
cut_age_end - cut_age_start
|
572
574
|
)
|
573
|
-
population_data.loc[cut_bin_idx, "age_end"] =
|
575
|
+
population_data.loc[cut_bin_idx, "age_end"] = untracking_age
|
574
576
|
return population_data
|
575
577
|
|
576
578
|
|
577
579
|
def validate_crude_birth_rate_data(builder, data_year_max):
|
578
|
-
|
579
|
-
if
|
580
|
+
untracking_age = builder.configuration.population.to_dict().get("untracking_age", None)
|
581
|
+
if untracking_age and builder.configuration.population.age_end != untracking_age:
|
580
582
|
raise ValueError(
|
581
583
|
"If you specify an exit age, the initial population age end must be the same "
|
582
584
|
"for the crude birth rate calculation to work."
|
@@ -1,6 +1,6 @@
|
|
1
1
|
Metadata-Version: 2.4
|
2
2
|
Name: vivarium_public_health
|
3
|
-
Version: 4.0.
|
3
|
+
Version: 4.0.2
|
4
4
|
Summary: Components for modelling diseases, risks, and interventions with ``vivarium``
|
5
5
|
Home-page: https://github.com/ihmeuw/vivarium_public_health
|
6
6
|
Author: The vivarium developers
|
@@ -1,6 +1,6 @@
|
|
1
1
|
vivarium_public_health/__about__.py,sha256=RgWycPypKZS80TpSX7o41cREnG8PfguNHDHLuLyl820,487
|
2
2
|
vivarium_public_health/__init__.py,sha256=GDeeP-7OlCBwPuv_xQoB1wNmvCaFsqfTB7qnnYApm0w,1343
|
3
|
-
vivarium_public_health/_version.py,sha256=
|
3
|
+
vivarium_public_health/_version.py,sha256=1UD6TKg1K_f5rIzHLYHv3Su3o2nPpbEj1lo55M4pjtM,22
|
4
4
|
vivarium_public_health/utilities.py,sha256=QNXQ6fhAr1HcV-GwKw7wQLz6QyuNxqNvMA-XujKjTgs,3035
|
5
5
|
vivarium_public_health/disease/__init__.py,sha256=VUJHDLlE6ngo2qHNQUtZ8OWH5H_T7_ao-xsYKDkRmHw,443
|
6
6
|
vivarium_public_health/disease/exceptions.py,sha256=vb30IIV82OiDf2cNZCs_E2rF6mdDDHbnZSND60no5CU,97
|
@@ -21,7 +21,7 @@ vivarium_public_health/plugins/parser.py,sha256=WoUisq0d-PfJtSzKYZ6C-s-fYdQpNiRB
|
|
21
21
|
vivarium_public_health/population/__init__.py,sha256=x_9rB93q64Krw-kbBDI1-_U_JsPO1_QrL03AwiFlwXI,243
|
22
22
|
vivarium_public_health/population/add_new_birth_cohorts.py,sha256=x6A60GE_F3I8AgLABNJ-2ziiUj52lAd66uX5yc2vIDI,9038
|
23
23
|
vivarium_public_health/population/base_population.py,sha256=kBE0WVSV0aElTJNBmOBqowZlsjhDfnFn2IzNxb3X8CA,18909
|
24
|
-
vivarium_public_health/population/data_transformations.py,sha256=
|
24
|
+
vivarium_public_health/population/data_transformations.py,sha256=CEID0uLIJc0xXijlHwnC9Kt8vJMKiIkJtUYcLQbbRRY,22304
|
25
25
|
vivarium_public_health/population/mortality.py,sha256=Mtv45FENNY0GlPIoVd3d3pRq01aEh4cjzNXIgEe6hMo,10364
|
26
26
|
vivarium_public_health/results/__init__.py,sha256=rKUZGlRXJgEyFY4a_WJeg3XnC0l34S5guYZ0N9JJS4E,319
|
27
27
|
vivarium_public_health/results/columns.py,sha256=V-L3JgTcsk51Zx9PcUwSgaE1iZjuGyfZ8aShPjynadU,495
|
@@ -43,8 +43,8 @@ vivarium_public_health/treatment/__init__.py,sha256=wONElu9aJbBYwpYIovYPYaN_GYfV
|
|
43
43
|
vivarium_public_health/treatment/magic_wand.py,sha256=zg4I48G-l9fC6-qjvApbM1zNACJimZlX9ZZ9fdHKwvc,1985
|
44
44
|
vivarium_public_health/treatment/scale_up.py,sha256=_bsf9c_yVc7-q_-yBcXimISTUfYzPps1auH0uEf7sfQ,7048
|
45
45
|
vivarium_public_health/treatment/therapeutic_inertia.py,sha256=ZIHnpuszZwA_BkS53JbSLvpcnX_bqG2knwCUyUgkA9M,2362
|
46
|
-
vivarium_public_health-4.0.
|
47
|
-
vivarium_public_health-4.0.
|
48
|
-
vivarium_public_health-4.0.
|
49
|
-
vivarium_public_health-4.0.
|
50
|
-
vivarium_public_health-4.0.
|
46
|
+
vivarium_public_health-4.0.2.dist-info/licenses/LICENSE.txt,sha256=mN4bNLUQNcN9njYRc_3jCZkfPySVpmM6MRps104FxA4,1548
|
47
|
+
vivarium_public_health-4.0.2.dist-info/METADATA,sha256=e4EcxG24wvfLnM-9xIy-SHldnpj7-gx9bNES1x3jS8M,4237
|
48
|
+
vivarium_public_health-4.0.2.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
|
49
|
+
vivarium_public_health-4.0.2.dist-info/top_level.txt,sha256=VVInlpzCFD0UNNhjOq_j-a29odzjwUwYFTGfvqbi4dY,23
|
50
|
+
vivarium_public_health-4.0.2.dist-info/RECORD,,
|
File without changes
|
{vivarium_public_health-4.0.1.dist-info → vivarium_public_health-4.0.2.dist-info}/top_level.txt
RENAMED
File without changes
|