vivarium-public-health 3.0.2__py3-none-any.whl → 3.0.3__py3-none-any.whl

vivarium_public_health/_version.py

@@ -1 +1 @@
-__version__ = "3.0.2"
+__version__ = "3.0.3"

vivarium_public_health/population/add_new_birth_cohorts.py

@@ -204,8 +204,10 @@ class FertilityAgeSpecificRates(Component):
 
     def load_age_specific_fertility_rate_data(self, builder: Builder) -> pd.DataFrame:
         asfr_data = builder.data.load("covariate.age_specific_fertility_rate.estimate")
-        columns = ["year_start", "year_end", "age_start", "age_end", "mean_value"]
-        asfr_data = asfr_data.loc[asfr_data.sex == "Female"][columns]
+        columns = ["year_start", "year_end", "age_start", "age_end", "value"]
+        asfr_data = asfr_data.loc[
+            (asfr_data.sex == "Female") & (asfr_data.parameter == "mean_value")
+        ].reset_index()[columns]
         return asfr_data
 
     ########################

vivarium_public_health/results/disability.py

@@ -158,11 +158,18 @@ class DisabilityObserver(PublicHealthObserver):
         once), and so the results here are actually wide by disability weight
         pipeline name.
         """
-
-        # Drop the unused 'value' column and rename the pipeline names to causes
-        results = results.drop(columns=["value"]).rename(
-            columns={col: col.replace(".disability_weight", "") for col in results.columns},
-        )
+        if len(self.causes_of_disability) > 1:
+            # Drop the unused 'value' column and rename the remaining pipeline names to cause names
+            results = results.rename(
+                columns={
+                    col: col.replace(".disability_weight", "") for col in results.columns
+                }
+            )[[col.state_id for col in self.causes_of_disability]]
+        else:
+            # Rename the 'value' column to the single cause of disability
+            results = results.rename(
+                columns={COLUMNS.VALUE: self.causes_of_disability[0].state_id}
+            )
         # Get desired index names prior to stacking
         idx_names = list(results.index.names) + [COLUMNS.SUB_ENTITY]
         results = pd.DataFrame(results.stack(), columns=[COLUMNS.VALUE])

{vivarium_public_health-3.0.2.dist-info → vivarium_public_health-3.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vivarium_public_health
-Version: 3.0.2
+Version: 3.0.3
 Summary: Components for modelling diseases, risks, and interventions with ``vivarium``
 Home-page: https://github.com/ihmeuw/vivarium_public_health
 Author: The vivarium developers

{vivarium_public_health-3.0.2.dist-info → vivarium_public_health-3.0.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
 vivarium_public_health/__about__.py,sha256=RgWycPypKZS80TpSX7o41cREnG8PfguNHDHLuLyl820,487
 vivarium_public_health/__init__.py,sha256=tomMOl3PI7O8GdxDWGBiBjT0Bwd31GpyQTYTzwIv108,361
-vivarium_public_health/_version.py,sha256=YKXrr5J7dV2n7ZhaRv0tigylRDtfOuvJC9Y4ouFZpzo,22
+vivarium_public_health/_version.py,sha256=3PslnGRHLeT8kAWbhtBM110cQkzH_QzfQO5_B6lHOuU,22
 vivarium_public_health/utilities.py,sha256=5cl9jjVkOQ1UeXT4DjDMAhaBNNjAsDo-SVJwpv6FDw0,3071
 vivarium_public_health/disease/__init__.py,sha256=RuuiRcvAJfX9WQGt_WZZjxN7Cu3E5rMTmuaRS-UaFPM,419
 vivarium_public_health/disease/model.py,sha256=0WIYDEx-hwlUJp6Zl8m8bUMoWxuVkOWsJvh_YlZiOPs,8234
@@ -18,13 +18,13 @@ vivarium_public_health/mslt/population.py,sha256=6XedM2ZZzaU7U70GQLXj2VcyAvLp0Yj
 vivarium_public_health/plugins/__init__.py,sha256=oBW_zfgG_LbwfgTDjUe0btfy9FaDvAbtXho1zQFnz0Y,76
 vivarium_public_health/plugins/parser.py,sha256=dlH-tafOGCFvOUZx_QdOkSScMCwH4CbqR8dwPwX7dVw,32851
 vivarium_public_health/population/__init__.py,sha256=17rtbcNVK5LtCCxAex7P7Q_vYpwbeTepyf3nazS90Yc,225
-vivarium_public_health/population/add_new_birth_cohorts.py,sha256=ZpKURSS6DSsKcHPtkAfC59OYe2hYpduFAOm_goBD9mY,9084
+vivarium_public_health/population/add_new_birth_cohorts.py,sha256=NhrPZBoFrHvYnwmG0Od_VCU_ptNECe7ZfdqUIqvOWrE,9157
 vivarium_public_health/population/base_population.py,sha256=Xn0sjPOT9KJZKILr1NchCwQFarvb3qWtgQ3Uvu999UU,17091
 vivarium_public_health/population/data_transformations.py,sha256=PsvE1-S-Q_K4viBgF2Ss0DaaoH0WyhRX26ZJYwJ0O84,22322
 vivarium_public_health/population/mortality.py,sha256=8T5W4D3oxx-4wjHT-0P1jCLiQI6_zznGLuJ-wobF1BY,10272
 vivarium_public_health/results/__init__.py,sha256=XKuX9HTXUur1kpHM7zuMSnkJxlg-W7eMAPmh8LP9Xp4,281
 vivarium_public_health/results/columns.py,sha256=YUI43jdJ3KwvTrm2Gmxk7By2CJjNFzocLwYHhO2pnn0,447
-vivarium_public_health/results/disability.py,sha256=juaR8eue3pJfD4QNwzIhSqMHqCU6XPZHGX9l-jHHV5Q,7456
+vivarium_public_health/results/disability.py,sha256=ryb5SiTQ3MCTf5WPWk_1TPN6IC9Z_fY3Wd6XBv3Q9AY,7818
 vivarium_public_health/results/disease.py,sha256=7xUcyxx_d2T3DQD-WFRHaRxb0qKIOCCpIGWNpEXzixg,8209
 vivarium_public_health/results/mortality.py,sha256=4KUEPzzo1-kD4TdG0PeRMWW69aJcMQJtho9ED0cpErs,6865
 vivarium_public_health/results/observer.py,sha256=mzQEmWpY910eRUpdIxsS9S9eDwDMKm6SB_60EeH4Zyo,3079
@@ -42,8 +42,8 @@ vivarium_public_health/treatment/__init__.py,sha256=wONElu9aJbBYwpYIovYPYaN_GYfV
 vivarium_public_health/treatment/magic_wand.py,sha256=i9N57-MEuQv5B6dQ5iVMTAdOPghYcgiRRz-dTzigf1s,1980
 vivarium_public_health/treatment/scale_up.py,sha256=kifn7oKTjCJ2l1XiYm4U3FAH98USZ1gLPvf4z5-3wsU,7079
 vivarium_public_health/treatment/therapeutic_inertia.py,sha256=uOvMgIj-Bl5qTk4z7ZnTPUwOVH-xGeKs1pw8WYuE1f4,2340
-vivarium_public_health-3.0.2.dist-info/LICENSE.txt,sha256=mN4bNLUQNcN9njYRc_3jCZkfPySVpmM6MRps104FxA4,1548
-vivarium_public_health-3.0.2.dist-info/METADATA,sha256=eE53VuZ1LF_TVBCLpog2ZulD4IKs0RQXrYMrxgJdJ8s,4061
-vivarium_public_health-3.0.2.dist-info/WHEEL,sha256=nCVcAvsfA9TDtwGwhYaRrlPhTLV9m-Ga6mdyDtuwK18,91
-vivarium_public_health-3.0.2.dist-info/top_level.txt,sha256=VVInlpzCFD0UNNhjOq_j-a29odzjwUwYFTGfvqbi4dY,23
-vivarium_public_health-3.0.2.dist-info/RECORD,,
+vivarium_public_health-3.0.3.dist-info/LICENSE.txt,sha256=mN4bNLUQNcN9njYRc_3jCZkfPySVpmM6MRps104FxA4,1548
+vivarium_public_health-3.0.3.dist-info/METADATA,sha256=gkZN4BNaL61XIp1c3TLatmgAEUWE9myE94R7BpLb1_o,4061
+vivarium_public_health-3.0.3.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+vivarium_public_health-3.0.3.dist-info/top_level.txt,sha256=VVInlpzCFD0UNNhjOq_j-a29odzjwUwYFTGfvqbi4dY,23
+vivarium_public_health-3.0.3.dist-info/RECORD,,

{vivarium_public_health-3.0.2.dist-info → vivarium_public_health-3.0.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (73.0.0)
+Generator: setuptools (73.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any