mirror of
https://github.com/msberends/AMR.git
synced 2026-03-25 19:32:22 +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>
423 lines
18 KiB
R
Executable File
423 lines
18 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 #
|
|
# ==================================================================== #
|
|
|
|
#' Predict Antimicrobial Resistance
|
|
#'
|
|
#' @description Create a prediction model to predict antimicrobial resistance for the next years. Standard errors (SE) will be returned as columns `se_min` and `se_max`. See *Examples* for a real live example.
|
|
#'
|
|
#' **NOTE:** These functions are [deprecated][AMR-deprecated] and will be removed in a future version. Use the AMR package combined with the tidymodels framework instead, for which we have written a [basic and short introduction on our website](https://amr-for-r.org/articles/AMR_with_tidymodels.html).
|
|
#' @param object Model data to be plotted.
|
|
#' @param col_ab Column name of `x` containing antimicrobial interpretations (`"R"`, `"I"` and `"S"`).
|
|
#' @param col_date Column name of the date, will be used to calculate years if this column doesn't consist of years already - the default is the first column of with a date class.
|
|
#' @param year_min Lowest year to use in the prediction model, dafaults to the lowest year in `col_date`.
|
|
#' @param year_max Highest year to use in the prediction model - the default is 10 years after today.
|
|
#' @param year_every Unit of sequence between lowest year found in the data and `year_max`.
|
|
#' @param minimum Minimal amount of available isolates per year to include. Years containing less observations will be estimated by the model.
|
|
#' @param model The statistical model of choice. This could be a generalised linear regression model with binomial distribution (i.e. using `glm(..., family = binomial)`, assuming that a period of zero resistance was followed by a period of increasing resistance leading slowly to more and more resistance. See *Details* for all valid options.
|
|
#' @param I_as_S A [logical] to indicate whether values `"I"` should be treated as `"S"` (will otherwise be treated as `"R"`). The default, `TRUE`, follows the redefinition by EUCAST about the interpretation of I (increased exposure) in 2019, see section *Interpretation of S, I and R* below.
|
|
#' @param preserve_measurements A [logical] to indicate whether predictions of years that are actually available in the data should be overwritten by the original data. The standard errors of those years will be `NA`.
|
|
#' @param info A [logical] to indicate whether textual analysis should be printed with the name and [summary()] of the statistical model.
|
|
#' @param main Title of the plot.
|
|
#' @param ribbon A [logical] to indicate whether a ribbon should be shown (default) or error bars.
|
|
#' @param ... Arguments passed on to functions.
|
|
#' @inheritSection as.sir Interpretation of SIR
|
|
#' @inheritParams first_isolate
|
|
#' @inheritParams graphics::plot
|
|
#' @details Valid options for the statistical model (argument `model`) are:
|
|
#' - `"binomial"` or `"binom"` or `"logit"`: a generalised linear regression model with binomial distribution
|
|
#' - `"loglin"` or `"poisson"`: a generalised log-linear regression model with poisson distribution
|
|
#' - `"lin"` or `"linear"`: a linear regression model
|
|
#' @return A [data.frame] with extra class [`resistance_predict`] with columns:
|
|
#' - `year`
|
|
#' - `value`, the same as `estimated` when `preserve_measurements = FALSE`, and a combination of `observed` and `estimated` otherwise
|
|
#' - `se_min`, the lower bound of the standard error with a minimum of `0` (so the standard error will never go below 0%)
|
|
#' - `se_max` the upper bound of the standard error with a maximum of `1` (so the standard error will never go above 100%)
|
|
#' - `observations`, the total number of available observations in that year, i.e. \eqn{S + I + R}
|
|
#' - `observed`, the original observed resistant percentages
|
|
#' - `estimated`, the estimated resistant percentages, calculated by the model
|
|
#'
|
|
#' Furthermore, the model itself is available as an attribute: `attributes(x)$model`, see *Examples*.
|
|
#' @seealso The [proportion()] functions to calculate resistance
|
|
#'
|
|
#' Models: [lm()] [glm()]
|
|
#' @rdname resistance_predict
|
|
#' @export
|
|
#' @importFrom stats predict glm lm
|
|
#' @examples
|
|
#' x <- resistance_predict(example_isolates,
|
|
#' col_ab = "AMX",
|
|
#' year_min = 2010,
|
|
#' model = "binomial"
|
|
#' )
|
|
#' plot(x)
|
|
#' \donttest{
|
|
#' if (require("ggplot2")) {
|
|
#' ggplot_sir_predict(x)
|
|
#' }
|
|
#'
|
|
#' # using dplyr:
|
|
#' if (require("dplyr")) {
|
|
#' x <- example_isolates %>%
|
|
#' filter_first_isolate() %>%
|
|
#' filter(mo_genus(mo) == "Staphylococcus") %>%
|
|
#' resistance_predict("PEN", model = "binomial")
|
|
#' print(plot(x))
|
|
#'
|
|
#' # get the model from the object
|
|
#' mymodel <- attributes(x)$model
|
|
#' summary(mymodel)
|
|
#' }
|
|
#'
|
|
#' # create nice plots with ggplot2 yourself
|
|
#' if (require("dplyr") && require("ggplot2")) {
|
|
#' data <- example_isolates %>%
|
|
#' filter(mo == as.mo("E. coli")) %>%
|
|
#' resistance_predict(
|
|
#' col_ab = "AMX",
|
|
#' col_date = "date",
|
|
#' model = "binomial",
|
|
#' info = FALSE,
|
|
#' minimum = 15
|
|
#' )
|
|
#' head(data)
|
|
#' autoplot(data)
|
|
#' }
|
|
#' }
|
|
resistance_predict <- function(x,
|
|
col_ab,
|
|
col_date = NULL,
|
|
year_min = NULL,
|
|
year_max = NULL,
|
|
year_every = 1,
|
|
minimum = 30,
|
|
model = NULL,
|
|
I_as_S = TRUE,
|
|
preserve_measurements = TRUE,
|
|
info = interactive(),
|
|
...) {
|
|
meet_criteria(x, allow_class = "data.frame")
|
|
meet_criteria(col_ab, allow_class = "character", has_length = 1, is_in = colnames(x))
|
|
meet_criteria(col_date, allow_class = "character", has_length = 1, is_in = colnames(x), allow_NULL = TRUE)
|
|
meet_criteria(year_min, allow_class = c("numeric", "integer"), has_length = 1, allow_NULL = TRUE, is_positive = TRUE, is_finite = TRUE)
|
|
meet_criteria(year_max, allow_class = c("numeric", "integer"), has_length = 1, allow_NULL = TRUE, is_positive = TRUE, is_finite = TRUE)
|
|
meet_criteria(year_every, allow_class = c("numeric", "integer"), has_length = 1, is_positive = TRUE, is_finite = TRUE)
|
|
meet_criteria(minimum, allow_class = c("numeric", "integer"), has_length = 1, is_positive_or_zero = TRUE, is_finite = TRUE)
|
|
meet_criteria(model, allow_class = c("character", "function"), has_length = 1, allow_NULL = TRUE)
|
|
meet_criteria(I_as_S, allow_class = "logical", has_length = 1)
|
|
meet_criteria(preserve_measurements, allow_class = "logical", has_length = 1)
|
|
meet_criteria(info, allow_class = "logical", has_length = 1)
|
|
|
|
deprecation_warning(
|
|
old = "resistance_predict", is_function = TRUE,
|
|
extra_msg = paste0("Use the tidymodels framework instead, for which we have written a basic and short introduction on our website: ", font_url("https://amr-for-r.org/articles/AMR_with_tidymodels.html", txt = font_bold("AMR with tidymodels")))
|
|
)
|
|
|
|
stop_if(is.null(model), 'choose a regression model with the {.arg model} argument, e.g. {.code resistance_predict(..., model = "binomial")}')
|
|
|
|
x.bak <- x
|
|
x <- as.data.frame(x, stringsAsFactors = FALSE)
|
|
|
|
# -- date
|
|
if (is.null(col_date)) {
|
|
col_date <- search_type_in_df(x = x, type = "date")
|
|
stop_if(is.null(col_date), "{.arg col_date} must be set")
|
|
}
|
|
stop_ifnot(
|
|
col_date %in% colnames(x),
|
|
"column '", col_date, "' not found"
|
|
)
|
|
|
|
year <- function(x) {
|
|
# don't depend on lubridate or so, would be overkill for only this function
|
|
if (all(grepl("^[0-9]{4}$", x))) {
|
|
as.integer(x)
|
|
} else {
|
|
as.integer(format(as.Date(x), "%Y"))
|
|
}
|
|
}
|
|
|
|
df <- x
|
|
df[, col_ab] <- droplevels(as.sir(df[, col_ab, drop = TRUE]))
|
|
if (I_as_S == TRUE) {
|
|
# then I as S
|
|
df[, col_ab] <- gsub("I", "S", df[, col_ab, drop = TRUE], fixed = TRUE)
|
|
} else {
|
|
# then I as R
|
|
df[, col_ab] <- gsub("I", "R", df[, col_ab, drop = TRUE], fixed = TRUE)
|
|
}
|
|
df[, col_ab] <- ifelse(is.na(df[, col_ab, drop = TRUE]), 0, df[, col_ab, drop = TRUE])
|
|
|
|
# remove rows with NAs
|
|
df <- subset(df, !is.na(df[, col_ab, drop = TRUE]))
|
|
df$year <- year(df[, col_date, drop = TRUE])
|
|
df <- as.data.frame(rbind(table(df[, c("year", col_ab), drop = FALSE])),
|
|
stringsAsFactors = FALSE
|
|
)
|
|
df$year <- as.integer(rownames(df))
|
|
rownames(df) <- NULL
|
|
|
|
df <- subset(df, sum(df$R + df$S, na.rm = TRUE) >= minimum)
|
|
# nolint start
|
|
df_matrix <- as.matrix(df[, c("R", "S"), drop = FALSE])
|
|
# nolint end
|
|
|
|
stop_if(NROW(df) == 0, "there are no observations")
|
|
|
|
year_lowest <- min(df$year)
|
|
if (is.null(year_min)) {
|
|
year_min <- year_lowest
|
|
} else {
|
|
year_min <- max(year_min, year_lowest, na.rm = TRUE)
|
|
}
|
|
if (is.null(year_max)) {
|
|
year_max <- year(Sys.Date()) + 10
|
|
}
|
|
|
|
years <- list(year = seq(from = year_min, to = year_max, by = year_every))
|
|
|
|
if (model %in% c("binomial", "binom", "logit")) {
|
|
model <- "binomial"
|
|
model_lm <- with(df, glm(df_matrix ~ year, family = binomial))
|
|
if (isTRUE(info)) {
|
|
cat("\nLogistic regression model (logit) with binomial distribution")
|
|
cat("\n------------------------------------------------------------\n")
|
|
print(summary(model_lm))
|
|
}
|
|
|
|
predictmodel <- predict(model_lm, newdata = years, type = "response", se.fit = TRUE)
|
|
prediction <- predictmodel$fit
|
|
se <- predictmodel$se.fit
|
|
} else if (model %in% c("loglin", "poisson")) {
|
|
model <- "poisson"
|
|
model_lm <- with(df, glm(R ~ year, family = poisson))
|
|
if (isTRUE(info)) {
|
|
cat("\nLog-linear regression model (loglin) with poisson distribution")
|
|
cat("\n--------------------------------------------------------------\n")
|
|
print(summary(model_lm))
|
|
}
|
|
|
|
predictmodel <- predict(model_lm, newdata = years, type = "response", se.fit = TRUE)
|
|
prediction <- predictmodel$fit
|
|
se <- predictmodel$se.fit
|
|
} else if (model %in% c("lin", "linear")) {
|
|
model <- "linear"
|
|
model_lm <- with(df, lm((R / (R + S)) ~ year))
|
|
if (isTRUE(info)) {
|
|
cat("\nLinear regression model")
|
|
cat("\n-----------------------\n")
|
|
print(summary(model_lm))
|
|
}
|
|
|
|
predictmodel <- predict(model_lm, newdata = years, se.fit = TRUE)
|
|
prediction <- predictmodel$fit
|
|
se <- predictmodel$se.fit
|
|
} else {
|
|
stop("no valid model selected. See {.help [{.fun resistance_predict}](AMR::resistance_predict)}.")
|
|
}
|
|
|
|
# prepare the output dataframe
|
|
df_prediction <- data.frame(
|
|
year = unlist(years),
|
|
value = prediction,
|
|
se_min = prediction - se,
|
|
se_max = prediction + se,
|
|
stringsAsFactors = FALSE
|
|
)
|
|
|
|
if (model == "poisson") {
|
|
df_prediction$value <- as.integer(format(df_prediction$value, scientific = FALSE))
|
|
df_prediction$se_min <- as.integer(df_prediction$se_min)
|
|
df_prediction$se_max <- as.integer(df_prediction$se_max)
|
|
} else {
|
|
# se_max not above 1
|
|
df_prediction$se_max <- pmin(df_prediction$se_max, 1)
|
|
}
|
|
# se_min not below 0
|
|
df_prediction$se_min <- pmax(df_prediction$se_min, 0)
|
|
|
|
df_observations <- data.frame(
|
|
year = df$year,
|
|
observations = df$R + df$S,
|
|
observed = df$R / (df$R + df$S),
|
|
stringsAsFactors = FALSE
|
|
)
|
|
df_prediction <- df_prediction %pm>%
|
|
pm_left_join(df_observations, by = "year")
|
|
df_prediction$estimated <- df_prediction$value
|
|
|
|
if (preserve_measurements == TRUE) {
|
|
# replace estimated data by observed data
|
|
df_prediction$value <- ifelse(!is.na(df_prediction$observed), df_prediction$observed, df_prediction$value)
|
|
df_prediction$se_min <- ifelse(!is.na(df_prediction$observed), NA, df_prediction$se_min)
|
|
df_prediction$se_max <- ifelse(!is.na(df_prediction$observed), NA, df_prediction$se_max)
|
|
}
|
|
|
|
df_prediction$value <- ifelse(df_prediction$value > 1, 1, pmax(df_prediction$value, 0))
|
|
df_prediction <- df_prediction[order(df_prediction$year), , drop = FALSE]
|
|
|
|
out <- as_original_data_class(df_prediction, class(x.bak)) # will remove tibble groups
|
|
structure(out,
|
|
class = c("resistance_predict", class(out)),
|
|
I_as_S = I_as_S,
|
|
model_title = model,
|
|
model = model_lm,
|
|
ab = col_ab
|
|
)
|
|
}
|
|
|
|
#' @rdname resistance_predict
|
|
#' @export
|
|
sir_predict <- resistance_predict
|
|
|
|
#' @method plot resistance_predict
|
|
#' @export
|
|
#' @importFrom graphics plot axis arrows points
|
|
#' @rdname resistance_predict
|
|
plot.resistance_predict <- function(x, main = paste("Resistance Prediction of", x_name), ...) {
|
|
x_name <- paste0(ab_name(attributes(x)$ab), " (", attributes(x)$ab, ")")
|
|
meet_criteria(main, allow_class = "character", has_length = 1)
|
|
|
|
if (attributes(x)$I_as_S == TRUE) {
|
|
ylab <- "%R"
|
|
} else {
|
|
ylab <- "%IR"
|
|
}
|
|
|
|
plot(
|
|
x = x$year,
|
|
y = x$value,
|
|
ylim = c(0, 1),
|
|
yaxt = "n", # no y labels
|
|
pch = 19, # closed dots
|
|
ylab = paste0("Percentage (", ylab, ")"),
|
|
xlab = "Year",
|
|
main = main,
|
|
sub = paste0(
|
|
"(n = ", sum(x$observations, na.rm = TRUE),
|
|
", model: ", attributes(x)$model_title, ")"
|
|
),
|
|
cex.sub = 0.75
|
|
)
|
|
|
|
|
|
axis(side = 2, at = seq(0, 1, 0.1), labels = paste0(0:10 * 10, "%"))
|
|
|
|
# hack for error bars: https://stackoverflow.com/a/22037078/4575331
|
|
arrows(
|
|
x0 = x$year,
|
|
y0 = x$se_min,
|
|
x1 = x$year,
|
|
y1 = x$se_max,
|
|
length = 0.05, angle = 90, code = 3, lwd = 1.5
|
|
)
|
|
|
|
# overlay grey points for prediction
|
|
points(
|
|
x = subset(x, is.na(observations))$year,
|
|
y = subset(x, is.na(observations))$value,
|
|
pch = 19,
|
|
col = "grey40"
|
|
)
|
|
}
|
|
|
|
#' @rdname resistance_predict
|
|
#' @export
|
|
ggplot_sir_predict <- function(x,
|
|
main = paste("Resistance Prediction of", x_name),
|
|
ribbon = TRUE,
|
|
...) {
|
|
x_name <- paste0(ab_name(attributes(x)$ab), " (", attributes(x)$ab, ")")
|
|
meet_criteria(main, allow_class = "character", has_length = 1)
|
|
meet_criteria(ribbon, allow_class = "logical", has_length = 1)
|
|
|
|
stop_ifnot_installed("ggplot2")
|
|
stop_ifnot(inherits(x, "resistance_predict"), "{.arg x} must be a resistance prediction model created with {.fun resistance_predict}")
|
|
|
|
if (attributes(x)$I_as_S == TRUE) {
|
|
ylab <- "%R"
|
|
} else {
|
|
ylab <- "%IR"
|
|
}
|
|
|
|
p <- ggplot2::ggplot(
|
|
as.data.frame(x, stringsAsFactors = FALSE),
|
|
ggplot2::aes(x = year, y = value)
|
|
) +
|
|
ggplot2::geom_point(
|
|
data = subset(x, !is.na(observations)),
|
|
size = 2
|
|
) +
|
|
scale_y_percent(limits = c(0, 1)) +
|
|
ggplot2::labs(
|
|
title = main,
|
|
y = paste0("Percentage (", ylab, ")"),
|
|
x = "Year",
|
|
caption = paste0(
|
|
"(n = ", sum(x$observations, na.rm = TRUE),
|
|
", model: ", attributes(x)$model_title, ")"
|
|
)
|
|
)
|
|
|
|
if (ribbon == TRUE) {
|
|
p <- p + ggplot2::geom_ribbon(ggplot2::aes(ymin = se_min, ymax = se_max), alpha = 0.25)
|
|
} else {
|
|
p <- p + ggplot2::geom_errorbar(ggplot2::aes(ymin = se_min, ymax = se_max), na.rm = TRUE, width = 0.5)
|
|
}
|
|
p <- p +
|
|
# overlay grey points for prediction
|
|
ggplot2::geom_point(
|
|
data = subset(x, is.na(observations)),
|
|
size = 2,
|
|
colour = "grey40"
|
|
)
|
|
p
|
|
}
|
|
|
|
#' @method autoplot resistance_predict
|
|
#' @rdname resistance_predict
|
|
# this prevents the requirement for putting the dependency in Imports:
|
|
#' @rawNamespace if(getRversion() >= "3.0.0") S3method(ggplot2::autoplot, resistance_predict)
|
|
autoplot.resistance_predict <- function(object,
|
|
main = paste("Resistance Prediction of", x_name),
|
|
ribbon = TRUE,
|
|
...) {
|
|
x_name <- paste0(ab_name(attributes(object)$ab), " (", attributes(object)$ab, ")")
|
|
meet_criteria(main, allow_class = "character", has_length = 1)
|
|
meet_criteria(ribbon, allow_class = "logical", has_length = 1)
|
|
ggplot_sir_predict(x = object, main = main, ribbon = ribbon, ...)
|
|
}
|
|
|
|
#' @method fortify resistance_predict
|
|
#' @noRd
|
|
# this prevents the requirement for putting the dependency in Imports:
|
|
#' @rawNamespace if(getRversion() >= "3.0.0") S3method(ggplot2::fortify, resistance_predict)
|
|
fortify.resistance_predict <- function(model, data, ...) {
|
|
as.data.frame(model)
|
|
}
|