mirror of
https://github.com/msberends/AMR.git
synced 2026-03-24 12:42:29 +01:00
* Modernise messaging infrastructure with cli support
Rewrites message_(), warning_(), stop_() to use cli::cli_inform(),
cli::cli_warn(), and cli::cli_abort() when the cli package is available,
with a fully functional plain-text fallback for environments without cli.
Key changes:
- New cli_to_plain() helper converts cli inline markup ({.fun}, {.arg},
{.val}, {.field}, {.cls}, {.pkg}, {.href}, {.url}, etc.) to readable
plain-text equivalents for the non-cli fallback path
- word_wrap() simplified: drops add_fn, ANSI re-index algorithm, RStudio
link injection, and operator spacing hack; returns pasted input unchanged
when cli is available
- stop_() no longer references AMR_env$cli_abort; uses pkg_is_available()
directly; passes sys.call() objects to cli::cli_abort() call= argument
- Removed add_fn parameter from message_(), warning_(), and word_wrap()
- All call sites across R/ updated: add_fn arguments removed, some paste0-
based string construction converted to cli glue syntax ({.fun as.mo},
{.arg col_mo}, {n} results, etc.)
- cli already listed in Suggests; no DESCRIPTION dependency changes needed
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Replace {.fun} with {.help} for all exported functions in messaging
All function names referenced via {.fun …} in cli-style messages are
exported in NAMESPACE, so {.help …} is the appropriate markup — it
renders as a clickable help link rather than plain function styling.
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Qualify all {.help} tags with AMR:: and convert backtick ?func references
- Add AMR:: namespace prefix and trailing () to all {.help} cli markup
so they render as clickable help links (e.g. {.help AMR::as.sir}())
- Convert `?funcname` backtick-quoted help references to {.help AMR::funcname}()
in aa_helper_functions.R, custom_eucast_rules.R, interpretive_rules.R,
key_antimicrobials.R, mo.R, plotting.R, resistance_predict.R, and sir.R
- Skipped `?proportion` in sir_calc.R as 'proportion' is not exported
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Require cli >= 3.0.0 for cli_inform/cli_warn/cli_abort availability checks
cli_inform, cli_warn, and cli_abort were introduced in cli 3.0.0.
Add min_version = "3.0.0" (as character) to all four pkg_is_available("cli")
checks so older cli versions fall back to base R messaging.
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Implement cli::code_highlight() for R code examples in messages (issue #191)
Add highlight_code() helper that wraps cli::code_highlight() when cli >= 3.0.0
is available, falling back to plain code otherwise. Apply it to all inline
R code examples embedded in message/warning/stop strings across the package.
Also convert remaining backtick-quoted function and argument references in
messaging calls to proper cli markup: {.help AMR::fn}(), {.arg arg},
{.code expr}, and {.pkg pkg} throughout ab.R, ab_from_text.R, av_from_text.R,
amr_selectors.R, count.R, custom_antimicrobials.R, custom_microorganisms.R,
interpretive_rules.R, mo.R, mo_property.R, sir.R, sir_calc.R.
Fixes #191
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Fix {.help} markup to use correct cli link format [{.fun fn}](AMR::fn)
Replace all instances of {.help AMR::fn}() (incorrect format with manual
parentheses outside the link) with {.help [{.fun fn}](AMR::fn)} which is
the correct cli hyperlink syntax: the display text [{.fun fn}] renders the
function name with parentheses automatically, and (AMR::fn) is the link target.
Also update the plain-text fallback handler in aa_helper_functions.R to
extract the display text from the [text](topic) markdown link format,
so that non-cli environments show just the function name (e.g. `fn()`),
not the raw link markup.
Dynamic cases in amr_selectors.R and mo_property.R also updated.
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Add {.topic} markup for non-function help page references
Replace {.code ?AMR-options} and backtick-style ?AMR-options / ?AMR-deprecated
references with proper {.topic AMR-options} / {.topic AMR-deprecated} cli markup
in count.R, interpretive_rules.R, proportion.R, and zz_deprecated.R.
Add {.topic} fallback handler to format_message() in aa_helper_functions.R:
plain-text environments render {.topic foo} as ?foo, and the [text](topic)
link form extracts just the display text (same pattern as {.help}).
Also convert remaining backtick function/arg references in proportion.R to
{.help [{.fun ...}](AMR::...)}, {.arg}, and {.code} markup for consistency.
Note: zzz.R intentionally keeps the backtick form since its startup message
goes through packageStartupMessage() which bypasses our cli infrastructure.
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Fix {.topic} to use required pkg::topic format with display text
{.topic} in cli requires a package-qualified topic reference to generate
a valid x-r-help:pkg::topic URI. Bare {.topic AMR-options} produced a
malformed x-r-help:AMR-options URI (no package prefix).
Use the [display_text](pkg::topic) form throughout:
{.topic [AMR-options](AMR::AMR-options)}
{.topic [AMR-deprecated](AMR::AMR-deprecated)}
The hyphen in the topic name is fine as a URI string even though
AMR::AMR-options is not a valid R symbol expression.
The fallback handler in format_message() already handles the [text](uri)
form by extracting the display text, so plain-text output is unchanged.
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Fix regexec() calls: remove perl=TRUE unsupported in older R
regexec() only gained the perl argument in R 4.1.0. The CI matrix
covers oldrel-1 through oldrel-4 (R 3.x/4.0.x), so perl=TRUE caused
an 'unused argument' error on every message_() call in those
environments.
All four affected regexec() calls use POSIX-extended compatible
patterns, so dropping perl=TRUE is safe.
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Slim CI matrix for PRs to ubuntu-latest / r-release only
For pull requests, check-recent now runs a single job (ubuntu-latest,
r-release) via a setup job that emits the matrix as JSON. On push and
schedule the full matrix is unchanged (devel + release on all OSes,
oldrel-1 through oldrel-4).
Also removed the pull_request trigger from check-recent-dev-pkgs; the
dev-packages check only needs to run on push/schedule.
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Restrict dev-versions and old-tinytest CI to main branch only
Both workflows were triggering on every push to every branch.
Narrowed push trigger to [main] so they only run after merging,
not on every feature/PR branch push.
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Update NEWS.md to continuous log + add concise style rules to CLAUDE.md
NEWS.md is now a single continuous log under one heading per dev series,
not a new section per version bump. CLAUDE.md documents: only replace
line 1 (heading), append new entries, keep them extremely concise with
no trailing full stop.
Merged 9035 and 9036 entries into one section; condensed verbose 9036
bullets; added CI workflow change entry.
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Replace single-quoted literals in messaging calls with cli markup
Converted bare 'value' strings inside stop_(), warning_(), message_()
to appropriate cli markup:
- {.val}: option values ('drug', 'dose', 'administration', 'SDD', 'logbook')
- {.cls}: class names ('sir', 'mo')
- {.field}: column names ('mo' in mo_source)
- {.code}: object/dataset names ('clinical_breakpoints')
Files changed: ab_from_text.R, av_from_text.R, sir.R, sir_calc.R, mo_source.R
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Apply {.topic}, {.cls}, and {.field} markup in sir.R messaging
- 'clinical_breakpoints' (dataset): {.code} -> {.topic [clinical_breakpoints](AMR::clinical_breakpoints)}
- "is of class" context: extract bad_col/bad_cls/exp_cls vars and use {.cls} + {.field} in glue syntax
- Column references in as.sir() messages: font_bold(col) with surrounding quotes -> {.field {col}}
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Replace glue-style dynamic markup with paste0() construction
{.field {variable}} and {.cls {variable}} patterns rely on glue
evaluation which is not safe in a zero-dependency package. Replace
all four occurrences with paste0("{.field ", var, "}") so the value
is baked into the markup string before reaching message_()/stop_().
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Limit push trigger to main in check-recent workflow
push: branches: '**' caused both the push event (9-worker matrix) and
the pull_request event (1-worker matrix) to fire simultaneously on every
PR commit. Restricting push to [main] means PR pushes only trigger the
pull_request path (1 worker), while direct pushes to main still get the
full 9-worker matrix.
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Limit push trigger to main in code-coverage workflow
Same fix as check-recent: push: branches: '**' caused the workflow to
run twice per PR commit (once for push, once for pull_request). Restricting
push to [main] ensures coverage runs only once per PR update.
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Replace bare backticks with cli inline markup across all messaging calls
- {.arg} for argument names in stop_/warning_/message_ calls
- {.cls} after "of class" text in format_class() and elsewhere
- {.fun} for function names (replaces `fn()` pattern)
- {.pkg} for tidyverse package names (dplyr, ggplot2)
- {.code} for code literals (TRUE, FALSE, expressions)
- Rewrite print.ab: use cli named-vector with * bullets and code
highlighting when cli >= 3.0.0; keep plain-text fallback otherwise
- Fix typo in as.sir(): "of must be" -> "or must be"
- switch sir.R verbose notes from message() to message_()
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* Pre-evaluate inline expressions, add format_inline_(), fix print.ab
- All bare {variable}/{expression} in message_()/warning_()/stop_() calls
are now pre-evaluated via paste0(), so users without cli/glue never see
raw template syntax (mo_source.R, first_isolate.R, join_microorganisms.R,
antibiogram.R, atc_online.R)
- Add format_inline_() helper: formats a cli-markup string and returns it
(not emits it), using cli::format_inline() when available and cli_to_plain()
otherwise
- Rewrite .onAttach to use format_inline_() for all packageStartupMessage
calls; also adds {.topic} link and {.code} markup for option names
- print.ab: pre-evaluate function_name via paste0 (no .envir needed),
apply highlight_code() to each example bullet for R syntax highlighting
- join_microorganisms: pre-evaluate {type} and {nrow(...)} expressions
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* fixes
* Replace all "in \`funcname()\`:" with {.help [{.fun funcname}](AMR::funcname)}
Converts all "in `funcname()`:" prefixes in warning_()/message_()/stop_()
calls to the full {.help} link format for clickable help in supported
terminals. Also fixes adjacent backtick argument names to {.arg}.
Files changed: ab.R, ab_property.R, av.R, av_property.R, antibiogram.R,
key_antimicrobials.R, mdro.R, mic.R, mo.R, plotting.R
https://claude.ai/code/session_01XHWLohiSTdZvCutwD7ag2b
* fixes
* definitive
* version fix
---------
Co-authored-by: Claude <noreply@anthropic.com>
394 lines
17 KiB
R
Executable File
394 lines
17 KiB
R
Executable File
# ==================================================================== #
|
|
# TITLE: #
|
|
# AMR: An R Package for Working with Antimicrobial Resistance Data #
|
|
# #
|
|
# SOURCE CODE: #
|
|
# https://github.com/msberends/AMR #
|
|
# #
|
|
# PLEASE CITE THIS SOFTWARE AS: #
|
|
# Berends MS, Luz CF, Friedrich AW, et al. (2022). #
|
|
# AMR: An R Package for Working with Antimicrobial Resistance Data. #
|
|
# Journal of Statistical Software, 104(3), 1-31. #
|
|
# https://doi.org/10.18637/jss.v104.i03 #
|
|
# #
|
|
# Developed at the University of Groningen and the University Medical #
|
|
# Center Groningen in The Netherlands, in collaboration with many #
|
|
# colleagues from around the world, see our website. #
|
|
# #
|
|
# This R package is free software; you can freely use and distribute #
|
|
# it for both personal and commercial purposes under the terms of the #
|
|
# GNU General Public License version 2.0 (GNU GPL-2), as published by #
|
|
# the Free Software Foundation. #
|
|
# We created this package for both routine data analysis and academic #
|
|
# research and it was publicly released in the hope that it will be #
|
|
# useful, but it comes WITHOUT ANY WARRANTY OR LIABILITY. #
|
|
# #
|
|
# Visit our website for the full manual and a complete tutorial about #
|
|
# how to conduct AMR data analysis: https://amr-for-r.org #
|
|
# ==================================================================== #
|
|
|
|
dots2vars <- function(...) {
|
|
# this function is to give more informative output about
|
|
# variable names in count_* and proportion_* functions
|
|
dots <- substitute(list(...))
|
|
dots <- as.character(dots)[2:length(dots)]
|
|
paste0(dots[dots != "."], collapse = "+")
|
|
}
|
|
|
|
sir_calc <- function(...,
|
|
ab_result,
|
|
minimum = 0,
|
|
as_percent = FALSE,
|
|
only_all_tested = FALSE,
|
|
only_count = FALSE) {
|
|
meet_criteria(ab_result, allow_class = c("character", "sir"), has_length = seq_along(VALID_SIR_LEVELS), is_in = VALID_SIR_LEVELS)
|
|
meet_criteria(minimum, allow_class = c("numeric", "integer"), has_length = 1, is_positive_or_zero = TRUE, is_finite = TRUE)
|
|
meet_criteria(as_percent, allow_class = "logical", has_length = 1)
|
|
meet_criteria(only_all_tested, allow_class = "logical", has_length = 1)
|
|
meet_criteria(only_count, allow_class = "logical", has_length = 1)
|
|
|
|
data_vars <- dots2vars(...)
|
|
|
|
dots_df <- switch(1,
|
|
...
|
|
)
|
|
if (is.data.frame(dots_df)) {
|
|
# make sure to remove all other classes like tibbles, data.tables, etc
|
|
dots_df <- as.data.frame(dots_df, stringsAsFactors = FALSE)
|
|
}
|
|
|
|
dots <- eval(substitute(alist(...)))
|
|
stop_if(length(dots) == 0, "no variables selected", call = -2)
|
|
|
|
ndots <- length(dots)
|
|
|
|
if (is.data.frame(dots_df)) {
|
|
# data.frame passed with other columns, like: example_isolates %pm>% proportion_S(AMC, GEN)
|
|
|
|
dots <- as.character(dots)
|
|
# remove first element, it's the data.frame
|
|
if (length(dots) == 1) {
|
|
dots <- character(0)
|
|
} else {
|
|
dots <- dots[2:length(dots)]
|
|
}
|
|
if (length(dots) == 0 || all(dots == "df")) {
|
|
# for complete data.frames, like example_isolates %pm>% select(AMC, GEN) %pm>% proportion_S()
|
|
# and the old sir function, which has "df" as name of the first argument
|
|
x <- dots_df
|
|
} else {
|
|
# get dots that are in column names already, and the ones that will be once evaluated using dots_df or global env
|
|
# this is to support susceptibility(example_isolates, AMC, any_of(some_vector_with_AB_names))
|
|
dots <- c(
|
|
dots[dots %in% colnames(dots_df)],
|
|
eval(parse(text = dots[!dots %in% colnames(dots_df)]), envir = dots_df, enclos = globalenv())
|
|
)
|
|
dots_not_exist <- dots[!dots %in% colnames(dots_df)]
|
|
stop_if(length(dots_not_exist) > 0, "column(s) not found: ", vector_and(dots_not_exist, quotes = TRUE), call = -2)
|
|
x <- dots_df[, dots, drop = FALSE]
|
|
}
|
|
} else if (ndots == 1) {
|
|
# only 1 variable passed (can also be data.frame), like: proportion_S(example_isolates$AMC) and example_isolates$AMC %pm>% proportion_S()
|
|
x <- dots_df
|
|
} else {
|
|
# multiple variables passed without pipe, like: proportion_S(example_isolates$AMC, example_isolates$GEN)
|
|
x <- NULL
|
|
try(x <- as.data.frame(dots, stringsAsFactors = FALSE), silent = TRUE)
|
|
if (is.null(x)) {
|
|
# support for example_isolates %pm>% group_by(ward) %pm>% summarise(amox = susceptibility(GEN, AMX))
|
|
x <- as.data.frame(list(...), stringsAsFactors = FALSE)
|
|
}
|
|
}
|
|
|
|
if (is.null(x)) {
|
|
warning_("argument is NULL (check if columns exist): returning NA")
|
|
if (as_percent == TRUE) {
|
|
return(NA_character_)
|
|
} else {
|
|
return(NA_real_)
|
|
}
|
|
}
|
|
|
|
print_warning <- FALSE
|
|
|
|
ab_result <- as.sir(ab_result)
|
|
denominator_vals <- levels(ab_result)
|
|
denominator_vals <- denominator_vals[denominator_vals != "NI"]
|
|
|
|
if (is.data.frame(x)) {
|
|
sir_integrity_check <- character(0)
|
|
for (i in seq_len(ncol(x))) {
|
|
# check integrity of columns: force 'sir' class
|
|
if (!is.sir(x[, i, drop = TRUE])) {
|
|
sir_integrity_check <- c(sir_integrity_check, as.character(x[, i, drop = TRUE]))
|
|
x[, i] <- suppressWarnings(as.sir(x[, i, drop = TRUE])) # warning will be given later
|
|
print_warning <- TRUE
|
|
}
|
|
}
|
|
if (length(sir_integrity_check) > 0) {
|
|
# this will give a warning for invalid results, of all input columns (so only 1 warning)
|
|
sir_integrity_check <- as.sir(sir_integrity_check)
|
|
}
|
|
|
|
x_transposed <- as.list(as.data.frame(t(x), stringsAsFactors = FALSE))
|
|
if (isTRUE(only_all_tested)) {
|
|
# no NAs in any column
|
|
y <- apply(
|
|
X = as.data.frame(lapply(x, as.double), stringsAsFactors = FALSE),
|
|
MARGIN = 1,
|
|
FUN = min
|
|
)
|
|
if ("SDD" %in% ab_result && "SDD" %in% y && message_not_thrown_before("sir_calc", only_count, ab_result, entire_session = TRUE)) {
|
|
message_("Note that {.fun ", ifelse(only_count, "count", "proportion"), "_", ifelse("S" %in% ab_result, "S", ""), "I", ifelse("R" %in% ab_result, "R", ""), "} will also include dose-dependent susceptibility, {.val SDD}. This note will be shown once for this session.", as_note = FALSE)
|
|
}
|
|
numerator <- sum(!is.na(y) & y %in% as.double(ab_result), na.rm = TRUE)
|
|
denominator <- sum(vapply(FUN.VALUE = logical(1), x_transposed, function(y) !(anyNA(y))))
|
|
} else {
|
|
# may contain NAs in any column
|
|
other_values <- setdiff(c(NA, denominator_vals), ab_result)
|
|
if ("SDD" %in% ab_result && "SDD" %in% unlist(x_transposed) && message_not_thrown_before("sir_calc", only_count, ab_result, entire_session = TRUE)) {
|
|
message_("Note that {.fun ", ifelse(only_count, "count", "proportion"), "_", ifelse("S" %in% ab_result, "S", ""), "I", ifelse("R" %in% ab_result, "R", ""), "} will also include dose-dependent susceptibility, {.val SDD}. This note will be shown once for this session.", as_note = FALSE)
|
|
}
|
|
numerator <- sum(vapply(FUN.VALUE = logical(1), x_transposed, function(y) any(y %in% ab_result, na.rm = TRUE)))
|
|
denominator <- sum(vapply(FUN.VALUE = logical(1), x_transposed, function(y) !(all(y %in% other_values) & anyNA(y))))
|
|
}
|
|
} else {
|
|
# x is not a data.frame
|
|
if (!is.sir(x)) {
|
|
x <- as.sir(x)
|
|
print_warning <- TRUE
|
|
}
|
|
if ("SDD" %in% ab_result && "SDD" %in% x && message_not_thrown_before("sir_calc", only_count, ab_result, entire_session = TRUE)) {
|
|
message_("Note that `", ifelse(only_count, "count", "proportion"), "_", ifelse("S" %in% ab_result, "S", ""), "I", ifelse("R" %in% ab_result, "R", ""), "()` will also include dose-dependent susceptibility, {.val SDD}. This note will be shown once for this session.", as_note = FALSE)
|
|
}
|
|
numerator <- sum(x %in% ab_result, na.rm = TRUE)
|
|
denominator <- sum(x %in% denominator_vals, na.rm = TRUE)
|
|
}
|
|
|
|
if (print_warning == TRUE) {
|
|
if (message_not_thrown_before("sir_calc")) {
|
|
warning_("Increase speed by transforming to class {.cls sir} on beforehand:\n",
|
|
highlight_code(" your_data %>% mutate_if(is_sir_eligible, as.sir)"),
|
|
call = FALSE
|
|
)
|
|
}
|
|
}
|
|
|
|
if (only_count == TRUE) {
|
|
return(numerator)
|
|
}
|
|
|
|
if (denominator < minimum) {
|
|
if (data_vars != "") {
|
|
data_vars <- paste(" for", data_vars)
|
|
# also add group name if used in dplyr::group_by()
|
|
cur_group <- import_fn("cur_group", "dplyr", error_on_fail = FALSE)
|
|
if (!is.null(cur_group)) {
|
|
group_df <- tryCatch(cur_group(), error = function(e) data.frame())
|
|
if (NCOL(group_df) > 0) {
|
|
# transform factors to characters
|
|
group <- vapply(FUN.VALUE = character(1), group_df, function(x) {
|
|
if (is.numeric(x)) {
|
|
format(x)
|
|
} else if (is.logical(x)) {
|
|
as.character(x)
|
|
} else {
|
|
paste0('"', x, '"')
|
|
}
|
|
})
|
|
data_vars <- paste0(data_vars, " in group: ", paste0(names(group), " = ", group, collapse = ", "))
|
|
}
|
|
}
|
|
}
|
|
warning_("Introducing NA: ",
|
|
ifelse(denominator == 0, "no", paste("only", denominator)),
|
|
" results available",
|
|
data_vars,
|
|
" (`minimum` = ", minimum, ").",
|
|
call = FALSE
|
|
)
|
|
fraction <- NA_real_
|
|
} else {
|
|
fraction <- numerator / denominator
|
|
fraction[is.nan(fraction)] <- NA_real_
|
|
}
|
|
|
|
if (as_percent == TRUE) {
|
|
trimws(percentage(fraction, digits = 1))
|
|
} else {
|
|
fraction
|
|
}
|
|
}
|
|
|
|
sir_calc_df <- function(type, # "proportion", "count" or "both"
|
|
data,
|
|
translate_ab = "name",
|
|
language = get_AMR_locale(),
|
|
minimum = 30,
|
|
as_percent = FALSE,
|
|
combine_SI = TRUE,
|
|
confidence_level = 0.95) {
|
|
meet_criteria(type, is_in = c("proportion", "count", "both"), has_length = 1)
|
|
meet_criteria(data, allow_class = "data.frame")
|
|
data <- ascertain_sir_classes(data, "data")
|
|
meet_criteria(translate_ab, allow_class = c("character", "logical"), has_length = 1, allow_NA = TRUE)
|
|
language <- validate_language(language)
|
|
meet_criteria(minimum, allow_class = c("numeric", "integer"), has_length = 1, is_positive_or_zero = TRUE, is_finite = TRUE)
|
|
meet_criteria(as_percent, allow_class = "logical", has_length = 1)
|
|
meet_criteria(combine_SI, allow_class = "logical", has_length = 1)
|
|
meet_criteria(confidence_level, allow_class = "numeric", has_length = 1)
|
|
|
|
translate_ab <- get_translate_ab(translate_ab)
|
|
|
|
data.bak <- data
|
|
# select only groups and antibiotics
|
|
if (is_null_or_grouped_tbl(data)) {
|
|
data_has_groups <- TRUE
|
|
groups <- get_group_names(data)
|
|
data <- data[, c(groups, colnames(data)[vapply(FUN.VALUE = logical(1), data, is.sir)]), drop = FALSE]
|
|
} else {
|
|
data_has_groups <- FALSE
|
|
data <- data[, colnames(data)[vapply(FUN.VALUE = logical(1), data, is.sir)], drop = FALSE]
|
|
}
|
|
|
|
data <- as.data.frame(data, stringsAsFactors = FALSE)
|
|
|
|
for (i in seq_len(ncol(data))) {
|
|
# transform SIR columns
|
|
if (is.sir(data[, i, drop = TRUE])) {
|
|
data[, i] <- as.character(as.sir(data[, i, drop = TRUE]))
|
|
data[which(data[, i, drop = TRUE] %in% c("S", "SDD", "WT")), i] <- "S"
|
|
data[which(data[, i, drop = TRUE] %in% c("R", "NWT", "NS")), i] <- "R"
|
|
if (isTRUE(combine_SI)) {
|
|
data[which(data[, i, drop = TRUE] %in% c("I", "S")), i] <- "SI"
|
|
}
|
|
data[which(!data[, i, drop = TRUE] %in% c("S", "SI", "I", "R")), i] <- NA_character_
|
|
}
|
|
}
|
|
|
|
sum_it <- function(.data) {
|
|
out <- data.frame(
|
|
antibiotic = character(0),
|
|
interpretation = character(0),
|
|
value = double(0),
|
|
ci_min = double(0),
|
|
ci_max = double(0),
|
|
isolates = integer(0),
|
|
stringsAsFactors = FALSE
|
|
)
|
|
if (data_has_groups) {
|
|
group_values <- unique(.data[, which(colnames(.data) %in% groups), drop = FALSE])
|
|
rownames(group_values) <- NULL
|
|
.data <- .data[, which(!colnames(.data) %in% groups), drop = FALSE]
|
|
}
|
|
for (i in seq_len(ncol(.data))) {
|
|
values <- .data[, i, drop = TRUE]
|
|
if (isTRUE(combine_SI)) {
|
|
values <- factor(values, levels = c("SI", "R", "NI"), ordered = TRUE)
|
|
} else {
|
|
values <- factor(values, levels = c("S", "SDD", "I", "R", "NI"), ordered = TRUE)
|
|
}
|
|
col_results <- as.data.frame(as.matrix(table(values)), stringsAsFactors = FALSE)
|
|
col_results$interpretation <- rownames(col_results)
|
|
col_results$isolates <- col_results[, 1, drop = TRUE]
|
|
if (NROW(col_results) > 0 && sum(col_results$isolates, na.rm = TRUE) > 0) {
|
|
if (sum(col_results$isolates, na.rm = TRUE) >= minimum) {
|
|
col_results$value <- col_results$isolates / sum(col_results$isolates, na.rm = TRUE)
|
|
ci <- lapply(
|
|
col_results$isolates,
|
|
function(x) {
|
|
stats::binom.test(
|
|
x = x,
|
|
n = sum(col_results$isolates, na.rm = TRUE),
|
|
conf.level = confidence_level
|
|
)$conf.int
|
|
}
|
|
)
|
|
col_results$ci_min <- vapply(FUN.VALUE = double(1), ci, `[`, 1)
|
|
col_results$ci_max <- vapply(FUN.VALUE = double(1), ci, `[`, 2)
|
|
} else {
|
|
col_results$value <- rep(NA_real_, NROW(col_results))
|
|
# confidence intervals also to NA
|
|
col_results$ci_min <- col_results$value
|
|
col_results$ci_max <- col_results$value
|
|
}
|
|
out_new <- data.frame(
|
|
antibiotic = ifelse(isFALSE(translate_ab),
|
|
colnames(.data)[i],
|
|
ab_property(colnames(.data)[i], property = translate_ab, language = language)
|
|
),
|
|
interpretation = col_results$interpretation,
|
|
value = col_results$value,
|
|
ci_min = col_results$ci_min,
|
|
ci_max = col_results$ci_max,
|
|
isolates = col_results$isolates,
|
|
stringsAsFactors = FALSE
|
|
)
|
|
if (data_has_groups) {
|
|
if (nrow(group_values) < nrow(out_new)) {
|
|
# repeat group_values for the number of rows in out_new
|
|
repeated <- rep(seq_len(nrow(group_values)),
|
|
each = nrow(out_new) / nrow(group_values)
|
|
)
|
|
group_values <- group_values[repeated, , drop = FALSE]
|
|
}
|
|
out_new <- cbind(group_values, out_new)
|
|
}
|
|
out <- rbind_AMR(out, out_new)
|
|
}
|
|
}
|
|
out
|
|
}
|
|
|
|
# based on pm_apply_grouped_function
|
|
apply_group <- function(.data, fn, groups, drop = FALSE, ...) {
|
|
grouped <- pm_split_into_groups(.data, groups, drop)
|
|
res <- do.call(rbind_AMR, unname(lapply(grouped, fn, ...)))
|
|
if (any(groups %in% colnames(res))) {
|
|
class(res) <- c("grouped_data", class(res))
|
|
res <- pm_set_groups(res, groups[groups %in% colnames(res)])
|
|
}
|
|
res
|
|
}
|
|
|
|
if (data_has_groups) {
|
|
out <- apply_group(data, "sum_it", groups)
|
|
} else {
|
|
out <- sum_it(data)
|
|
}
|
|
|
|
# apply factors for right sorting in interpretation
|
|
if (isTRUE(combine_SI)) {
|
|
out$interpretation <- factor(out$interpretation, levels = c("SI", "R"), ordered = TRUE)
|
|
} else {
|
|
# don't use as.sir() here, as it would add the class 'sir' and we would like
|
|
# the same data structure as output, regardless of input
|
|
if (any(out$value[out$interpretation == "SDD"] > 0, na.rm = TRUE)) {
|
|
out$interpretation <- factor(out$interpretation, levels = c("S", "SDD", "I", "R"), ordered = TRUE)
|
|
} else {
|
|
out$interpretation <- factor(out$interpretation, levels = c("S", "I", "R"), ordered = TRUE)
|
|
}
|
|
}
|
|
|
|
out <- out[!is.na(out$interpretation), , drop = FALSE]
|
|
|
|
if (data_has_groups) {
|
|
# ordering by the groups and two more: "antibiotic" and "interpretation"
|
|
out <- pm_ungroup(out[do.call("order", out[, seq_len(length(groups) + 2), drop = FALSE]), , drop = FALSE])
|
|
} else {
|
|
out <- out[order(out$antibiotic, out$interpretation), , drop = FALSE]
|
|
}
|
|
|
|
if (type == "proportion") {
|
|
# remove number of isolates
|
|
out <- subset(out, select = -c(isolates))
|
|
} else if (type == "count") {
|
|
# set value to be number of isolates
|
|
out$value <- out$isolates
|
|
# remove redundant columns
|
|
out <- subset(out, select = -c(ci_min, ci_max, isolates))
|
|
}
|
|
|
|
as_original_data_class(out, class(data.bak), extra_class = "sir_df") # will remove tibble groups
|
|
}
|