mirror of
https://github.com/msberends/AMR.git
synced 2026-03-24 08: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>
337 lines
14 KiB
R
Executable File
337 lines
14 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 #
|
|
# ==================================================================== #
|
|
|
|
#' Add Custom Microorganisms
|
|
#'
|
|
#' With [add_custom_microorganisms()] you can add your own custom microorganisms, such the non-taxonomic outcome of laboratory analysis.
|
|
#' @param x A [data.frame] resembling the [microorganisms] data set, at least containing column "genus" (case-insensitive).
|
|
#' @details This function will fill in missing taxonomy for you, if specific taxonomic columns are missing, see *Examples*.
|
|
#'
|
|
#' **Important:** Due to how \R works, the [add_custom_microorganisms()] function has to be run in every \R session - added microorganisms are not stored between sessions and are thus lost when \R is exited.
|
|
#'
|
|
#' There are two ways to circumvent this and automate the process of adding microorganisms:
|
|
#'
|
|
#' **Method 1:** Using the package option [`AMR_custom_mo`][AMR-options], which is the preferred method. To use this method:
|
|
#'
|
|
#' 1. Create a data set in the structure of the [microorganisms] data set (containing at the very least column "genus") and save it with [saveRDS()] to a location of choice, e.g. `"~/my_custom_mo.rds"`, or any remote location.
|
|
#'
|
|
#' 2. Set the file location to the package option [`AMR_custom_mo`][AMR-options]: `options(AMR_custom_mo = "~/my_custom_mo.rds")`. This can even be a remote file location, such as an https URL. Since options are not saved between \R sessions, it is best to save this option to the `.Rprofile` file so that it will be loaded on start-up of \R. To do this, open the `.Rprofile` file using e.g. `utils::file.edit("~/.Rprofile")`, add this text and save the file:
|
|
#'
|
|
#' ```r
|
|
#' # Add custom microorganism codes:
|
|
#' options(AMR_custom_mo = "~/my_custom_mo.rds")
|
|
#' ```
|
|
#'
|
|
#' Upon package load, this file will be loaded and run through the [add_custom_microorganisms()] function.
|
|
#'
|
|
#' **Method 2:** Loading the microorganism directly from your `.Rprofile` file. Note that the definitions will be stored in a user-specific \R file, which is a suboptimal workflow. To use this method:
|
|
#'
|
|
#' 1. Edit the `.Rprofile` file using e.g. `utils::file.edit("~/.Rprofile")`.
|
|
#'
|
|
#' 2. Add a text like below and save the file:
|
|
#'
|
|
#' ```r
|
|
#' # Add custom antibiotic drug codes:
|
|
#' AMR::add_custom_microorganisms(
|
|
#' data.frame(genus = "Enterobacter",
|
|
#' species = "asburiae/cloacae")
|
|
#' )
|
|
#' ```
|
|
#'
|
|
#' Use [clear_custom_microorganisms()] to clear the previously added microorganisms.
|
|
#' @seealso [add_custom_antimicrobials()] to add custom antimicrobials.
|
|
#' @rdname add_custom_microorganisms
|
|
#' @export
|
|
#' @examples
|
|
#' \donttest{
|
|
#' # a combination of species is not formal taxonomy, so
|
|
#' # this will result in "Enterobacter cloacae cloacae",
|
|
#' # since it resembles the input best:
|
|
#' mo_name("Enterobacter asburiae/cloacae")
|
|
#'
|
|
#' # now add a custom entry - it will be considered by as.mo() and
|
|
#' # all mo_*() functions
|
|
#' add_custom_microorganisms(
|
|
#' data.frame(
|
|
#' genus = "Enterobacter",
|
|
#' species = "asburiae/cloacae"
|
|
#' )
|
|
#' )
|
|
#'
|
|
#' # E. asburiae/cloacae is now a new microorganism:
|
|
#' mo_name("Enterobacter asburiae/cloacae")
|
|
#'
|
|
#' # its code:
|
|
#' as.mo("Enterobacter asburiae/cloacae")
|
|
#'
|
|
#' # all internal algorithms will work as well:
|
|
#' mo_name("Ent asburia cloacae")
|
|
#'
|
|
#' # and even the taxonomy was added based on the genus!
|
|
#' mo_family("E. asburiae/cloacae")
|
|
#' mo_gramstain("Enterobacter asburiae/cloacae")
|
|
#'
|
|
#' mo_info("Enterobacter asburiae/cloacae")
|
|
#'
|
|
#'
|
|
#' # the function tries to be forgiving:
|
|
#' add_custom_microorganisms(
|
|
#' data.frame(
|
|
#' GENUS = "BACTEROIDES / PARABACTEROIDES SLASHLINE",
|
|
#' SPECIES = "SPECIES"
|
|
#' )
|
|
#' )
|
|
#' mo_name("BACTEROIDES / PARABACTEROIDES")
|
|
#' mo_rank("BACTEROIDES / PARABACTEROIDES")
|
|
#'
|
|
#' # taxonomy still works, even though a slashline genus was given as input:
|
|
#' mo_family("Bacteroides/Parabacteroides")
|
|
#'
|
|
#'
|
|
#' # for groups and complexes, set them as species or subspecies:
|
|
#' add_custom_microorganisms(
|
|
#' data.frame(
|
|
#' genus = "Citrobacter",
|
|
#' species = c("freundii", "braakii complex"),
|
|
#' subspecies = c("complex", "")
|
|
#' )
|
|
#' )
|
|
#' mo_name(c("C. freundii complex", "C. braakii complex"))
|
|
#' mo_species(c("C. freundii complex", "C. braakii complex"))
|
|
#' mo_gramstain(c("C. freundii complex", "C. braakii complex"))
|
|
#' }
|
|
add_custom_microorganisms <- function(x) {
|
|
meet_criteria(x, allow_class = "data.frame")
|
|
stop_ifnot("genus" %in% tolower(colnames(x)), "{.arg x} must contain column 'genus'.")
|
|
|
|
add_MO_lookup_to_AMR_env()
|
|
|
|
# remove any extra class/type, such as grouped tbl, or data.table:
|
|
x <- as.data.frame(x, stringsAsFactors = FALSE)
|
|
colnames(x) <- tolower(colnames(x))
|
|
# rename 'name' to 'fullname' if it's in the data set
|
|
if ("name" %in% colnames(x) && !"fullname" %in% colnames(x)) {
|
|
colnames(x)[colnames(x) == "name"] <- "fullname"
|
|
}
|
|
# keep only columns available in the microorganisms data set
|
|
x <- x[, colnames(AMR_env$MO_lookup)[colnames(AMR_env$MO_lookup) %in% colnames(x)], drop = FALSE]
|
|
|
|
# clean the input ----
|
|
for (col in c("genus", "species", "subspecies")) {
|
|
if (!col %in% colnames(x)) {
|
|
x[, col] <- ""
|
|
}
|
|
if (is.factor(x[, col, drop = TRUE])) {
|
|
x[, col] <- as.character(x[, col, drop = TRUE])
|
|
}
|
|
col_ <- x[, col, drop = TRUE]
|
|
col_ <- tolower(col_)
|
|
col_ <- gsub("slashline", "", col_, fixed = TRUE)
|
|
col_ <- trimws2(col_)
|
|
col_[col_ %like% "(sub)?species"] <- ""
|
|
col_ <- gsub(" *([/-]) *", "\\1", col_, perl = TRUE)
|
|
# groups are in our taxonomic table with a capital G
|
|
col_ <- gsub(" group( |$)", " Group\\1", col_, perl = TRUE)
|
|
|
|
col_[is.na(col_)] <- ""
|
|
if (col == "genus") {
|
|
substr(col_, 1, 1) <- toupper(substr(col_, 1, 1))
|
|
col_ <- gsub("/([a-z])", "/\\U\\1", col_, perl = TRUE)
|
|
stop_if(any(col_ == ""), "the 'genus' column cannot be empty")
|
|
stop_if(any(col_ %like% " "), "the 'genus' column must not contain spaces")
|
|
}
|
|
x[, col] <- col_
|
|
}
|
|
# if subspecies is a group or complex, add it to the species and empty the subspecies
|
|
x$species[which(x$subspecies %in% c("group", "Group", "complex"))] <- paste(
|
|
x$species[which(x$subspecies %in% c("group", "Group", "complex"))],
|
|
x$subspecies[which(x$subspecies %in% c("group", "Group", "complex"))]
|
|
)
|
|
x$subspecies[which(x$subspecies %in% c("group", "Group", "complex"))] <- ""
|
|
|
|
if ("rank" %in% colnames(x)) {
|
|
stop_ifnot(
|
|
all(x$rank %in% AMR_env$MO_lookup$rank),
|
|
"the 'rank' column can only contain these values: ", vector_or(AMR_env$MO_lookup$rank)
|
|
)
|
|
} else {
|
|
x$rank <- ifelse(x$subspecies != "", "subspecies",
|
|
ifelse(x$species != "", "species",
|
|
ifelse(x$genus != "", "genus",
|
|
stop("in add_custom_microorganisms(): only microorganisms up to the genus level can be added",
|
|
call. = FALSE
|
|
)
|
|
)
|
|
)
|
|
)
|
|
}
|
|
x$source <- "Added by user"
|
|
if (!"fullname" %in% colnames(x)) {
|
|
x$fullname <- trimws2(paste(x$genus, x$species, x$subspecies))
|
|
}
|
|
if (!"kingdom" %in% colnames(x)) x$kingdom <- ""
|
|
if (!"phylum" %in% colnames(x)) x$phylum <- ""
|
|
if (!"class" %in% colnames(x)) x$class <- ""
|
|
if (!"order" %in% colnames(x)) x$order <- ""
|
|
if (!"family" %in% colnames(x)) x$family <- ""
|
|
x$kingdom[is.na(x$kingdom)] <- ""
|
|
x$phylum[is.na(x$phylum)] <- ""
|
|
x$class[is.na(x$class)] <- ""
|
|
x$order[is.na(x$order)] <- ""
|
|
x$family[is.na(x$family)] <- ""
|
|
|
|
for (col in colnames(x)) {
|
|
if (is.factor(x[, col, drop = TRUE])) {
|
|
x[, col] <- as.character(x[, col, drop = TRUE])
|
|
}
|
|
if (is.list(AMR_env$MO_lookup[, col, drop = TRUE])) {
|
|
x[, col] <- as.list(x[, col, drop = TRUE])
|
|
}
|
|
}
|
|
|
|
# fill in taxonomy based on genus
|
|
genus_to_check <- gsub("^(.*)[^a-zA-Z].*", "\\1", x$genus, perl = TRUE)
|
|
x$kingdom[which(x$kingdom == "" & genus_to_check != "")] <- AMR_env$MO_lookup$kingdom[match(genus_to_check[which(x$kingdom == "" & genus_to_check != "")], AMR_env$MO_lookup$genus)]
|
|
x$phylum[which(x$phylum == "" & genus_to_check != "")] <- AMR_env$MO_lookup$phylum[match(genus_to_check[which(x$phylum == "" & genus_to_check != "")], AMR_env$MO_lookup$genus)]
|
|
x$class[which(x$class == "" & genus_to_check != "")] <- AMR_env$MO_lookup$class[match(genus_to_check[which(x$class == "" & genus_to_check != "")], AMR_env$MO_lookup$genus)]
|
|
x$order[which(x$order == "" & genus_to_check != "")] <- AMR_env$MO_lookup$order[match(genus_to_check[which(x$order == "" & genus_to_check != "")], AMR_env$MO_lookup$genus)]
|
|
x$family[which(x$family == "" & genus_to_check != "")] <- AMR_env$MO_lookup$family[match(genus_to_check[which(x$family == "" & genus_to_check != "")], AMR_env$MO_lookup$genus)]
|
|
|
|
# fill in other columns that are used in internal algorithms
|
|
x$prevalence <- NA_real_
|
|
x$prevalence[which(genus_to_check != "")] <- AMR_env$MO_lookup$prevalence[match(genus_to_check[which(genus_to_check != "")], AMR_env$MO_lookup$genus)]
|
|
x$prevalence[is.na(x$prevalence)] <- 1.25
|
|
x$status <- "accepted"
|
|
x$ref <- paste("Self-added,", format(Sys.Date(), "%Y"))
|
|
x$kingdom_index <- AMR_env$MO_lookup$kingdom_index[match(genus_to_check, AMR_env$MO_lookup$genus)]
|
|
# complete missing kingdom index, so mo_matching_score() will not return NA
|
|
x$kingdom_index[is.na(x$kingdom_index)] <- 1
|
|
x$fullname_lower <- tolower(x$fullname)
|
|
x$full_first <- substr(x$fullname_lower, 1, 1)
|
|
x$species_first <- tolower(substr(x$species, 1, 1))
|
|
x$subspecies_first <- tolower(substr(x$subspecies, 1, 1))
|
|
|
|
if (!"mo" %in% colnames(x)) {
|
|
# create the mo code
|
|
x$mo <- NA_character_
|
|
}
|
|
x$mo <- trimws2(as.character(x$mo))
|
|
x$mo[x$mo == ""] <- NA_character_
|
|
current <- sum(AMR_env$MO_lookup$source == "Added by user", na.rm = TRUE)
|
|
x$mo[is.na(x$mo)] <- paste0(
|
|
"CUSTOM",
|
|
seq.int(from = current + 1, to = current + nrow(x), by = 1),
|
|
"_",
|
|
trimws(
|
|
paste(abbreviate_mo(x$genus, 5),
|
|
abbreviate_mo(x$species, 4, hyphen_as_space = TRUE),
|
|
abbreviate_mo(x$subspecies, 4, hyphen_as_space = TRUE),
|
|
sep = "_"
|
|
),
|
|
whitespace = "_"
|
|
)
|
|
)
|
|
stop_if(anyDuplicated(c(as.character(AMR_env$MO_lookup$mo), x$mo)), "MO codes must be unique and not match existing MO codes of the AMR package")
|
|
|
|
# add to package ----
|
|
AMR_env$custom_mo_codes <- c(AMR_env$custom_mo_codes, x$mo)
|
|
class(AMR_env$MO_lookup$mo) <- "character"
|
|
|
|
new_df <- AMR_env$MO_lookup[0, , drop = FALSE][seq_len(NROW(x)), , drop = FALSE]
|
|
rownames(new_df) <- NULL
|
|
list_cols <- vapply(FUN.VALUE = logical(1), new_df, is.list)
|
|
for (l in which(list_cols)) {
|
|
# prevent binding NULLs in lists, replace with NA
|
|
new_df[, l] <- as.list(NA_character_)
|
|
}
|
|
for (col in colnames(x)) {
|
|
# assign new values
|
|
new_df[, col] <- x[, col, drop = TRUE]
|
|
}
|
|
|
|
# clear previous coercions
|
|
suppressMessages(mo_reset_session())
|
|
|
|
AMR_env$MO_lookup <- unique(rbind_AMR(AMR_env$MO_lookup, new_df))
|
|
class(AMR_env$MO_lookup$mo) <- c("mo", "character")
|
|
if (nrow(x) <= 3) {
|
|
message_("Added ", vector_and(italicise(x$fullname), quotes = FALSE), " to the internal {.code microorganisms} data set.")
|
|
} else {
|
|
message_("Added ", nr2char(nrow(x)), " records to the internal {.code microorganisms} data set.")
|
|
}
|
|
}
|
|
|
|
#' @rdname add_custom_microorganisms
|
|
#' @export
|
|
clear_custom_microorganisms <- function() {
|
|
n <- nrow(AMR_env$MO_lookup)
|
|
|
|
# reset
|
|
AMR_env$MO_lookup <- NULL
|
|
add_MO_lookup_to_AMR_env()
|
|
|
|
# clear previous coercions
|
|
suppressMessages(mo_reset_session())
|
|
|
|
n2 <- nrow(AMR_env$MO_lookup)
|
|
AMR_env$custom_mo_codes <- character(0)
|
|
AMR_env$mo_previously_coerced <- AMR_env$mo_previously_coerced[which(AMR_env$mo_previously_coerced$mo %in% AMR_env$MO_lookup$mo), , drop = FALSE]
|
|
AMR_env$mo_uncertainties <- AMR_env$mo_uncertainties[0, , drop = FALSE]
|
|
message_("Cleared ", nr2char(n - n2), " custom record", ifelse(n - n2 > 1, "s", ""), " from the internal {.code microorganisms} data set.")
|
|
}
|
|
|
|
abbreviate_mo <- function(x, minlength = 5, prefix = "", hyphen_as_space = FALSE, ...) {
|
|
if (hyphen_as_space == TRUE) {
|
|
x <- gsub("-", " ", x, fixed = TRUE)
|
|
}
|
|
# keep a starting Latin ae
|
|
suppressWarnings(
|
|
gsub(
|
|
"(\u00C6|\u00E6)+",
|
|
"AE",
|
|
toupper(
|
|
paste0(
|
|
prefix,
|
|
abbreviate(
|
|
gsub("^ae",
|
|
"\u00E6\u00E6",
|
|
x,
|
|
ignore.case = TRUE
|
|
),
|
|
minlength = minlength,
|
|
use.classes = TRUE,
|
|
method = "both.sides",
|
|
...
|
|
)
|
|
)
|
|
)
|
|
)
|
|
)
|
|
}
|