diff --git a/DESCRIPTION b/DESCRIPTION index 57a4e44aa..8c1e99ed5 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 3.0.1.9068 +Version: 3.0.1.9069 Date: 2026-06-24 Title: Antimicrobial Resistance Data Analysis Description: Functions to simplify and standardise antimicrobial resistance (AMR) diff --git a/NEWS.md b/NEWS.md index e789f2c3d..49acef57f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 3.0.1.9068 +# AMR 3.0.1.9069 Planned as v3.1.0, end of June 2026. diff --git a/R/sir.R b/R/sir.R index a0fe78dac..11ee9e358 100755 --- a/R/sir.R +++ b/R/sir.R @@ -525,7 +525,7 @@ as.sir.default <- function(x, } else if (!all(is.na(x)) && !identical(levels(x), VALID_SIR_LEVELS) && !all(x %in% c(VALID_SIR_LEVELS, NA))) { if (all(x %unlike% "(S|I|R)", na.rm = TRUE) && !all(x %in% c(1, 2, 3, 4, 5), na.rm = TRUE)) { # check if they are actually MICs or disks - if (all_valid_mics(x) && !(all_valid_disks(x) && identical(x, floor(x)))) { + if (all_valid_mics(x) && !(all_valid_disks(x) && identical(x, tryCatch(floor(x), error = function(e) NULL)))) { warning_("in {.help [{.fun as.sir}](AMR::as.sir)}: input values were guessed to be MIC values - preferably transform them with {.help [{.fun as.mic}](AMR::as.mic)} before running {.help [{.fun as.sir}](AMR::as.sir)}.") return(as.sir(as.mic(x), ...)) } else if (all_valid_disks(x)) {