vivarium-public-health 4.2.4__py3-none-any.whl → 4.2.5__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 +9 -3
- {vivarium_public_health-4.2.4.dist-info → vivarium_public_health-4.2.5.dist-info}/METADATA +2 -2
- {vivarium_public_health-4.2.4.dist-info → vivarium_public_health-4.2.5.dist-info}/RECORD +7 -7
- {vivarium_public_health-4.2.4.dist-info → vivarium_public_health-4.2.5.dist-info}/WHEEL +0 -0
- {vivarium_public_health-4.2.4.dist-info → vivarium_public_health-4.2.5.dist-info}/licenses/LICENSE.txt +0 -0
- {vivarium_public_health-4.2.4.dist-info → vivarium_public_health-4.2.5.dist-info}/top_level.txt +0 -0
@@ -1 +1 @@
|
|
1
|
-
__version__ = "4.2.
|
1
|
+
__version__ = "4.2.5"
|
@@ -54,21 +54,27 @@ def assign_demographic_proportions(
|
|
54
54
|
|
55
55
|
population_data["P(sex, location, age| year)"] = (
|
56
56
|
population_data.groupby("year_start", as_index=False)
|
57
|
-
.apply(
|
57
|
+
.apply(
|
58
|
+
lambda sub_pop: sub_pop[["value"]] / sub_pop["value"].sum(), include_groups=False
|
59
|
+
)
|
58
60
|
.reset_index(level=0)["value"]
|
59
61
|
.fillna(0.0)
|
60
62
|
)
|
61
63
|
|
62
64
|
population_data["P(sex, location | age, year)"] = (
|
63
65
|
population_data.groupby(["age", "year_start"], as_index=False)
|
64
|
-
.apply(
|
66
|
+
.apply(
|
67
|
+
lambda sub_pop: sub_pop[["value"]] / sub_pop["value"].sum(), include_groups=False
|
68
|
+
)
|
65
69
|
.reset_index(level=0)["value"]
|
66
70
|
.fillna(0.0)
|
67
71
|
)
|
68
72
|
|
69
73
|
population_data["P(age | year, sex, location)"] = (
|
70
74
|
population_data.groupby(["year_start", "sex", "location"], as_index=False)
|
71
|
-
.apply(
|
75
|
+
.apply(
|
76
|
+
lambda sub_pop: sub_pop[["value"]] / sub_pop["value"].sum(), include_groups=False
|
77
|
+
)
|
72
78
|
.reset_index(level=0)["value"]
|
73
79
|
.fillna(0.0)
|
74
80
|
)
|
@@ -1,6 +1,6 @@
|
|
1
1
|
Metadata-Version: 2.4
|
2
2
|
Name: vivarium_public_health
|
3
|
-
Version: 4.2.
|
3
|
+
Version: 4.2.5
|
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
|
@@ -31,7 +31,7 @@ Requires-Dist: vivarium>=3.4.3
|
|
31
31
|
Requires-Dist: layered_config_tree>=3.2.0
|
32
32
|
Requires-Dist: loguru
|
33
33
|
Requires-Dist: numpy<2.0.0
|
34
|
-
Requires-Dist: pandas
|
34
|
+
Requires-Dist: pandas>=2.2.0
|
35
35
|
Requires-Dist: scipy
|
36
36
|
Requires-Dist: tables
|
37
37
|
Requires-Dist: risk_distributions>=2.0.11
|
@@ -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=BHihVu7dXonsKl2pRqg285-KtswJWtWvUz1CNNV7nPM,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=Wu797AL13KRLhXkYni_XocJBLfhfvCVgGeas08U3tCM,18898
|
24
|
-
vivarium_public_health/population/data_transformations.py,sha256=
|
24
|
+
vivarium_public_health/population/data_transformations.py,sha256=6VclPZ-Xgmyv4Btj04LgKEIBmKZJePRZFdFK_MaVa9c,22510
|
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.2.
|
47
|
-
vivarium_public_health-4.2.
|
48
|
-
vivarium_public_health-4.2.
|
49
|
-
vivarium_public_health-4.2.
|
50
|
-
vivarium_public_health-4.2.
|
46
|
+
vivarium_public_health-4.2.5.dist-info/licenses/LICENSE.txt,sha256=mN4bNLUQNcN9njYRc_3jCZkfPySVpmM6MRps104FxA4,1548
|
47
|
+
vivarium_public_health-4.2.5.dist-info/METADATA,sha256=3wVsMLj8PPkAf79n83BGLZleGLzkxR0hHu7Z1S-kT84,4294
|
48
|
+
vivarium_public_health-4.2.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
49
|
+
vivarium_public_health-4.2.5.dist-info/top_level.txt,sha256=VVInlpzCFD0UNNhjOq_j-a29odzjwUwYFTGfvqbi4dY,23
|
50
|
+
vivarium_public_health-4.2.5.dist-info/RECORD,,
|
File without changes
|
File without changes
|
{vivarium_public_health-4.2.4.dist-info → vivarium_public_health-4.2.5.dist-info}/top_level.txt
RENAMED
File without changes
|