From 6b865cd8b0dddd96fb2a6f384413183da7e2d0ee Mon Sep 17 00:00:00 2001 From: george haff Date: Wed, 10 Jul 2024 14:05:00 -0400 Subject: [PATCH 1/3] preserve old weekday solver behavior for changehc --- changehc/delphi_changehc/update_sensor.py | 2 +- changehc/setup.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/changehc/delphi_changehc/update_sensor.py b/changehc/delphi_changehc/update_sensor.py index a91dec5ac..935f6f022 100644 --- a/changehc/delphi_changehc/update_sensor.py +++ b/changehc/delphi_changehc/update_sensor.py @@ -200,7 +200,7 @@ def update_sensor(self, data.reset_index(inplace=True) data_frame = self.geo_reindex(data) # handle if we need to adjust by weekday - wd_params = Weekday.get_params( + wd_params = Weekday.get_params_legacy( data_frame, "den", ["num"], diff --git a/changehc/setup.py b/changehc/setup.py index 1faebb6a5..d95beb771 100644 --- a/changehc/setup.py +++ b/changehc/setup.py @@ -15,6 +15,7 @@ "pylint==2.8.3", "pytest-cov", "pytest", + "cvxpy<1.6", ] setup( From 77000c797050a6dff6330d73c3a2fb1c177565a8 Mon Sep 17 00:00:00 2001 From: george haff Date: Wed, 10 Jul 2024 14:16:20 -0400 Subject: [PATCH 2/3] appease linter? --- changehc/delphi_changehc/update_sensor.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/changehc/delphi_changehc/update_sensor.py b/changehc/delphi_changehc/update_sensor.py index 935f6f022..f79d43003 100644 --- a/changehc/delphi_changehc/update_sensor.py +++ b/changehc/delphi_changehc/update_sensor.py @@ -200,14 +200,17 @@ def update_sensor(self, data.reset_index(inplace=True) data_frame = self.geo_reindex(data) # handle if we need to adjust by weekday - wd_params = Weekday.get_params_legacy( - data_frame, - "den", - ["num"], - Config.DATE_COL, - [1, 1e5], - self.logger, - ) if self.weekday else None + if self.weekday: + wd_params = Weekday.get_params_legacy( + data_frame, + "den", + ["num"], + Config.DATE_COL, + [1, 1e5], + self.logger, + ) + else: + wd_params = None # run sensor fitting code (maybe in parallel) if not self.parallel: dfs = [] From 6288d4b4676ecc808b982c50e6fa80dca91aedb1 Mon Sep 17 00:00:00 2001 From: george haff Date: Wed, 10 Jul 2024 14:19:00 -0400 Subject: [PATCH 3/3] appease linter again? --- changehc/delphi_changehc/update_sensor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changehc/delphi_changehc/update_sensor.py b/changehc/delphi_changehc/update_sensor.py index f79d43003..edae85517 100644 --- a/changehc/delphi_changehc/update_sensor.py +++ b/changehc/delphi_changehc/update_sensor.py @@ -208,7 +208,7 @@ def update_sensor(self, Config.DATE_COL, [1, 1e5], self.logger, - ) + ) else: wd_params = None # run sensor fitting code (maybe in parallel)