P281424/AMR
1
0
Fork 0
mirror of https://github.com/msberends/AMR.git synced 2025-07-09 11:01:57 +02:00
Code Releases Activity

(v1.5.0.9018) fix unit tests

Browse Source
This commit is contained in:
dr. M.S. (Matthijs) Berends
2021-02-09 12:28:15 +01:00
parent cb404492b2
commit 2dd0656355
24 changed files with 414 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
R/mdro.R
View File

@ -155,7 +155,12 @@ mdro <- function(x = NULL,
verbose = FALSE,
only_rsi_columns = FALSE,
...) {
meet_criteria(x, allow_class = "data.frame", allow_NULL = TRUE)
if (is_null_or_grouped_tbl(x)) {
# when `x` is left blank, auto determine it (get_current_data() also contains dplyr::cur_data_all())
# is also fix for using a grouped df as input (a dot as first argument)
x <- tryCatch(get_current_data(arg_name = "x", call = -2), error = function(e) x)
}
meet_criteria(x, allow_class = "data.frame") # also checks dimensions to be >0
meet_criteria(guideline, allow_class = c("list", "character"), allow_NULL = TRUE)
if (!is.list(guideline)) {
meet_criteria(guideline, allow_class = "character", has_length = 1, allow_NULL = TRUE)
@ -214,14 +219,7 @@ mdro <- function(x = NULL,
}
}
}
if (is_null_or_grouped_tbl(x)) {
# when `x` is left blank, auto determine it (get_current_data() also contains dplyr::cur_data_all())
# is also fix for using a grouped df as input (a dot as first argument)
x <- tryCatch(get_current_data(arg_name = "x", call = -2), error = function(e) x)
meet_criteria(x, allow_class = "data.frame")
}
# force regular data.frame, not a tibble or data.table
x <- as.data.frame(x, stringsAsFactors = FALSE)