vivarium-public-health 4.3.10__py3-none-any.whl → 4.3.11__py3-none-any.whl

vivarium_public_health/_version.py

@@ -1 +1 @@
-__version__ = "4.3.10"
+__version__ = "4.3.11"

vivarium_public_health/risks/implementations/low_birth_weight_and_short_gestation.py

@@ -9,6 +9,7 @@ implementation that has been used in several public health models.
 """
 
 import pickle
+import re
 from collections.abc import Callable
 from typing import Any
 
@@ -119,13 +120,12 @@ class LBWSGDistribution(PolytomousDistribution):
             The intervals for each category.
         """
         categories: dict[str, str] = builder.data.load(f"{self.risk}.categories")
-        category_intervals = {
-            axis: {
-                category: self._parse_description(axis, description)
-                for category, description in categories.items()
-            }
-            for axis in [BIRTH_WEIGHT, GESTATIONAL_AGE]
-        }
+        category_intervals = {GESTATIONAL_AGE: {}, BIRTH_WEIGHT: {}}
+
+        for category, description in categories.items():
+            gestation_interval, birth_weight_interval = self._parse_description(description)
+            category_intervals[GESTATIONAL_AGE][category] = gestation_interval
+            category_intervals[BIRTH_WEIGHT][category] = birth_weight_interval
         return category_intervals
 
     ##################
@@ -224,7 +224,7 @@ class LBWSGDistribution(PolytomousDistribution):
     ##################
 
     @staticmethod
-    def _parse_description(axis: str, description: str) -> pd.Interval:
+    def _parse_description(description: str) -> tuple[pd.Interval, pd.Interval]:
         """Parses a string corresponding to a low birth weight and short gestation
         category to an Interval.
 
@@ -235,17 +235,15 @@ class LBWSGDistribution(PolytomousDistribution):
         An example of an edge case of birth weight:
         'Neonatal preterm and LBWSG (estimation years) - [36, 37) wks, [4000, 9999] g'
         """
-        endpoints = {
-            BIRTH_WEIGHT: [
-                float(val)
-                for val in description.split(", [")[1].split(")")[0].split("]")[0].split(", ")
-            ],
-            GESTATIONAL_AGE: [
-                float(val)
-                for val in description.split("- [")[1].split(")")[0].split("+")[0].split(", ")
-            ],
-        }[axis]
-        return pd.Interval(*endpoints, closed="left")  # noqa
+        lbwsg_values = [float(val) for val in re.findall(r"(\d+)", description)]
+        if len(list(lbwsg_values)) != 4:
+            raise ValueError(
+                f"Could not parse LBWSG description '{description}'. Expected 4 numeric values."
+            )
+        return (
+            pd.Interval(*lbwsg_values[:2], closed="left"),  # Gestational Age
+            pd.Interval(*lbwsg_values[2:], closed="left"),  # Birth Weight
+        )
 
 
 class LBWSGRisk(Risk):

{vivarium_public_health-4.3.10.dist-info → vivarium_public_health-4.3.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vivarium_public_health
-Version: 4.3.10
+Version: 4.3.11
 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-4.3.10.dist-info → vivarium_public_health-4.3.11.dist-info}/RECORD

@@ -1,6 +1,6 @@
 vivarium_public_health/__about__.py,sha256=RgWycPypKZS80TpSX7o41cREnG8PfguNHDHLuLyl820,487
 vivarium_public_health/__init__.py,sha256=GDeeP-7OlCBwPuv_xQoB1wNmvCaFsqfTB7qnnYApm0w,1343
-vivarium_public_health/_version.py,sha256=aiMsUBqN_yAk_Md8MFAhfNSW7FpgntZQdvctxHDiyMs,23
+vivarium_public_health/_version.py,sha256=FTMATci8OA-tNFnEujq_JNE-wHVYlo4B0glOFoqHJfs,23
 vivarium_public_health/utilities.py,sha256=QNXQ6fhAr1HcV-GwKw7wQLz6QyuNxqNvMA-XujKjTgs,3035
 vivarium_public_health/disease/__init__.py,sha256=VUJHDLlE6ngo2qHNQUtZ8OWH5H_T7_ao-xsYKDkRmHw,443
 vivarium_public_health/disease/exceptions.py,sha256=vb30IIV82OiDf2cNZCs_E2rF6mdDDHbnZSND60no5CU,97
@@ -38,13 +38,13 @@ vivarium_public_health/risks/data_transformations.py,sha256=SgdPKc95BBqgMNUdlAQM
 vivarium_public_health/risks/distributions.py,sha256=5gkurGTPqZczIKum5NgJ-DbJ2bxA1tRbLe7jKgCqkQg,18203
 vivarium_public_health/risks/effect.py,sha256=Cw-V1rMPaAPZsirbUElPzksvNuXLQc8TIIk0hgaFzvA,21259
 vivarium_public_health/risks/implementations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vivarium_public_health/risks/implementations/low_birth_weight_and_short_gestation.py,sha256=wKVGHhdIas9WOrgA5wpwkSSDrZwBtaCqkZXfQH6jrkY,21159
+vivarium_public_health/risks/implementations/low_birth_weight_and_short_gestation.py,sha256=0Fhx6vjDPxZeuO_gKVDuJI6Myjsf5e9M2Q9_shsYbzw,21302
 vivarium_public_health/treatment/__init__.py,sha256=wONElu9aJbBYwpYIovYPYaN_GYfVhPXtTeFWSdQMgA0,222
 vivarium_public_health/treatment/magic_wand.py,sha256=zg4I48G-l9fC6-qjvApbM1zNACJimZlX9ZZ9fdHKwvc,1985
 vivarium_public_health/treatment/scale_up.py,sha256=_bsf9c_yVc7-q_-yBcXimISTUfYzPps1auH0uEf7sfQ,7048
 vivarium_public_health/treatment/therapeutic_inertia.py,sha256=ZIHnpuszZwA_BkS53JbSLvpcnX_bqG2knwCUyUgkA9M,2362
-vivarium_public_health-4.3.10.dist-info/licenses/LICENSE.txt,sha256=mN4bNLUQNcN9njYRc_3jCZkfPySVpmM6MRps104FxA4,1548
-vivarium_public_health-4.3.10.dist-info/METADATA,sha256=YBpE-toiC10FL68QOeShZOICmQJ5QWPlAttRkqSjNuk,3885
-vivarium_public_health-4.3.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-vivarium_public_health-4.3.10.dist-info/top_level.txt,sha256=VVInlpzCFD0UNNhjOq_j-a29odzjwUwYFTGfvqbi4dY,23
-vivarium_public_health-4.3.10.dist-info/RECORD,,
+vivarium_public_health-4.3.11.dist-info/licenses/LICENSE.txt,sha256=mN4bNLUQNcN9njYRc_3jCZkfPySVpmM6MRps104FxA4,1548
+vivarium_public_health-4.3.11.dist-info/METADATA,sha256=-QvvuE7m66YSkjnBa1GdUrK3bq9U3KlDlGvHxYQ0AvU,3885
+vivarium_public_health-4.3.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+vivarium_public_health-4.3.11.dist-info/top_level.txt,sha256=VVInlpzCFD0UNNhjOq_j-a29odzjwUwYFTGfvqbi4dY,23
+vivarium_public_health-4.3.11.dist-info/RECORD,,