Skip to content

Commit acc40bd

Browse files
committed
new version passes the tests
1 parent 7d22ef8 commit acc40bd

File tree

2 files changed

+20
-15
lines changed

2 files changed

+20
-15
lines changed

R/step_epi_slide.R

+3-4
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,7 @@ bake.step_epi_slide <- function(object, new_data, ...) {
172172
}
173173
if (any(vapply(c(mean, sum), \(x) identical(x, object$.f), logical(1L)))) {
174174
cli_warn(
175-
c("There is an optimized version of both mean and sum. See `step_epi_slide_mean`, `step_epi_slide_sum`, or `step_epi_slide_opt`."
176-
),
175+
c("There is an optimized version of both mean and sum. See `step_epi_slide_mean`, `step_epi_slide_sum`, or `step_epi_slide_opt`."),
177176
class = "epipredict__step_epi_slide__optimized_version"
178177
)
179178
}
@@ -209,9 +208,9 @@ epi_slide_wrapper <- function(new_data, before, after, columns, fns, fn_names, g
209208
col_name <- cols_fns[[comp_i, "col_name"]]
210209
fn_name <- cols_fns[[comp_i, "fn_name"]]
211210
fn <- cols_fns[[comp_i, "fn"]][[1L]]
212-
result_name <- paste(name_prefix, fn_name, col_name, sep="_")
211+
result_name <- paste(name_prefix, fn_name, col_name, sep = "_")
213212
result <- new_data %>%
214-
group_by(across(group_keys)) %>%
213+
group_by(across(all_of(group_keys))) %>%
215214
epi_slide(
216215
before = before,
217216
after = after,

tests/testthat/test-step_epi_slide.R

+17-11
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ test_that("epi_slide handles classed before/after", {
6161
prep(edf) %>%
6262
bake(new_data = NULL),
6363
regexp = "There is an optimized version"
64-
)
64+
)
6565
expect_equal(baseline[[4]], rolled_before)
6666

6767
expect_warning(
@@ -70,7 +70,7 @@ test_that("epi_slide handles classed before/after", {
7070
prep(edf) %>%
7171
bake(new_data = NULL),
7272
regexp = "There is an optimized version"
73-
)
73+
)
7474
expect_warning(
7575
cbefore <- r %>%
7676
step_epi_slide(value, .f = mean, before = "3 days") %>%
@@ -109,14 +109,20 @@ test_that("epi_slide handles classed before/after", {
109109

110110

111111
test_that("epi_slide handles different function specs", {
112-
cfun <- r %>%
113-
step_epi_slide(value, .f = "mean", before = 3L) %>%
114-
prep(edf) %>%
115-
bake(new_data = NULL)
116-
ffun <- r %>%
117-
step_epi_slide(value, .f = mean, before = 3L) %>%
118-
prep(edf) %>%
119-
bake(new_data = NULL)
112+
expect_warning(
113+
cfun <- r %>%
114+
step_epi_slide(value, .f = "mean", before = 3L) %>%
115+
prep(edf) %>%
116+
bake(new_data = NULL),
117+
regexp = "There is an optimized version"
118+
)
119+
expect_warning(
120+
ffun <- r %>%
121+
step_epi_slide(value, .f = mean, before = 3L) %>%
122+
prep(edf) %>%
123+
bake(new_data = NULL),
124+
regexp = "There is an optimized version"
125+
)
120126
# formula NOT currently supported
121127
expect_error(
122128
lfun <- r %>%
@@ -135,7 +141,7 @@ test_that("epi_slide handles different function specs", {
135141

136142
expect_equal(cfun[[4]], rolled_before)
137143
expect_equal(ffun[[4]], rolled_before)
138-
#expect_equal(lfun[[4]], rolled_before)
144+
# expect_equal(lfun[[4]], rolled_before)
139145
expect_equal(blfun[[4]], rolled_before)
140146
expect_equal(nblfun[[4]], rolled_before)
141147
})

0 commit comments

Comments
 (0)