Split out individual dataframes to make chart generation simpler for now

Author: PhilMiller

src/penn_chime/models.py

@@ -123,9 +123,27 @@ def __init__(self, p: Parameters):
         self.raw["date"] = self.raw["day"].astype("timedelta64[D]") + np.datetime64(p.current_date)
 
         self.raw_df = pd.DataFrame(data=self.raw)
-        self.dispositions_df = self.raw_df
-        self.admits_df = self.raw_df
-        self.census_df = self.raw_df
+        self.dispositions_df = pd.DataFrame(data={
+            'day': self.raw['day'],
+            'date': self.raw['date'],
+            'ever_hospitalized': self.raw['ever_hospitalized'],
+            'ever_icu': self.raw['ever_icu'],
+            'ever_ventilated': self.raw['ever_ventilated'],
+        })
+        self.admits_df = pd.DataFrame(data={
+            'day': self.raw['day'],
+            'date': self.raw['date'],
+            'admits_hospitalized': self.raw['admits_hospitalized'],
+            'admits_icu': self.raw['admits_icu'],
+            'admits_ventilated': self.raw['admits_ventilated'],
+        })
+        self.census_df = pd.DataFrame(data={
+            'day': self.raw['day'],
+            'date': self.raw['date'],
+            'census_hospitalized': self.raw['census_hospitalized'],
+            'census_icu': self.raw['census_icu'],
+            'census_ventilated': self.raw['census_ventilated'],
+        })
 
         logger.info('len(np.arange(-i_day, n_days+1)): %s', len(np.arange(-self.i_day, p.n_days+1)))
         logger.info('len(raw_df): %s', len(self.raw_df))

tests/penn_chime/test_models.py

@@ -187,9 +187,9 @@ def test_model_cumulative_census(param, model):
     admits_df = model.admits_df
     df = pd.DataFrame(
         {
-            "hospitalized": admits_df.hospitalized,
-            "icu": admits_df.icu,
-            "ventilated": admits_df.ventilated,
+            "hospitalized": admits_df.admits_hospitalized,
+            "icu": admits_df.admits_icu,
+            "ventilated": admits_df.admits_ventilated,
         }
     )
     admits = df.cumsum()