1
0
mirror of https://github.com/msberends/AMR.git synced 2024-12-27 10:46:12 +01:00

date transformation fix for tibbles

This commit is contained in:
dr. M.S. (Matthijs) Berends 2018-12-14 09:31:53 +01:00
parent 7e5fe75a17
commit e4737d3add
2 changed files with 16 additions and 2 deletions

View File

@ -172,8 +172,8 @@ first_isolate <- function(tbl,
if (is.null(col_date)) { if (is.null(col_date)) {
stop("`col_date` must be set.", call. = FALSE) stop("`col_date` must be set.", call. = FALSE)
} }
# convert to Date # convert to Date (pipes for supporting tibbles too)
tbl[, col_date] <- as.Date(tbl[, col_date]) tbl[, col_date] <- tbl %>% pull(col_date) %>% as.Date()
# -- patient id # -- patient id
if (is.null(col_patient_id) & any(colnames(tbl) %like% "^(patient|patid)")) { if (is.null(col_patient_id) & any(colnames(tbl) %like% "^(patient|patid)")) {

View File

@ -26,6 +26,20 @@ test_that("first isolates work", {
info = TRUE), info = TRUE),
na.rm = TRUE)), na.rm = TRUE)),
1411) 1411)
# should be same for tibbles
expect_equal(
suppressWarnings(
sum(
first_isolate(tbl = septic_patients %>% dplyr::as_tibble() %>% mutate(keyab = key_antibiotics(.)),
# let syntax determine these automatically:
# col_date = "date",
# col_patient_id = "patient_id",
# col_mo = "mo",
# col_keyantibiotics = "keyab",
type = "keyantibiotics",
info = TRUE),
na.rm = TRUE)),
1411)
# and 1435 when not ignoring I # and 1435 when not ignoring I
expect_equal( expect_equal(
suppressWarnings( suppressWarnings(