Refactor run.py to use smoothing util

Author: dshemetov

jhu/delphi_jhu/run.py

@@ -6,23 +6,17 @@
 """
 from datetime import datetime
 from itertools import product
-from functools import partial
 from os.path import join
 
 import numpy as np
 import pandas as pd
-from delphi_utils import read_params, create_export_csv
+from delphi_utils import read_params, create_export_csv, Smoother
 
 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 = [
     "confirmed",
     "deaths",
@@ -44,8 +38,8 @@
     "cumulative_prop":      ("cumulative_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",