diff --git a/pyrenew/convolve.py b/pyrenew/convolve.py index fbe2d729..854adc90 100755 --- a/pyrenew/convolve.py +++ b/pyrenew/convolve.py @@ -249,16 +249,17 @@ def daily_to_weekly( with the first full week available. """ if input_data_first_dow < 0 or input_data_first_dow > 6: - raise ValueError("First day of the week for input timeseries must be between 0 and 6.") + raise ValueError( + "First day of the week for input timeseries must be between 0 and 6." + ) if week_start_dow < 0 or week_start_dow > 6: raise ValueError( "Week start date for output aggregated values must be between 0 and 6." ) - if input_data_first_dow != week_start_dow: - offset = (week_start_dow - input_data_first_dow) % 7 - daily_values = daily_values[offset:] + offset = (week_start_dow - input_data_first_dow) % 7 + daily_values = daily_values[offset:] if len(daily_values) < 7: raise ValueError("No complete weekly values available") diff --git a/test/test_daily_to_weekly.py b/test/test_daily_to_weekly.py index 98df963f..a4fb403a 100644 --- a/test/test_daily_to_weekly.py +++ b/test/test_daily_to_weekly.py @@ -79,13 +79,14 @@ def test_daily_to_weekly_invalid_offset(): """ daily_values = jnp.arange(1, 15) with pytest.raises( - ValueError, match="First day of the week must be between 0 and 6." + ValueError, + match="First day of the week for input timeseries must be between 0 and 6.", ): daily_to_weekly(daily_values, input_data_first_dow=-1) with pytest.raises( ValueError, - match="First day of aggregated data must be between 0 and 6.", + match="Week start date for output aggregated values must be between 0 and 6.", ): daily_to_weekly(daily_values, week_start_dow=7)