Skip to content

Commit edca39e

Browse files
committed
+purrr, styling
1 parent 83fc279 commit edca39e

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

DESCRIPTION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ Imports:
3939
quantreg,
4040
recipes (>= 1.0.4),
4141
rlang,
42+
purrr,
4243
smoothqr,
4344
stats,
4445
tibble,

tests/testthat/test-utils_latency.R

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ modified_data <-
3434
modified_data %>% tail()
3535
as_of - (modified_data %>% filter(!is.na(ahead_4_case_rate)) %>% pull(time_value) %>% max())
3636
all_shift_cols <- tibble::tribble(
37-
~terms , ~shift, ~prefix, ~original_name, ~latency, ~effective_shift, ~new_name, ~type, ~role,
38-
"case_rate" , 3, "lag_", "lag_3_case_rate", 5, 8, "lag_8_case_rate", "numeric", "predictor",
39-
"death_rate" , 7, "lag_", "lag_7_death_rate", 4, 11, "lag_11_death_rate", "numeric", "predictor",
40-
"case_rate" , 4, "ahead_", "ahead_4_case_rate", -5, 9, "ahead_9_case_rate", "numeric", "outcome"
37+
~terms, ~shift, ~prefix, ~original_name, ~latency, ~effective_shift, ~new_name, ~type, ~role,
38+
"case_rate", 3, "lag_", "lag_3_case_rate", 5, 8, "lag_8_case_rate", "numeric", "predictor",
39+
"death_rate", 7, "lag_", "lag_7_death_rate", 4, 11, "lag_11_death_rate", "numeric", "predictor",
40+
"case_rate", 4, "ahead_", "ahead_4_case_rate", -5, 9, "ahead_9_case_rate", "numeric", "outcome"
4141
)
4242
test_recipe <- epi_recipe(modified_data) %>%
4343
step_epi_lag(case_rate, lag = c(3)) %>%
@@ -82,12 +82,12 @@ test_that("get_latent_column_tibble infers latency and works correctly", {
8282
info <- tibble(variable = c("lag_3_case_rate", "lag_7_death_rate", "ahead_4_case_rate"), type = "numeric", role = c(rep("predictor", 2), "outcome"), source = "derived")
8383

8484
case_lag <- get_latent_column_tibble(
85-
shift_cols[1,], modified_data, as_of, NULL, 1, info
85+
shift_cols[1, ], modified_data, as_of, NULL, 1, info
8686
)
8787
expect_equal(case_lag, all_shift_cols[1, ])
8888

8989
death_lag <- get_latent_column_tibble(
90-
shift_cols[2,], modified_data, as_of, NULL, 1, info
90+
shift_cols[2, ], modified_data, as_of, NULL, 1, info
9191
)
9292
expect_equal(death_lag, all_shift_cols[2, ])
9393

@@ -104,17 +104,17 @@ test_that("get_latent_column_tibble assigns given latencies", {
104104
shift_cols, modified_data, as_of, 50, 1, info
105105
)
106106
weird_latencies <- tibble::tribble(
107-
~terms, ~shift, ~prefix, ~original_name, ~latency, ~effective_shift, ~new_name, ~type, ~role,
108-
"case_rate", 3, "lag_", "lag_3_case_rate", 50, 53, "lag_53_case_rate", "numeric", "predictor",
109-
"death_rate", 7, "lag_", "lag_7_death_rate", 50, 57, "lag_57_death_rate", "numeric", "predictor",
107+
~terms, ~shift, ~prefix, ~original_name, ~latency, ~effective_shift, ~new_name, ~type, ~role,
108+
"case_rate", 3, "lag_", "lag_3_case_rate", 50, 53, "lag_53_case_rate", "numeric", "predictor",
109+
"death_rate", 7, "lag_", "lag_7_death_rate", 50, 57, "lag_57_death_rate", "numeric", "predictor",
110110
)
111111
expect_equal(both_lag, weird_latencies)
112112

113113
# supposing we add the latencies by hand, and they're different, and in a different order
114114
weird_latencies <- tibble::tribble(
115-
~terms, ~shift, ~prefix, ~original_name, ~latency, ~effective_shift, ~new_name, ~type, ~role,
116-
"case_rate", 3, "lag_", "lag_3_case_rate", 70, 73, "lag_73_case_rate", "numeric", "predictor",
117-
"death_rate", 7, "lag_", "lag_7_death_rate", 30, 37, "lag_37_death_rate", "numeric", "predictor",
115+
~terms, ~shift, ~prefix, ~original_name, ~latency, ~effective_shift, ~new_name, ~type, ~role,
116+
"case_rate", 3, "lag_", "lag_3_case_rate", 70, 73, "lag_73_case_rate", "numeric", "predictor",
117+
"death_rate", 7, "lag_", "lag_7_death_rate", 30, 37, "lag_37_death_rate", "numeric", "predictor",
118118
)
119119
both_lag <- get_latent_column_tibble(
120120
shift_cols, modified_data, as_of, c(death_rate = 30, case_rate = 70), 1, info

0 commit comments

Comments
 (0)