Refactor claims_hosp to use smoothing util

claims_hosp/delphi_claims_hosp/__init__.py

@@ -12,7 +12,6 @@
 from . import indicator
 from . import load_data
 from . import run
-from . import smooth
 from . import update_indicator
 from . import weekday
 

claims_hosp/delphi_claims_hosp/indicator.py

@@ -12,15 +12,19 @@
 # third party
 import numpy as np
 import pandas as pd
+from delphi_utils import Smoother
 
 # first party
 from .config import Config
-from .smooth import left_gauss_linear
 
 
 class ClaimsHospIndicator:
     """Class to fit a hospitalizations indicator using CLI counts from claims-based data."""
 
+    smoother = Smoother("savgol",
+                        poly_fit_degree=1,
+                        gaussian_bandwidth=Config.SMOOTHER_BANDWIDTH)
+
     @staticmethod
     def gauss_smooth(num, den):
         """Smooth using the left_gauss_linear.
@@ -33,8 +37,8 @@ def gauss_smooth(num, den):
             tuple: (array of smoothed num, array of smoothed den)
 
         """
-        num_smooth = left_gauss_linear(num)
-        den_smooth = left_gauss_linear(den)
+        num_smooth = ClaimsHospIndicator.smoother.smooth(num)
+        den_smooth = ClaimsHospIndicator.smoother.smooth(den)
         den_smooth = np.clip(den_smooth, 0, None)
         num_smooth = np.clip(num_smooth, 0, den_smooth)
         return num_smooth, den_smooth

claims_hosp/tests/test_indicator.py

@@ -1,5 +1,5 @@
 # third party
-from delphi_utils import read_params
+from delphi_utils import read_params, Smoother
 import numpy as np
 import numpy.random as nr
 import pandas as pd