minor changes

Author: zhuoran-Cheng16

hhs_hosp/delphi_hhs/run.py

@@ -102,7 +102,7 @@ def run_module(params):
                                     "state_id",
                                     "state_code",
                                     from_col="state")
-        if sensor.endswith("_PROP"):
+        if sensor.endswith("_prop"):
             df=pop_proportion(df,geo_mapper)
         df = make_geo(df, geo, geo_mapper)
         df = smooth_values(df, smoother[0])
@@ -142,7 +142,7 @@ def smooth_values(df, smoother):
 def pop_proportion(df,geo_mapper):
     """Get the population-proportionate variants as the dataframe val."""
     pop_val=geo_mapper.add_population_column(df, "state_code")
-    df["val"]=round(df["val"]/pop_val["population"]*100000,2)
+    df["val"]=round(df["val"]/pop_val["population"]*100000,7)
     pop_val.drop("population", axis=1, inplace=True)
     return df
 

hhs_hosp/tests/test_run.py

@@ -66,12 +66,6 @@ def test_make_signal():
         'val': [5.],
     })
     pd.testing.assert_frame_equal(expected_confirmed, make_signal(data, CONFIRMED))
-
-    expected_confirmed = pd.DataFrame({
-        'state': ['na'],
-        'timestamp': [datetime(year=2020, month=1, day=1)],
-        'val': [5.],
-    })
     pd.testing.assert_frame_equal(expected_confirmed, make_signal(data, CONFIRMED_PROP))
 
     expected_sum = pd.DataFrame({
@@ -80,12 +74,6 @@ def test_make_signal():
         'val': [15.],
     })
     pd.testing.assert_frame_equal(expected_sum, make_signal(data, SUM_CONF_SUSP))
-
-    expected_sum = pd.DataFrame({
-        'state': ['na'],
-        'timestamp': [datetime(year=2020, month=1, day=1)],
-        'val': [15.],
-    })
     pd.testing.assert_frame_equal(expected_sum, make_signal(data, SUM_CONF_SUSP_PROP))
 
     with pytest.raises(Exception):
@@ -104,7 +92,7 @@ def test_pop_proportion():
             'state': ['PA'],
             'state_code':[42],
             'timestamp': [datetime(year=2020, month=1, day=1)],
-            'val': [0.12],})
+            'val': [0.1171693],})
     )
 
     test_df= pd.DataFrame({  
@@ -119,7 +107,7 @@ def test_pop_proportion():
             'state': ['WV'],
             'state_code':[54],
             'timestamp': [datetime(year=2020, month=1, day=1)],
-            'val': [8.37],})
+            'val': [8.3698491],})
     )
 
 def test_make_geo():