@@ -385,8 +385,7 @@ canada_archive_faux <- epix_as_of(canada_archive, canada_archive$versions_end) %
385
385
smooth_cases <- function(epi_df) {
386
386
epi_df %>%
387
387
group_by(geo_value) %>%
388
- epi_slide_mean("case_rate", .window_size = 7, na.rm = TRUE) %>%
389
- rename(cr_7dav = slide_value_case_rate)
388
+ epi_slide_mean("case_rate", .window_size = 7, na.rm = TRUE, .suffix = "_{.n}dav")
390
389
}
391
390
forecast_dates <- seq.Date(
392
391
from = min(canada_archive$DT$version),
@@ -401,8 +400,8 @@ canada_forecasts <- bind_rows(
401
400
~ forecast_k_week_ahead(
402
401
canada_archive_faux,
403
402
ahead = .x,
404
- outcome = "cr_7dav ",
405
- predictors = "cr_7dav ",
403
+ outcome = "case_rate_7dav ",
404
+ predictors = "case_rate_7dav ",
406
405
forecast_dates = forecast_dates,
407
406
process_data = smooth_cases
408
407
) %>% mutate(version_aware = FALSE)
@@ -412,8 +411,8 @@ canada_forecasts <- bind_rows(
412
411
~ forecast_k_week_ahead(
413
412
canada_archive,
414
413
ahead = .x,
415
- outcome = "cr_7dav ",
416
- predictors = "cr_7dav ",
414
+ outcome = "case_rate_7dav ",
415
+ predictors = "case_rate_7dav ",
417
416
forecast_dates = forecast_dates,
418
417
process_data = smooth_cases
419
418
) %>% mutate(version_aware = TRUE)
@@ -435,15 +434,15 @@ case_rate_data <- bind_rows(
435
434
~ canada_archive %>%
436
435
epix_as_of(.x) %>%
437
436
smooth_cases() %>%
438
- mutate(case_rate = cr_7dav , version = .x)
437
+ mutate(case_rate = case_rate_7dav , version = .x)
439
438
) %>%
440
439
bind_rows() %>%
441
440
mutate(version_aware = TRUE),
442
441
# Latest data for the version-unaware forecasts
443
442
canada_archive %>%
444
443
epix_as_of(doctor_visits$versions_end) %>%
445
444
smooth_cases() %>%
446
- mutate(case_rate = cr_7dav , version_aware = FALSE)
445
+ mutate(case_rate = case_rate_7dav , version_aware = FALSE)
447
446
) %>%
448
447
filter(geo_value == geo_choose)
449
448
0 commit comments