Refactor JHU smoother to use util:

* remove local smoothing module
* update run.py

Author: dshemetov

_delphi_utils_python/delphi_utils/__init__.py

@@ -11,5 +11,6 @@
 from .geomap import GeoMapper
 from .smooth import Smoother
 from .signal import add_prefix, public_signal
+from .smooth import Smoother
 
 __version__ = "0.1.0"

_delphi_utils_python/tests/test_smooth.py

@@ -2,7 +2,6 @@
 Tests for the smoothing utility.
 Authors: Dmitry Shemetov, Addison Hu, Maria Jahja
 """
-from numpy.lib.polynomial import poly
 import pytest
 
 import numpy as np

jhu/delphi_jhu/run.py

@@ -6,26 +6,22 @@
 """
 from datetime import datetime
 from itertools import product
-from functools import partial
 
 import numpy as np
+import pandas as pd
 from delphi_utils import (
-    read_params,
-    create_export_csv,
-    S3ArchiveDiffer,
+    read_params, 
+    create_export_csv, 
+    S3ArchiveDiffer, 
+    Smoother, 
+    GeoMapper
 )
 
-from delphi_utils import GeoMapper
 from .geo import geo_map
 from .pull import pull_jhu_data
-from .smooth import (
-    identity,
-    kday_moving_average,
-)
 
 
 # global constants
-seven_day_moving_average = partial(kday_moving_average, k=7)
 METRICS = [
     "deaths",
     "confirmed",
@@ -54,8 +50,8 @@
 #     "cumulative_prop":      ("cumul_prop", False),
 # }
 SMOOTHERS_MAP = {
-    "unsmoothed":           (identity, ''),
-    "seven_day_average":    (seven_day_moving_average, '7dav_'),
+    "unsmoothed":           (Smoother("identity").smooth, ''),
+    "seven_day_average":    (Smoother("moving_average", window_length=7).smooth, '7dav_'),
 }
 GEO_RESOLUTIONS = [
     "county",

jhu/delphi_jhu/smooth.py

@@ -4,7 +4,6 @@
 from os.path import join
 
 import pandas as pd
-from delphi_jhu.run import run_module
 
 
 class TestRun:

jhu/tests/test_run.py

@@ -1,16 +1,13 @@
 import pytest
 
-from os import listdir
 from os.path import join
 
 import numpy as np
 import pandas as pd
-from delphi_jhu.run import run_module
 
 class TestSmooth:
     def test_output_files_smoothed(self, run_as_module):
-
-        dates = [str(x) for x in range(20200303, 20200310)]
+        dates = [str(x) for x in range(20200304, 20200311)]
 
         smoothed = pd.read_csv(
             join("./receiving",
@@ -27,8 +24,6 @@ def test_output_files_smoothed(self, run_as_module):
         # Compute the mean across the time values; order doesn't matter 
         # this corresponds to the smoothed value on the last day 
         # 2020-03-10
-        raw = raw.groupby('geo_id')['val'].mean()
-        
-        df = pd.merge(smoothed, raw, on='geo_id', suffixes=('_smoothed', '_raw'))
-        assert np.allclose(df['val_smoothed'].values, df['val_raw'].values)
-
+        raw = raw.groupby("geo_id")["val"].mean()
+        df = pd.merge(smoothed, raw, on="geo_id", suffixes=("_smoothed", "_raw"))
+        assert np.allclose(df["val_smoothed"].values, df["val_raw"].values)