Skip to content

Commit 6db1391

Browse files
committed
feat(epi_slide_opt): adjust [.]new_col_name = error guidance
1 parent b4d71dc commit 6db1391

File tree

4 files changed

+92
-3
lines changed

4 files changed

+92
-3
lines changed

R/slide.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ epi_slide_opt <- function(
646646
if ("new_col_name" %in% provided_args || ".new_col_name" %in% provided_args) {
647647
cli::cli_abort(
648648
"epi_slide_opt: the argument `new_col_name` is not supported for `epi_slide_opt`. If you want to customize
649-
the output column names, use `dplyr::rename` after the slide.",
649+
the output column names, use `.prefix =`, `.suffix =`, or `.new_col_**names** =`.",
650650
class = "epiprocess__epi_slide_opt__new_name_not_supported"
651651
)
652652
}

R/utils.R

+2-2
Original file line numberDiff line numberDiff line change
@@ -1137,7 +1137,7 @@ time_delta_to_n_steps <- function(time_delta, time_type) {
11371137
week = "weeks",
11381138
cli_abort("difftime objects not supported for time_type {format_chr_with_quotes(time_type)}")
11391139
)
1140-
units(time_delta) <- output_units # converts number accordingly, doesn't just set attr
1140+
units(time_delta) <- output_units # converts number to represent same duration; not just attr<-
11411141
n_steps <- vec_data(time_delta)
11421142
if (!is_bare_integerish(n_steps)) {
11431143
cli_abort("`time_delta` did not appear to contain only integerish numbers
@@ -1164,7 +1164,7 @@ time_delta_to_n_steps <- function(time_delta, time_type) {
11641164
time_type_unit_abbrs <- c(
11651165
day = "d",
11661166
week = "w",
1167-
yearmon = "m"
1167+
yearmonth = "m"
11681168
)
11691169

11701170
time_type_unit_abbr <- function(time_type) {

man/time_delta_to_n_steps.Rd

+31
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/testthat/test-epi_slide.R

+58
Original file line numberDiff line numberDiff line change
@@ -755,3 +755,61 @@ test_that("no dplyr warnings from selecting multiple columns", {
755755
)
756756
expect_equal(multi_slid_select, multi_slid)
757757
})
758+
759+
test_that("epi_slide_opt output naming features", {
760+
multi_columns <- dplyr::bind_rows(
761+
dplyr::tibble(geo_value = "ak", time_value = test_date + 1:200, value = 1:200, value2 = -1:-200),
762+
dplyr::tibble(geo_value = "al", time_value = test_date + 1:5, value = -(1:5), value2 = 1:5)
763+
) %>%
764+
as_epi_df() %>%
765+
group_by(geo_value)
766+
multi_columns_weekly <- dplyr::bind_rows(
767+
dplyr::tibble(geo_value = "ak", time_value = test_date + 7*(1:200), value = 1:200, value2 = -1:-200),
768+
dplyr::tibble(geo_value = "al", time_value = test_date + 7*(1:5), value = -(1:5), value2 = 1:5)
769+
) %>%
770+
as_epi_df() %>%
771+
group_by(geo_value)
772+
yearmonthly <-
773+
tibble::tibble(geo_value = 1,
774+
time_value = tsibble::make_yearmonth(2000, 1) + 1:30 - 1,
775+
value = 1:30 %% 2 == 0) %>%
776+
as_epi_df() %>%
777+
group_by(geo_value)
778+
779+
# Auto-naming:
780+
# * Changing .f and .window_size:
781+
expect_equal(
782+
multi_columns %>% epi_slide_opt(value2, frollmean, .window_size = 14) %>% names(),
783+
c(names(multi_columns), "value2_14dav")
784+
)
785+
expect_equal(
786+
multi_columns %>% epi_slide_opt(value2, slide_mean, .window_size = as.difftime(14, units = "days")) %>% names(),
787+
c(names(multi_columns), "value2_14dav")
788+
)
789+
expect_equal(
790+
multi_columns %>% epi_slide_opt(value2, slide_sum, .window_size = Inf) %>% names(),
791+
c(names(multi_columns), "value2_running_sum")
792+
)
793+
# * Changing .f and .align:
794+
expect_equal(
795+
multi_columns %>% epi_slide_opt(value2, slide_min, .window_size = 14, .align = "center") %>% names(),
796+
c(names(multi_columns), "value2_14dcmin")
797+
)
798+
expect_equal(
799+
multi_columns %>% epi_slide_opt(value2, slide_max, .window_size = 14, .align = "left") %>% names(),
800+
c(names(multi_columns), "value2_14dlmax")
801+
)
802+
# * Changing .f, time_type, .window_size:
803+
expect_equal(
804+
multi_columns_weekly %>% epi_slide_opt(value2, slide_prod, .window_size = 2) %>% names(),
805+
c(names(multi_columns_weekly), "value2_2wprod")
806+
)
807+
expect_equal(
808+
multi_columns_weekly %>% epi_slide_opt(value2, slide_prod, .window_size = as.difftime(2, units = "weeks")) %>% names(),
809+
c(names(multi_columns_weekly), "value2_2wprod")
810+
)
811+
expect_equal(
812+
yearmonthly %>% epi_slide_opt(value, slide_any, .window_size = 3) %>% names(),
813+
c(names(yearmonthly), "value_3many") # not the best name, but super unlikely anyway
814+
)
815+
})

0 commit comments

Comments
 (0)