diff --git a/DESCRIPTION b/DESCRIPTION index 31ddf54..c440ab9 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -30,6 +30,7 @@ Imports: lifecycle (>= 0.1.0), lubridate (>= 1.7.4), magrittr (>= 1.5), + purrr (>= 0.3.3), rlang (>= 0.4.4), tidyselect (>= 1.0.0) Suggests: diff --git a/NAMESPACE b/NAMESPACE index c0e05bf..ced3370 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -70,6 +70,7 @@ importFrom(lubridate,years) importFrom(lubridate,ymd) importFrom(lubridate,ymd_hms) importFrom(magrittr,"%>%") +importFrom(purrr,discard_at) importFrom(rlang,"%||%") importFrom(rlang,":=") importFrom(rlang,.data) @@ -125,6 +126,7 @@ importFrom(stringr,str_c) importFrom(stringr,str_detect) importFrom(stringr,str_extract) importFrom(stringr,str_glue) +importFrom(stringr,str_glue_data) importFrom(stringr,str_remove) importFrom(stringr,str_remove_all) importFrom(stringr,str_replace) diff --git a/R/admiralmetabolic-package.R b/R/admiralmetabolic-package.R index 5435e1b..5b35a9e 100644 --- a/R/admiralmetabolic-package.R +++ b/R/admiralmetabolic-package.R @@ -11,6 +11,7 @@ #' starts_with transmute ungroup vars n_distinct union distinct #' summarise_at summarise coalesce bind_cols na_if tibble tribble #' @importFrom magrittr %>% +#' @importFrom purrr discard_at #' @importFrom rlang := %||% abort arg_match as_function as_string call2 caller_env #' call_name current_env .data enexpr enexprs enquo eval_bare eval_tidy expr #' exprs expr_interp expr_label f_lhs f_rhs inform @@ -21,7 +22,7 @@ #' set_names sym syms type_of warn quo_set_env quo_get_env #' @importFrom utils capture.output str #' @importFrom stringr str_c str_detect str_extract str_remove str_remove_all -#' str_replace str_trim str_to_lower str_to_title str_to_upper str_glue +#' str_replace str_trim str_to_lower str_to_title str_to_upper str_glue str_glue_data #' @importFrom lubridate as_datetime ceiling_date date days duration floor_date is.Date is.instant #' time_length %--% ymd ymd_hms weeks years hours minutes #' @importFrom tidyselect all_of contains vars_select diff --git a/R/derive_advs_params.R b/R/derive_advs_params.R index 19d32ed..65cbf79 100644 --- a/R/derive_advs_params.R +++ b/R/derive_advs_params.R @@ -455,7 +455,12 @@ derive_param_waisthgt <- function(dataset, #' convertible (e.g., centimeters for one parameter and inches for another), an automatic #' conversion will be performed in order to uniform the values before calculating the ratio. #' -#' **Note:** Conversion factors come from unit definitions as per the NCI Thesaurus. +#' **Note:** Conversion factors come from unit definitions as per CDISC standards. +#' ```{r, echo = FALSE, comment = "", results = "asis"} +#' get_conv_factors_all()[["length"]] %>% +#' discard_at("cm") %>% +#' str_glue_data("
*{names(.)}* is defined as {.} cm") +#' ``` #' #' *Permitted Values:* A variable of the input dataset or a function call #' @@ -609,7 +614,7 @@ get_conv_factor <- function(from_unit, to_unit) { #' @description `get_conv_factors_all()` returns all conversion factors supported. #' -#' **Note:** Conversion factors come from unit definitions as per the NCI Thesaurus. +#' **Note:** Conversion factors come from unit definitions as per CDISC standards. #' #' @rdname unit-conversion #' @keywords internal diff --git a/inst/WORDLIST b/inst/WORDLIST index 4766ddf..26e8d42 100644 --- a/inst/WORDLIST +++ b/inst/WORDLIST @@ -38,6 +38,5 @@ roxygen advs PARAMCD prm -NCI admiraldev github diff --git a/man/derive_param_ratio.Rd b/man/derive_param_ratio.Rd index e463c43..2461f86 100644 --- a/man/derive_param_ratio.Rd +++ b/man/derive_param_ratio.Rd @@ -106,7 +106,11 @@ Additionally, if the input parameters are measured in different units but are mu convertible (e.g., centimeters for one parameter and inches for another), an automatic conversion will be performed in order to uniform the values before calculating the ratio. -\strong{Note:} Conversion factors come from unit definitions as per the NCI Thesaurus. +\strong{Note:} Conversion factors come from unit definitions as per CDISC standards. +\if{html}{\out{
}}\emph{m} is defined as 100 cm +\if{html}{\out{
}}\emph{mm} is defined as 0.1 cm +\if{html}{\out{
}}\emph{in} is defined as 2.54 cm +\if{html}{\out{
}}\emph{ft} is defined as 30.48 cm \emph{Permitted Values:} A variable of the input dataset or a function call} } diff --git a/man/derive_param_waisthgt.Rd b/man/derive_param_waisthgt.Rd index 5ce7efd..4ddfaee 100644 --- a/man/derive_param_waisthgt.Rd +++ b/man/derive_param_waisthgt.Rd @@ -85,7 +85,11 @@ Additionally, if the input parameters are measured in different units but are mu convertible (e.g., centimeters for one parameter and inches for another), an automatic conversion will be performed in order to uniform the values before calculating the ratio. -\strong{Note:} Conversion factors come from unit definitions as per the NCI Thesaurus. +\strong{Note:} Conversion factors come from unit definitions as per CDISC standards. +\if{html}{\out{
}}\emph{m} is defined as 100 cm +\if{html}{\out{
}}\emph{mm} is defined as 0.1 cm +\if{html}{\out{
}}\emph{in} is defined as 2.54 cm +\if{html}{\out{
}}\emph{ft} is defined as 30.48 cm \emph{Permitted Values:} A variable of the input dataset or a function call} } diff --git a/man/derive_param_waisthip.Rd b/man/derive_param_waisthip.Rd index d29cbed..a3c7031 100644 --- a/man/derive_param_waisthip.Rd +++ b/man/derive_param_waisthip.Rd @@ -72,7 +72,11 @@ Additionally, if the input parameters are measured in different units but are mu convertible (e.g., centimeters for one parameter and inches for another), an automatic conversion will be performed in order to uniform the values before calculating the ratio. -\strong{Note:} Conversion factors come from unit definitions as per the NCI Thesaurus. +\strong{Note:} Conversion factors come from unit definitions as per CDISC standards. +\if{html}{\out{
}}\emph{m} is defined as 100 cm +\if{html}{\out{
}}\emph{mm} is defined as 0.1 cm +\if{html}{\out{
}}\emph{in} is defined as 2.54 cm +\if{html}{\out{
}}\emph{ft} is defined as 30.48 cm \emph{Permitted Values:} A variable of the input dataset or a function call} } diff --git a/man/unit-conversion.Rd b/man/unit-conversion.Rd index 3644723..8210026 100644 --- a/man/unit-conversion.Rd +++ b/man/unit-conversion.Rd @@ -16,6 +16,6 @@ Returns \code{NA} if units are not supported/convertible. \code{get_conv_factors_all()} returns all conversion factors supported. -\strong{Note:} Conversion factors come from unit definitions as per the NCI Thesaurus. +\strong{Note:} Conversion factors come from unit definitions as per CDISC standards. } \keyword{internal}