Fix candidates_formatted not found in print.mo_uncertainties()

When there is only one match (candidates field is empty), the "Also
matched:" block must be skipped. Wrapping it in if (candidates != "")
prevents the error that arose after #288 narrowed filtr to one entry.

https://claude.ai/code/session_01VH4Ju4Xq9aW1AHuoVbjGEo

CLAUDE.md

@@ -167,7 +167,8 @@ Then run the following from the repo root to determine the version string to use
 currenttag=$(git describe --tags --abbrev=0 | sed 's/v//')
 currenttagfull=$(git describe --tags --abbrev=0)
 defaultbranch=$(git branch | cut -c 3- | grep -E '^master$|^main$')
-currentcommit=$(git rev-list --count ${currenttagfull}..${defaultbranch})
+git fetch origin ${defaultbranch} --quiet
+currentcommit=$(git rev-list --count ${currenttagfull}..origin/${defaultbranch})
 currentversion="${currenttag}.$((currentcommit + 9001 + 1))"
 echo "$currentversion"
 ```

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: AMR
-Version: 3.0.1.9053
-Date: 2026-04-27
+Version: 3.0.1.9059
+Date: 2026-05-06
 Title: Antimicrobial Resistance Data Analysis
 Description: Functions to simplify and standardise antimicrobial resistance (AMR)
   data analysis and to work with microbial and antimicrobial properties by

NAMESPACE

@@ -49,6 +49,7 @@ S3method(as.data.frame,mo)
 S3method(as.double,mic)
 S3method(as.double,sir)
 S3method(as.list,custom_eucast_rules)
+S3method(as.list,custom_interpretive_rules)
 S3method(as.list,custom_mdro_guideline)
 S3method(as.list,mic)
 S3method(as.matrix,mic)
@@ -66,6 +67,7 @@ S3method(c,ab)
 S3method(c,amr_selector)
 S3method(c,av)
 S3method(c,custom_eucast_rules)
+S3method(c,custom_interpretive_rules)
 S3method(c,custom_mdro_guideline)
 S3method(c,disk)
 S3method(c,mic)
@@ -96,6 +98,7 @@ S3method(print,amr_selector)
 S3method(print,av)
 S3method(print,bug_drug_combinations)
 S3method(print,custom_eucast_rules)
+S3method(print,custom_interpretive_rules)
 S3method(print,custom_mdro_guideline)
 S3method(print,deprecated_amr_dataset)
 S3method(print,disk)
@@ -228,6 +231,7 @@ export(count_df)
 export(count_resistant)
 export(count_susceptible)
 export(custom_eucast_rules)
+export(custom_interpretive_rules)
 export(custom_mdro_guideline)
 export(eucast_dosage)
 export(eucast_exceptional_phenotypes)
@@ -296,6 +300,7 @@ export(mo_is_yeast)
 export(mo_kingdom)
 export(mo_lpsn)
 export(mo_matching_score)
+export(mo_morphology)
 export(mo_mycobank)
 export(mo_name)
 export(mo_order)

NEWS.md

@@ -1,64 +1,38 @@
-# AMR 3.0.1.9053
+# AMR 3.0.1.9059
 
-This will become release v3.1.0, intended for launch end of May.
+Planned as v3.1.0, May 2026.
 
 ### New
-* Support for clinical breakpoints of 2026 of both CLSI and EUCAST, by adding all of their over 5,700 new clinical breakpoints to the `clinical_breakpoints` data set for usage in `as.sir()`. EUCAST 2026 is now the new default guideline for all MIC and disk diffusion interpretations.
-* Support for the [`future`](https://future.futureverse.org) package and its framework, as the previous implementation of parallel computing was slow
-  - **Breaking change**: `as.sir()` with `parallel = TRUE` now requires a non-sequential `future::plan()` to be active before the call — e.g., `future::plan(future::multisession)` — and throws an informative error if none is set.
-  - New all-core usage setup: when the number of AB columns is smaller than the number of available cores, rows are now split into batches so all cores stay active (row-batch mode). Previously, a 6-column dataset on a 16-core machine would only use 6 cores; now all 16 are used, with each worker processing a smaller row slice (lower per-worker memory pressure and processing time)
-* Integration with the *tidymodels* framework to allow seamless use of SIR, MIC and disk data in modelling pipelines via `recipes`
-  - `step_mic_log2()` to transform `<mic>` columns with log2, and `step_sir_numeric()` to convert `<sir>` columns to numeric
-  - New `tidyselect` helpers:
-    - `all_sir()`, `all_sir_predictors()`
-    - `all_mic()`, `all_mic_predictors()`
-    - `all_disk()`, `all_disk_predictors()`
-* Data set `esbl_isolates` to practise with AMR modelling
-* AMR selectors `ionophores()`, `peptides()`, `phosphonics()` and `spiropyrimidinetriones()`
-* Support for Wildtype (WT) / Non-wildtype (NWT) in `as.sir()`, all plotting functions, and all susceptibility/resistance functions.
-  - `as.sir()` gained an argument `as_wt_nwt`, which defaults to `TRUE` only when `breakpoint_type = "ECOFF"` (#254)
-  - This transforms the output from S/R to WT/NWT
-  - Functions such as `susceptibility()` count WT as S and NWT as R
-* Function `interpretive_rules()`, which allows future implementation of CLSI interpretive rules (#235)
-  - `eucast_rules()` has become a wrapper around that function
-  - Gained argument `add_if_missing` (default: `TRUE`). When set to `FALSE`, rules are only applied to cells that already contain an SIR value; `NA` cells are left untouched. This is useful with `overwrite = TRUE` to update reported results without imputing values for drugs that were not tested (#259)
-* Function `amr_course()`, which allows for automated download and unpacking of a GitHub repository for e.g. webinar use
-* Two new `NA` objects, `NA_ab_` and `NA_mo_`, analogous to base R's `NA_character_` and `NA_integer_`, for use in pipelines that require typed missing values
+* EUCAST 2026 and CLSI 2026 breakpoints: over 5,700 new breakpoints added to the `clinical_breakpoints` data set; EUCAST 2026 is now the default for all MIC and disk diffusion interpretations
+* Wildtype/Non-wildtype (WT/NWT) output when using ECOFF-based interpretation, by setting `breakpoint_type = "ECOFF"` in `as.sir()`; WT/NWT results are fully supported in all resistance/susceptibility functions and plots (#254)
+* Faster parallel computing via the `future` package; **breaking change**: a non-sequential plan (e.g. `future::plan(future::multisession)`) must be active before using `parallel = TRUE`; `antibiogram()` and `wisca()` now also support `parallel = TRUE` (#281)
+* *tidymodels* integration for using SIR, MIC and disk data in modelling pipelines: `step_mic_log2()`, `step_sir_numeric()`, and new column selectors `all_sir()`, `all_mic()`, `all_disk()`
+* New `esbl_isolates` data set for practising AMR modelling
+* New antimicrobial selectors: `ionophores()`, `peptides()`, `phosphonics()`, `spiropyrimidinetriones()`
+* New `interpretive_rules()`, a unified function for EUCAST and CLSI interpretive rules; `eucast_rules()` is now a wrapper around it (#235, #259)
+* New `amr_course()` to download and unpack course or webinar materials from GitHub in one call
+* Typed missing value constants `NA_ab_` and `NA_mo_`, for use in pipelines that need missing values of a specific class
 
 ### Fixes
-* Fixed a bug in `as.sir()` where values that were purely numeric (e.g., `"1"`) and matched the broad SIR-matching regex would be incorrectly stripped of all content by the Unicode letter filter
-* Fixed a bug in `as.mic()` where MIC values in scientific notation (e.g., `"1e-3"`) were incorrectly handled because the letter `e` was removed along with other Unicode letters; scientific notation `e` is now preserved
-* Fixed a bug in `as.ab()` where certain AB codes containing "PH" or "TH" (such as `ETH`, `MTH`, `PHE`, `PHN`, `STH`, `THA`, `THI1`) would incorrectly return `NA` when combined in a vector with any untranslatable value (#245)
-* Fixed a bug in `antibiogram()` for when no antimicrobials are set
-* Fixed a bug in `as.sir()` where for numeric input the arguments `S`,  `I`,  and `R` would not be considered (#244)
-* Fixed a bug in plotting MIC values when `keep_operators = "all"`
-* Fixed some foreign translations of antimicrobial drugs
-* Fixed a bug for printing column names to the console when using `mutate_at(vars(...), as.mic)` (#249)
-* Fixed a bug to disregard `NI` for susceptibility proportion functions
-* Fixed Italian translation of CoNS to Stafilococco coagulasi-negativo and CoPS to Stafilococco coagulasi-positivo (#256)
-* Fixed SIR and MIC coercion of combined values, e.g. `as.sir("<= 0.002; S") ` or `as.mic("S; 0.002")` (#252)
-* Fixed translation of foreign languages in `sir_df()` (#272)
-* Fixed BRMO classification by including bacterial complexes (#275)
-* Fixed `as.sir()` for data frames silently deleting columns whose AB class was already `<sir>` when called a second time (re-running on already-converted data) (#278)
-* Fixed `as.sir()` for data frames incorrectly treating metadata columns (e.g. `patient`, `ward`) as antibiotic columns when their names coincidentally matched an antibiotic code; column content is now validated against AMR data patterns before inclusion
-* Fixed `as.sir()` ignoring `info = FALSE` for columns with no breakpoints (e.g. cefoxitin against *E. coli*)
+* `as.sir()` on data frames: already-converted SIR columns no longer dropped on re-run (#278); metadata columns (e.g. `patient`, `ward`) no longer misidentified as antibiotic columns; `info = FALSE` now suppresses all messages, including for columns without breakpoints
+* `as.mic()`: values in scientific notation (e.g. `1e-3`) now handled correctly
+* `as.ab()`: codes containing "PH" or "TH" (e.g. `ETH`, `PHE`) no longer return `NA` when mixed with unrecognised input (#245)
+* Combined MIC/SIR input values (e.g. `"<= 0.002; S"` or `"S; 0.002"`) now parsed correctly (#252)
+* `as.mo()`: input of the form `"X complex"` now falls back to `"X"` when the complex is not a distinct taxon in the database, preventing `NA` results for valid clinical descriptions such as `"Proteus vulgaris complex"` (#287)
+* `mo_matching_score()`: abbreviated-genus input (e.g. `"S. apiospermum"`) now correctly ranks candidates whose species epithet exactly matches the input above more-prevalent organisms whose species does not match; fixes `"S. apiospermum"` resolving to *Staphylococcus* instead of *Scedosporium apiospermum* (#288)
+* `get_author_year()` in the microorganism reproduction script now strips `emend.` and everything after it, so `ref` reflects the combination authority rather than the emendation author (e.g. *Rhodococcus equi* now returns "Goodfellow et al., 1977" instead of "Nouioui et al., 2018")
+* BRMO classification now includes bacterial complexes (#275)
+* Translation fixes for Italian CoNS/CoPS names (#256), Dutch antimicrobials, and `sir_df()` foreign-language output (#272)
 
 ### Updates
-* `as.sir()` with `reference_data`: custom guideline names now correctly classify values as R using EUCAST convention (`> breakpoint_R` for MIC, `< breakpoint_R` for disk); custom breakpoints with `host = NA` now serve as a host-agnostic fallback when no host-specific row matches (#239)
-* Extensive `cli` integration for better message handling and clickable links in messages and warnings (#191, #265)
-* `mdro()` now infers resistance for a _missing_ base drug column from an _available_ corresponding drug+inhibitor combination showing resistance (e.g., piperacillin is absent but required, while piperacillin/tazobactam available and resistant). Can be set with the new argument `infer_from_combinations`, which defaults to `TRUE` (#209). Note that this can yield a higher MDRO detection (which is a good thing as it has become more reliable).
-* `susceptibility()` and `resistance()` gained the argument `guideline`, which defaults to EUCAST, for interpreting the 'I' category correctly.
-* Added to the `antimicrobials` data set: cefepime/taniborbactam (`FTA`), ceftibuten/avibactam (`CTA`), clorobiocin (`CLB`), kasugamycin (`KAS`), ostreogrycin (`OST`), taniborbactam (`TAN`), thiostrepton (`THS`), xeruborbactam (`XER`), and zorbamycin (`ZOR`)
-* `as.mic()` and `rescale_mic()` gained the argument `round_to_next_log2`, which can be set to `TRUE` to round all values up to the nearest next log2 level (#255)
-* `antimicrobials$group` is now a `list` instead of a `character`, to contain any group the drug is in (#246)
-* `ab_group()` gained an argument `all_groups` to return all groups the antimicrobial drug is in (#246)
-* Added explaining message to `as.sir()` when interpreting numeric values (e.g., 1 for S, 2 for I, 3 for R) (#244)
-* Updated handling of capped MIC values (`<`, `<=`, `>`, `>=`) in `as.sir()` in the argument `capped_mic_handling`: (#243)
-  * Introduced four clearly defined options: `"none"`, `"conservative"` (default), `"standard"`, and `"lenient"`
-  * Interpretation of capped MIC values now consistently returns `"NI"` (non-interpretable) when the true MIC could be at either side of a breakpoint, depending on the selected handling mode
-  * This results in more reliable behaviour compared to previous versions for capped MIC values
-  * Removed the `"inverse"` option, which has now become redundant
-* `ab_group()` now returns values consist with the AMR selectors (#246)
+* `custom_eucast_rules()` renamed to `custom_interpretive_rules()`; old name deprecated but still works (#268)
+* `mdro()` can now infer resistance from a drug+inhibitor combination when the base drug column is absent (e.g. piperacillin inferred from piperacillin/tazobactam); controlled via new `infer_from_combinations` argument (default `TRUE`) (#209)
+* `susceptibility()` / `resistance()`: new `guideline` argument (default EUCAST) to ensure the 'I' category is interpreted correctly per guideline
+* Capped MIC handling in `as.sir()` reworked into four clearly defined options: `"none"`, `"conservative"` (new default), `"standard"`, `"lenient"` (#243)
+* `as.mic()` / `rescale_mic()`: new `round_to_next_log2` argument to round values up to the nearest log2 dilution level (#255)
+* `antimicrobials$group` now a `list`, so drugs belonging to multiple groups are fully represented; use `ab_group(all_groups = TRUE)` to retrieve all groups for a drug (#246)
+* New antimicrobials added: cefepime/taniborbactam (`FTA`), ceftibuten/avibactam (`CTA`), clorobiocin (`CLB`), kasugamycin (`KAS`), ostreogrycin (`OST`), taniborbactam (`TAN`), thiostrepton (`THS`), xeruborbactam (`XER`), zorbamycin (`ZOR`)
+* Improved console messages with clickable links throughout, powered by `cli` (#191, #265)
 
 
 # AMR 3.0.1

R/aa_globals.R

@@ -27,7 +27,7 @@
 # how to conduct AMR data analysis: https://amr-for-r.org              #
 # ==================================================================== #
 
-# add new version numbers here, and add the rules themselves to "data-raw/eucast_rules.tsv" and clinical_breakpoints
+# add new version numbers here, and add the rules themselves to "data-raw/interpretive_rules.tsv" and clinical_breakpoints
 # (sourcing "data-raw/_pre_commit_checks.R" will process the TSV file)
 EUCAST_VERSION_BREAKPOINTS <- list(
   "16.0" = list(
@@ -221,6 +221,7 @@ globalVariables(c(
   "reference.rule",
   "reference.rule_group",
   "reference.version",
+  "rule.provider",
   "rowid",
   "rule_group",
   "rule_name",

R/antibiogram.R

@@ -54,7 +54,7 @@
 #' @param add_total_n *(deprecated in favour of `formatting_type`)* A [logical] to indicate whether `n_tested` available numbers per pathogen should be added to the table (default is `TRUE`). This will add the lowest and highest number of available isolates per antimicrobial (e.g, if for *E. coli* 200 isolates are available for ciprofloxacin and 150 for amoxicillin, the returned number will be "150-200"). This option is unavailable when `wisca = TRUE`; in that case, use [retrieve_wisca_parameters()] to get the parameters used for WISCA.
 #' @param only_all_tested (for combination antibiograms): a [logical] to indicate that isolates must be tested for all antimicrobials, see *Details*.
 #' @param digits Number of digits to use for rounding the antimicrobial coverage, defaults to 1 for WISCA and 0 otherwise.
-#' @param formatting_type Numeric value (1–22 for WISCA, 1-12 for non-WISCA) indicating how the 'cells' of the antibiogram table should be formatted. See *Details* > *Formatting Type* for a list of options.
+#' @param formatting_type Numeric value (1-22 for WISCA, 1-12 for non-WISCA) indicating how the 'cells' of the antibiogram table should be formatted. See *Details* > *Formatting Type* for a list of options.
 #' @param col_mo Column name of the names or codes of the microorganisms (see [as.mo()]) - the default is the first column of class [`mo`]. Values will be coerced using [as.mo()].
 #' @param language Language to translate text, which defaults to the system language (see [get_AMR_locale()]).
 #' @param minimum The minimum allowed number of available (tested) isolates. Any isolate count lower than `minimum` will return `NA` with a warning. The default number of `30` isolates is advised by the Clinical and Laboratory Standards Institute (CLSI) as best practice, see *Source*.
@@ -65,6 +65,7 @@
 #' @param simulations (for WISCA) a numerical value to set the number of Monte Carlo simulations.
 #' @param conf_interval A numerical value to set confidence interval (default is `0.95`).
 #' @param interval_side The side of the confidence interval, either `"two-tailed"` (default), `"left"` or `"right"`.
+#' @param parallel A [logical] to indicate if parallel computing must be used, defaults to `FALSE`. Requires the [`future.apply`][future.apply::future_lapply()] package. For WISCA, Monte Carlo simulations are distributed across workers; for grouped antibiograms, each group is processed by a separate worker. **A non-sequential [future::plan()] must already be active before setting `parallel = TRUE`** -- for example, `future::plan(future::multisession)`. An error is thrown if `parallel = TRUE` is used without a plan set by the user.
 #' @param info A [logical] to indicate info should be printed - the default is `TRUE` only in interactive mode.
 #' @param object An [antibiogram()] object.
 #' @param ... When used in [R Markdown or Quarto][knitr::kable()]: arguments passed on to [knitr::kable()] (otherwise, has no use).
@@ -413,6 +414,7 @@ antibiogram <- function(x,
                         conf_interval = 0.95,
                         interval_side = "two-tailed",
                         info = interactive(),
+                        parallel = FALSE,
                         ...) {
   UseMethod("antibiogram")
 }
@@ -439,6 +441,7 @@ antibiogram.default <- function(x,
                                 conf_interval = 0.95,
                                 interval_side = "two-tailed",
                                 info = interactive(),
+                                parallel = FALSE,
                                 ...) {
   meet_criteria(x, allow_class = "data.frame")
   x <- ascertain_sir_classes(x, "x")
@@ -478,6 +481,35 @@ antibiogram.default <- function(x,
   meet_criteria(conf_interval, allow_class = c("numeric", "integer"), has_length = 1, is_finite = TRUE, is_positive = TRUE)
   meet_criteria(interval_side, allow_class = "character", has_length = 1, is_in = c("two-tailed", "left", "right"))
   meet_criteria(info, allow_class = "logical", has_length = 1)
+  meet_criteria(parallel, allow_class = "logical", has_length = 1)
+
+  # parallel gate - identical pattern to as.sir()
+  if (requireNamespace("future.apply", quietly = TRUE) && !inherits(future::plan(), "sequential")) {
+    if (isFALSE(parallel)) {
+      message_("Assuming {.code parallel = TRUE} since parallel computing has been set up using the {.pkg future} package before. Set {.help [{.fun plan}](future::plan)} to sequential to prevent this.")
+    }
+    parallel <- TRUE
+  }
+  if (isTRUE(parallel)) {
+    stop_ifnot(
+      requireNamespace("future.apply", quietly = TRUE),
+      "Setting {.code parallel = TRUE} requires the {.pkg future.apply} package.\n",
+      "Install it with {.code install.packages(\"future.apply\")}."
+    )
+    stop_if(inherits(future::plan(), "sequential"),
+      "Setting {.code parallel = TRUE} requires a non-sequential {.help [{.fun future::plan}](future::plan)} to be active.\n",
+      "For your system, you could first run: {.code library(future); ",
+      ifelse(.Platform$OS.type == "windows" || in_rstudio(),
+        "plan(multisession)",
+        "plan(multicore)"
+      ),
+      "}",
+      call = FALSE
+    )
+    n_workers <- future::nbrOfWorkers()
+  } else {
+    n_workers <- 1L
+  }
 
   # try to find columns based on type
   if (is.null(col_mo)) {
@@ -705,52 +737,97 @@ antibiogram.default <- function(x,
 
     wisca_parameters <- out
 
-    progress <- progress_ticker(
-      n = length(unique(wisca_parameters$group)) * simulations,
-      n_min = 25,
-      print = info,
-      title = paste("Calculating WISCA for", length(unique(wisca_parameters$group)), "regimens")
-    )
-    on.exit(close(progress))
-
-    # run WISCA per group
-    for (group in unique(wisca_parameters$group)) {
-      params_current <- wisca_parameters[wisca_parameters$group == group, , drop = FALSE]
-      if (sum(params_current$n_tested, na.rm = TRUE) == 0) {
-        next
-      }
-
-      # prepare priors
-      priors_current <- create_wisca_priors(params_current)
-
-      # Monte Carlo simulations
-      coverage_simulations <- vapply(
-        FUN.VALUE = double(1),
-        seq_len(simulations), function(i) {
-          progress$tick()
-          simulate_coverage(priors_current)
-        }
-      )
-
-      # summarise results
-      coverage_mean <- mean(coverage_simulations)
-
-      if (interval_side == "two-tailed") {
-        probs <- c((1 - conf_interval) / 2, 1 - (1 - conf_interval) / 2)
-      } else if (interval_side == "left") {
-        probs <- c(0, conf_interval)
-      } else if (interval_side == "right") {
-        probs <- c(1 - conf_interval, 1)
-      }
-
-      coverage_ci <- unname(stats::quantile(coverage_simulations, probs = probs))
-
-      out_wisca$coverage[out_wisca$group == group] <- coverage_mean
-      out_wisca$lower_ci[out_wisca$group == group] <- coverage_ci[1]
-      out_wisca$upper_ci[out_wisca$group == group] <- coverage_ci[2]
+    # quantile probabilities are constant across all groups
+    probs <- if (interval_side == "two-tailed") {
+      c((1 - conf_interval) / 2, 1 - (1 - conf_interval) / 2)
+    } else if (interval_side == "left") {
+      c(0, conf_interval)
+    } else {
+      c(1 - conf_interval, 1)
     }
 
-    close(progress)
+    unique_groups <- as.character(unique(wisca_parameters$group))
+
+    use_parallel_wisca <- isTRUE(parallel) && n_workers > 1L && length(unique_groups) > 0L
+
+    if (use_parallel_wisca) {
+      if (isTRUE(info)) {
+        message_("Running WISCA in parallel mode using ", n_workers, " workers...", as_note = FALSE, appendLF = FALSE)
+      }
+      # chunks_per_group gives ~n_workers total jobs so all workers stay busy
+      # even when the number of regimens is smaller than n_workers
+      chunks_per_group <- max(1L, ceiling(n_workers / length(unique_groups)))
+      chunk_sizes <- diff(c(0L, round(seq_len(chunks_per_group) * simulations / chunks_per_group)))
+
+      # precompute priors per group and build (group, chunk) job list
+      jobs <- unlist(lapply(unique_groups, function(g) {
+        params_g <- wisca_parameters[wisca_parameters$group == g, , drop = FALSE]
+        if (sum(params_g$n_tested, na.rm = TRUE) == 0L) {
+          return(NULL)
+        }
+        priors_g <- create_wisca_priors(params_g)
+        lapply(seq_along(chunk_sizes), function(ch) {
+          list(group = g, priors = priors_g, n_sims = chunk_sizes[ch])
+        })
+      }), recursive = FALSE)
+      jobs <- Filter(Negate(is.null), jobs)
+
+      flat <- future.apply::future_lapply(jobs, function(job) {
+        vapply(FUN.VALUE = double(1), seq_len(job$n_sims), function(i) {
+          simulate_coverage(job$priors)
+        })
+      }, future.seed = TRUE)
+
+      # reassemble per group: concatenate chunks, then summarise
+      for (g in unique_groups) {
+        g_idx <- vapply(jobs, function(j) identical(j$group, g), logical(1))
+        if (!any(g_idx)) next
+        sims <- unlist(flat[g_idx], use.names = FALSE)
+        out_wisca$coverage[out_wisca$group == g] <- mean(sims)
+        ci_vals <- unname(stats::quantile(sims, probs = probs))
+        out_wisca$lower_ci[out_wisca$group == g] <- ci_vals[1]
+        out_wisca$upper_ci[out_wisca$group == g] <- ci_vals[2]
+      }
+
+      if (isTRUE(info)) message_(font_green_bg(" DONE "), as_note = FALSE)
+    } else {
+      progress <- progress_ticker(
+        n = length(unique_groups) * simulations,
+        n_min = 25,
+        print = info,
+        title = paste("Calculating WISCA for", length(unique_groups), "regimens")
+      )
+      on.exit(close(progress), add = TRUE)
+
+      for (group in unique_groups) {
+        params_current <- wisca_parameters[wisca_parameters$group == group, , drop = FALSE]
+        if (sum(params_current$n_tested, na.rm = TRUE) == 0) next
+        priors_current <- create_wisca_priors(params_current)
+        coverage_simulations <- vapply(
+          FUN.VALUE = double(1),
+          seq_len(simulations), function(i) {
+            progress$tick()
+            simulate_coverage(priors_current)
+          }
+        )
+        out_wisca$coverage[out_wisca$group == group] <- mean(coverage_simulations)
+        ci_vals <- unname(stats::quantile(coverage_simulations, probs = probs))
+        out_wisca$lower_ci[out_wisca$group == group] <- ci_vals[1]
+        out_wisca$upper_ci[out_wisca$group == group] <- ci_vals[2]
+      }
+      close(progress)
+      if (isTRUE(info) && simulations >= 500 && length(unique_groups) >= 3) {
+        suggest <- ifelse(.Platform$OS.type == "windows" || in_rstudio(),
+          "plan(multisession)",
+          "plan(multicore)"
+        )
+        if (requireNamespace("future.apply", quietly = TRUE)) {
+          message_("Running in sequential mode. To speed up WISCA, set a parallel {.help [{.fun future::plan}](future::plan)} such as {.code ", suggest, "} and use {.code parallel = TRUE}.")
+        } else {
+          message_("Running in sequential mode. To speed up WISCA, install the {.pkg future.apply} package and then set {.code parallel = TRUE}.")
+        }
+      }
+    }
 
     # final output preparation
     out <- out_wisca
@@ -997,30 +1074,52 @@ antibiogram.grouped_df <- function(x,
                                    conf_interval = 0.95,
                                    interval_side = "two-tailed",
                                    info = interactive(),
+                                   parallel = FALSE,
                                    ...) {
   stop_ifnot(is.null(mo_transform), "{.arg mo_transform} must not be set if creating an antibiogram using a grouped tibble. The groups will become the variables over which the antimicrobials are calculated, which could include the pathogen information (though not necessary). Nonetheless, this makes {.arg mo_transform} redundant.", call = FALSE)
   stop_ifnot(is.null(syndromic_group), "{.arg syndromic_group} must not be set if creating an antibiogram using a grouped tibble. The groups will become the variables over which the antimicrobials are calculated, making {.arg syndromic_group} redundant.", call = FALSE)
+  meet_criteria(parallel, allow_class = "logical", has_length = 1)
+
   groups <- attributes(x)$groups
   n_groups <- NROW(groups)
-  progress <- progress_ticker(
-    n = n_groups,
-    n_min = 5,
-    print = info,
-    title = paste("Calculating AMR for", n_groups, "groups")
-  )
-  on.exit(close(progress))
 
-  out <- NULL
-  wisca_parameters <- NULL
-  long_numeric <- NULL
-
-  for (i in seq_len(n_groups)) {
-    progress$tick()
-    rows <- unlist(groups[i, ]$.rows)
-    if (length(rows) == 0) {
-      next
+  # parallel gate - identical pattern to as.sir()
+  if (requireNamespace("future.apply", quietly = TRUE) && !inherits(future::plan(), "sequential")) {
+    if (isFALSE(parallel)) {
+      message_("Assuming {.code parallel = TRUE} since parallel computing has been set up using the {.pkg future} package before. Set {.help [{.fun plan}](future::plan)} to sequential to prevent this.")
     }
-    new_out <- antibiogram(as.data.frame(x)[rows, , drop = FALSE],
+    parallel <- TRUE
+  }
+  if (isTRUE(parallel)) {
+    stop_ifnot(
+      requireNamespace("future.apply", quietly = TRUE),
+      "Setting {.code parallel = TRUE} requires the {.pkg future.apply} package.\n",
+      "Install it with {.code install.packages(\"future.apply\")}."
+    )
+    stop_if(inherits(future::plan(), "sequential"),
+      "Setting {.code parallel = TRUE} requires a non-sequential {.help [{.fun future::plan}](future::plan)} to be active.\n",
+      "For your system, you could first run: {.code library(future); ",
+      ifelse(.Platform$OS.type == "windows" || in_rstudio(),
+        "plan(multisession)",
+        "plan(multicore)"
+      ),
+      "}",
+      call = FALSE
+    )
+    n_workers <- future::nbrOfWorkers()
+  } else {
+    n_workers <- 1L
+  }
+
+  use_parallel <- isTRUE(parallel) && n_workers > 1L && n_groups > 1L
+
+  x_df <- as.data.frame(x)
+  run_group <- function(i) {
+    rows <- unlist(groups[i, ]$.rows)
+    if (length(rows) == 0L) {
+      return(NULL)
+    }
+    antibiogram(x_df[rows, , drop = FALSE],
       antimicrobials = antimicrobials,
       mo_transform = NULL,
       ab_transform = ab_transform,
@@ -1040,12 +1139,42 @@ antibiogram.grouped_df <- function(x,
       conf_interval = conf_interval,
       interval_side = interval_side,
       info = FALSE,
-      ...
+      parallel = FALSE # never nest parallelism in workers
     )
+  }
+
+  if (use_parallel) {
+    if (isTRUE(info)) {
+      message_("Running antibiogram for ", n_groups, " groups in parallel using ", n_workers, " workers...", as_note = FALSE, appendLF = FALSE)
+    }
+    results_raw <- future.apply::future_lapply(seq_len(n_groups), run_group, future.seed = TRUE)
+    if (isTRUE(info)) message_(font_green_bg(" DONE "), as_note = FALSE)
+  } else {
+    progress <- progress_ticker(
+      n = n_groups,
+      n_min = 5,
+      print = info,
+      title = paste("Calculating AMR for", n_groups, "groups")
+    )
+    on.exit(close(progress), add = TRUE)
+    results_raw <- vector("list", n_groups)
+    for (i in seq_len(n_groups)) {
+      progress$tick()
+      results_raw[[i]] <- run_group(i)
+    }
+    close(progress)
+  }
+
+  out <- NULL
+  wisca_parameters <- NULL
+  long_numeric <- NULL
+
+  for (i in seq_len(n_groups)) {
+    new_out <- results_raw[[i]]
     new_wisca_parameters <- attributes(new_out)$wisca_parameters
     new_long_numeric <- attributes(new_out)$long_numeric
 
-    if (NROW(new_out) == 0) {
+    if (is.null(new_out) || NROW(new_out) == 0) {
       next
     }
 
@@ -1071,8 +1200,7 @@ antibiogram.grouped_df <- function(x,
       new_long_numeric <- new_long_numeric[, c(col_name, setdiff(names(new_long_numeric), col_name))] # set place to 1st col
     }
 
-    if (i == 1) {
-      # the first go
+    if (is.null(out)) {
       out <- new_out
       wisca_parameters <- new_wisca_parameters
       long_numeric <- new_long_numeric
@@ -1083,8 +1211,6 @@ antibiogram.grouped_df <- function(x,
     }
   }
 
-  close(progress)
-
   out <- structure(as_original_data_class(out, class(x), extra_class = "antibiogram"),
     has_syndromic_group = FALSE,
     combine_SI = isTRUE(combine_SI),
@@ -1116,6 +1242,7 @@ wisca <- function(x,
                   conf_interval = 0.95,
                   interval_side = "two-tailed",
                   info = interactive(),
+                  parallel = FALSE,
                   ...) {
   antibiogram(
     x = x,
@@ -1137,6 +1264,7 @@ wisca <- function(x,
     conf_interval = conf_interval,
     interval_side = interval_side,
     info = info,
+    parallel = parallel,
     ...
   )
 }
@@ -1206,7 +1334,7 @@ retrieve_wisca_parameters <- function(wisca_model, ...) {
 #' @rawNamespace if(getRversion() >= "3.0.0") S3method(pillar::tbl_sum, antibiogram)
 tbl_sum.antibiogram <- function(x, ...) {
   dims <- paste(format(NROW(x), big.mark = ","), AMR_env$cross_icon, format(NCOL(x), big.mark = ","))
-  names(dims) <- "An Antibiogram"
+  names(dims) <- "An antibiogram"
   if (isTRUE(attributes(x)$wisca)) {
     dims <- c(dims, Type = paste0("WISCA with ", attributes(x)$conf_interval * 100, "% CI"))
   } else if (isTRUE(attributes(x)$formatting_type >= 13)) {
@@ -1226,8 +1354,7 @@ tbl_format_footer.antibiogram <- function(x, ...) {
   }
   c(footer, font_subtle(paste0(
     "# Use `ggplot2::autoplot()` or base R `plot()` to create a plot of this antibiogram,\n",
-    "# or use it directly in R Markdown or ",
-    font_url("https://quarto.org", "Quarto"), ", see ", word_wrap("?antibiogram")
+    "# or use it directly in R Markdown or Quarto, see ", word_wrap("?antibiogram")
   )))
 }
 

R/bug_drug_combinations.R

@@ -129,16 +129,21 @@ bug_drug_combinations <- function(x,
       # turn and merge everything
       pivot <- lapply(x_mo_filter, function(x) {
         m <- as.matrix(table(as.sir(x), useNA = "always"))
+        na_idx <- which(is.na(rownames(m)))
+        get_row <- function(lbl) {
+          idx <- which(rownames(m) == lbl)
+          if (length(idx) == 1L) unname(m[idx, ]) else rep(0L, ncol(m))
+        }
         data.frame(
-          S = m["S", ],
-          SDD = m["SDD", ],
-          I = m["I", ],
-          R = m["R", ],
-          NI = m["NI", ],
-          WT = m["WT", ],
-          NWT = m["NWT", ],
-          NS = m["NS", ],
-          na = m[which(is.na(rownames(m))), ],
+          S = get_row("S"),
+          SDD = get_row("SDD"),
+          I = get_row("I"),
+          R = get_row("R"),
+          NI = get_row("NI"),
+          WT = get_row("WT"),
+          NWT = get_row("NWT"),
+          NS = get_row("NS"),
+          na = if (length(na_idx) == 1L) unname(m[na_idx, ]) else rep(0L, ncol(m)),
           stringsAsFactors = FALSE
         )
       })

R/custom_interpretive_rules.R

@@ -27,27 +27,27 @@
 # how to conduct AMR data analysis: https://amr-for-r.org              #
 # ==================================================================== #
 
-#' Define Custom EUCAST Rules
+#' Define Custom Interpretive Rules
 #'
-#' Define custom EUCAST rules for your organisation or specific analysis and use the output of this function in [eucast_rules()].
+#' Define custom interpretive rules for your organisation or specific analysis and use the output of this function in [interpretive_rules()].
 #' @param ... Rules in [formula][base::tilde] notation, see below for instructions, and in *Examples*.
 #' @details
-#' Some organisations have their own adoption of EUCAST rules. This function can be used to define custom EUCAST rules to be used in the [eucast_rules()] function.
+#' Some organisations have their own adoption of interpretive rules. This function can be used to define custom rules to be used in the [interpretive_rules()] function.
 #'
 #' ### Basics
 #'
 #' If you are familiar with the [`case_when()`][dplyr::case_when()] function of the `dplyr` package, you will recognise the input method to set your own rules. Rules must be set using what \R considers to be the 'formula notation'. The rule itself is written *before* the tilde (`~`) and the consequence of the rule is written *after* the tilde:
 #'
 #' ```r
-#' x <- custom_eucast_rules(TZP == "S" ~ aminopenicillins == "S",
-#'                          TZP == "R" ~ aminopenicillins == "R")
+#' x <- custom_interpretive_rules(TZP == "S" ~ aminopenicillins == "S",
+#'                                TZP == "R" ~ aminopenicillins == "R")
 #' ```
 #'
-#' These are two custom EUCAST rules: if TZP (piperacillin/tazobactam) is "S", all aminopenicillins (ampicillin and amoxicillin) must be made "S", and if TZP is "R", aminopenicillins must be made "R". These rules can also be printed to the console, so it is immediately clear how they work:
+#' These are two custom interpretive rules: if TZP (piperacillin/tazobactam) is "S", all aminopenicillins (ampicillin and amoxicillin) must be made "S", and if TZP is "R", aminopenicillins must be made "R". These rules can also be printed to the console, so it is immediately clear how they work:
 #'
 #' ```r
 #' x
-#' #> A set of custom EUCAST rules:
+#' #> A set of custom interpretive rules:
 #' #>
 #' #>   1. If TZP is "S" then set to  S :
 #' #>      amoxicillin (AMX), ampicillin (AMP)
@@ -68,11 +68,11 @@
 #' #> 1      Escherichia coli   R    S     S
 #' #> 2 Klebsiella pneumoniae   R    S     S
 #'
-#' eucast_rules(df,
-#'              rules = "custom",
-#'              custom_rules = x,
-#'              info = FALSE,
-#'              overwrite = TRUE)
+#' interpretive_rules(df,
+#'                    rules = "custom",
+#'                    custom_rules = x,
+#'                    info = FALSE,
+#'                    overwrite = TRUE)
 #' #>                      mo TZP ampi cipro
 #' #> 1      Escherichia coli   R    R     S
 #' #> 2 Klebsiella pneumoniae   R    R     S
@@ -83,16 +83,16 @@
 #' There is one exception in columns used for the rules: all column names of the [microorganisms] data set can also be used, but do not have to exist in the data set. These column names are: `r vector_and(colnames(microorganisms), sort = FALSE, documentation = TRUE)`. Thus, this next example will work as well, despite the fact that the `df` data set does not contain a column `genus`:
 #'
 #' ```r
-#' y <- custom_eucast_rules(
+#' y <- custom_interpretive_rules(
 #'   TZP == "S" & genus == "Klebsiella" ~ aminopenicillins == "S",
 #'   TZP == "R" & genus == "Klebsiella" ~ aminopenicillins == "R"
 #' )
 #'
-#' eucast_rules(df,
-#'              rules = "custom",
-#'              custom_rules = y,
-#'              info = FALSE,
-#'              overwrite = TRUE)
+#' interpretive_rules(df,
+#'                    rules = "custom",
+#'                    custom_rules = y,
+#'                    info = FALSE,
+#'                    overwrite = TRUE)
 #' #>                      mo TZP ampi cipro
 #' #> 1      Escherichia coli   R    S     S
 #' #> 2 Klebsiella pneumoniae   R    R     S
@@ -109,9 +109,9 @@
 #' Rules can also be applied to multiple antimicrobials and antimicrobial groups simultaneously. Use the `c()` function to combine multiple antimicrobials. For instance, the following example sets all aminopenicillins and ureidopenicillins to "R" if column TZP (piperacillin/tazobactam) is "R":
 #'
 #' ```r
-#' x <- custom_eucast_rules(TZP == "R" ~ c(aminopenicillins, ureidopenicillins) == "R")
+#' x <- custom_interpretive_rules(TZP == "R" ~ c(aminopenicillins, ureidopenicillins) == "R")
 #' x
-#' #> A set of custom EUCAST rules:
+#' #> A set of custom interpretive rules:
 #' #>
 #' #>   1. If TZP is "R" then set to "R":
 #' #>      amoxicillin (AMX), ampicillin (AMP), azlocillin (AZL), mezlocillin (MEZ), piperacillin (PIP), piperacillin/tazobactam (TZP)
@@ -123,7 +123,7 @@
 #' @returns A [list] containing the custom rules
 #' @export
 #' @examples
-#' x <- custom_eucast_rules(
+#' x <- custom_interpretive_rules(
 #'   AMC == "R" & genus == "Klebsiella" ~ aminopenicillins == "R",
 #'   AMC == "I" & genus == "Klebsiella" ~ aminopenicillins == "I"
 #' )
@@ -141,24 +141,24 @@
 #' # combine rule sets
 #' x2 <- c(
 #'   x,
-#'   custom_eucast_rules(TZP == "R" ~ carbapenems == "R")
+#'   custom_interpretive_rules(TZP == "R" ~ carbapenems == "R")
 #' )
 #' x2
-custom_eucast_rules <- function(...) {
+custom_interpretive_rules <- function(...) {
   dots <- tryCatch(list(...),
     error = function(e) "error"
   )
   stop_if(
     identical(dots, "error"),
-    "rules must be a valid formula inputs (e.g., using '~'), see {.help [{.fun custom_eucast_rules}](AMR::custom_eucast_rules)}"
+    "rules must be a valid formula inputs (e.g., using '~'), see {.help [{.fun custom_interpretive_rules}](AMR::custom_interpretive_rules)}"
   )
   n_dots <- length(dots)
-  stop_if(n_dots == 0, "no custom rules were set. Please read the documentation using {.help [{.fun custom_eucast_rules}](AMR::custom_eucast_rules)}.")
+  stop_if(n_dots == 0, "no custom rules were set. Please read the documentation using {.help [{.fun custom_interpretive_rules}](AMR::custom_interpretive_rules)}.")
   out <- vector("list", n_dots)
   for (i in seq_len(n_dots)) {
     stop_ifnot(
       inherits(dots[[i]], "formula"),
-      "rule ", i, " must be a valid formula input (e.g., using '~'), see {.help [{.fun custom_eucast_rules}](AMR::custom_eucast_rules)}"
+      "rule ", i, " must be a valid formula input (e.g., using '~'), see {.help [{.fun custom_interpretive_rules}](AMR::custom_interpretive_rules)}"
     )
 
     # Query
@@ -180,7 +180,7 @@ custom_eucast_rules <- function(...) {
     result <- dots[[i]][[3]]
     stop_ifnot(
       deparse(result) %like% "==",
-      "the result of rule ", i, " (the part after the `~`) must contain `==`, such as in `... ~ ampicillin == \"R\"`, see {.help [{.fun custom_eucast_rules}](AMR::custom_eucast_rules)}"
+      "the result of rule ", i, " (the part after the `~`) must contain `==`, such as in `... ~ ampicillin == \"R\"`, see {.help [{.fun custom_interpretive_rules}](AMR::custom_interpretive_rules)}"
     )
     result_group <- as.character(result)[[2]]
     result_group <- as.character(str2lang(result_group))
@@ -230,13 +230,13 @@ custom_eucast_rules <- function(...) {
   }
 
   names(out) <- paste0("rule", seq_len(n_dots))
-  set_clean_class(out, new_class = c("custom_eucast_rules", "list"))
+  set_clean_class(out, new_class = c("custom_interpretive_rules", "list"))
 }
 
-#' @method c custom_eucast_rules
+#' @method c custom_interpretive_rules
 #' @noRd
 #' @export
-c.custom_eucast_rules <- function(x, ...) {
+c.custom_interpretive_rules <- function(x, ...) {
   if (length(list(...)) == 0) {
     return(x)
   }
@@ -245,21 +245,21 @@ c.custom_eucast_rules <- function(x, ...) {
     out <- c(out, unclass(e))
   }
   names(out) <- paste0("rule", seq_len(length(out)))
-  set_clean_class(out, new_class = c("custom_eucast_rules", "list"))
+  set_clean_class(out, new_class = c("custom_interpretive_rules", "list"))
 }
 
-#' @method as.list custom_eucast_rules
+#' @method as.list custom_interpretive_rules
 #' @noRd
 #' @export
-as.list.custom_eucast_rules <- function(x, ...) {
+as.list.custom_interpretive_rules <- function(x, ...) {
   c(x, ...)
 }
 
-#' @method print custom_eucast_rules
+#' @method print custom_interpretive_rules
 #' @export
 #' @noRd
-print.custom_eucast_rules <- function(x, ...) {
-  cat("A set of custom EUCAST rules:\n")
+print.custom_interpretive_rules <- function(x, ...) {
+  cat("A set of custom interpretive rules:\n")
   for (i in seq_len(length(x))) {
     rule <- x[[i]]
     rule$query <- format_custom_query_rule(rule$query)
@@ -291,3 +291,19 @@ print.custom_eucast_rules <- function(x, ...) {
     cat("\n  ", rule_if, "\n", rule_then, "\n", sep = "")
   }
 }
+
+# Backward-compat S3 dispatch for objects created with the old custom_eucast_rules() function
+#' @method c custom_eucast_rules
+#' @noRd
+#' @export
+c.custom_eucast_rules <- function(x, ...) c.custom_interpretive_rules(x, ...)
+
+#' @method as.list custom_eucast_rules
+#' @noRd
+#' @export
+as.list.custom_eucast_rules <- function(x, ...) as.list.custom_interpretive_rules(x, ...)
+
+#' @method print custom_eucast_rules
+#' @export
+#' @noRd
+print.custom_eucast_rules <- function(x, ...) print.custom_interpretive_rules(x, ...)

R/data.R

@@ -109,8 +109,9 @@
 #' - `status` \cr Status of the taxon, either `r vector_or(microorganisms$status, documentation = TRUE)`
 #' - `kingdom`, `phylum`, `class`, `order`, `family`, `genus`, `species`, `subspecies`\cr Taxonomic rank of the microorganism. Note that for fungi, *phylum* is equal to their taxonomic *division*. Also, for fungi, *subkingdom* and *subdivision* were left out since they do not occur in the bacterial taxonomy.
 #' - `rank`\cr Text of the taxonomic rank of the microorganism, such as `"species"` or `"genus"`
-#' - `ref`\cr Author(s) and year of related scientific publication. This contains only the *first surname* and year of the *latest* authors, e.g. "Wallis *et al.* 2006 *emend.* Smith and Jones 2018" becomes "Smith *et al.*, 2018". This field is directly retrieved from the source specified in the column `source`. Moreover, accents were removed to comply with CRAN that only allows ASCII characters.
+#' - `ref`\cr Abbreviated authority citation for the nomenclatural act that established the current name combination, following ICNP conventions. For species described in their current genus (*sp. nov.*), this is the original description author(s) and year. For species transferred to a different genus (*comb. nov.*), this is the reclassification author(s) and year. Emendations are excluded. For synonyms, this is the authority under which the synonym was originally published. This field is directly retrieved from the source specified in the column `source`. Diacritics were removed to comply with CRAN, that only allows ASCII characters.
 #' - `oxygen_tolerance` \cr Oxygen tolerance, either `r vector_or(microorganisms$oxygen_tolerance, documentation = TRUE)`. These data were retrieved from BacDive (see *Source*). Items that contain "likely" are missing from BacDive and were extrapolated from other species within the same genus to guess the oxygen tolerance. Currently `r round(length(microorganisms$oxygen_tolerance[which(!is.na(microorganisms$oxygen_tolerance))]) / nrow(microorganisms[which(microorganisms$kingdom == "Bacteria"), ]) * 100, 1)`% of all `r format_included_data_number(nrow(microorganisms[which(microorganisms$kingdom == "Bacteria"), ]))` bacteria in the data set contain an oxygen tolerance.
+#' - `morphology` \cr Morphology (cell shape), either `r vector_or(microorganisms$morphology, documentation = TRUE)`. These data were retrieved from BacDive (see *Source*). Genera that are clinically established as coccobacilli (the HACEK group and beyond, such as *Haemophilus* and *Acinetobacter*) are classified as such regardless of BacDive majority vote. Items that contain "likely" are missing from BacDive and were extrapolated from other species within the same genus. Currently `r round(length(microorganisms$morphology[which(!is.na(microorganisms$morphology))]) / nrow(microorganisms[which(microorganisms$kingdom == "Bacteria"), ]) * 100, 1)`% of all `r format_included_data_number(nrow(microorganisms[which(microorganisms$kingdom == "Bacteria"), ]))` bacteria in the data set contain a morphology.
 #' - `source`\cr Either `r vector_or(microorganisms$source, documentation = TRUE)` (see *Source*)
 #' - `lpsn`\cr Identifier ('Record number') of `r TAXONOMY_VERSION$LPSN$name`. This will be the first/highest LPSN identifier to keep one identifier per row. For example, *Acetobacter ascendens* has LPSN Record number 7864 and 11011. Only the first is available in the `microorganisms` data set. ***This is a unique identifier***, though available for only `r format_included_data_number(sum(!is.na(microorganisms$lpsn)))` records.
 #' - `lpsn_parent`\cr LPSN identifier of the parent taxon

R/interpretive_rules.R

@@ -62,17 +62,17 @@ format_eucast_version_nr <- function(version, markdown = TRUE) {
 #' @param x A data set with antimicrobials columns, such as `amox`, `AMX` and `AMC`.
 #' @param info A [logical] to indicate whether progress should be printed to the console - the default is only print while in interactive sessions.
 #' @param guideline A guideline name, either "EUCAST" (default) or "CLSI". This can be set with the package option [`AMR_guideline`][AMR-options].
-#' @param rules A [character] vector that specifies which rules should be applied. Must be one or more of `"breakpoints"`, `"expected_phenotypes"`, `"expert"`, `"other"`, `"custom"`, `"all"`, and defaults to `c("breakpoints", "expected_phenotypes")`. The default value can be set to another value using the package option [`AMR_interpretive_rules`][AMR-options]: `options(AMR_interpretive_rules = "all")`. If using `"custom"`, be sure to fill in argument `custom_rules` too. Custom rules can be created with [custom_eucast_rules()].
+#' @param rules A [character] vector that specifies which rules should be applied. Must be one or more of `"breakpoints"`, `"expected_phenotypes"`, `"expert"`, `"other"`, `"custom"`, `"all"`, and defaults to `c("breakpoints", "expected_phenotypes")`. The default value can be set to another value using the package option [`AMR_interpretive_rules`][AMR-options]: `options(AMR_interpretive_rules = "all")`. If using `"custom"`, be sure to fill in argument `custom_rules` too. Custom rules can be created with [custom_interpretive_rules()].
 #' @param verbose A [logical] to turn Verbose mode on and off (default is off). In Verbose mode, the function does not apply rules to the data, but instead returns a data set in logbook form with extensive info about which rows and columns would be effected and in which way. Using Verbose mode takes a lot more time.
 #' @param version_breakpoints The version number to use for the EUCAST Clinical Breakpoints guideline. Can be `r vector_or(names(EUCAST_VERSION_BREAKPOINTS), documentation = TRUE, reverse = TRUE)`.
 #' @param version_expected_phenotypes The version number to use for the EUCAST Expected Phenotypes. Can be `r vector_or(names(EUCAST_VERSION_EXPECTED_PHENOTYPES), documentation = TRUE, reverse = TRUE)`.
 #' @param version_expertrules The version number to use for the EUCAST Expert Rules and Intrinsic Resistance guideline. Can be `r vector_or(names(EUCAST_VERSION_EXPERT_RULES), documentation = TRUE, reverse = TRUE)`.
-#' @param ampc_cephalosporin_resistance (only applies when `rules` contains `"expert"` or `"all"`) a [character] value that should be applied to cefotaxime, ceftriaxone and ceftazidime for AmpC de-repressed cephalosporin-resistant mutants - the default is `NA`. Currently only works when `version_expertrules` is `3.2` and higher; these versions of '*EUCAST Expert Rules on Enterobacterales*' state that results of cefotaxime, ceftriaxone and ceftazidime should be reported with a note, or results should be suppressed (emptied) for these three drugs. A value of `NA` (the default) for this argument will remove results for these three drugs, while e.g. a value of `"R"` will make the results for these drugs resistant. Use `NULL` or `FALSE` to not alter results for these three drugs of AmpC de-repressed cephalosporin-resistant mutants. Using `TRUE` is equal to using `"R"`. \cr For *EUCAST Expert Rules* v3.2, this rule applies to: `r vector_and(gsub("[^a-zA-Z ]+", "", unlist(strsplit(EUCAST_RULES_DF[which(EUCAST_RULES_DF$reference.version %in% c(3.2, 3.3) & EUCAST_RULES_DF$reference.rule %like% "ampc"), "this_value"][1], "|", fixed = TRUE))), quotes = "*")`.
+#' @param ampc_cephalosporin_resistance (only applies when `rules` contains `"expert"` or `"all"`) a [character] value that should be applied to cefotaxime, ceftriaxone and ceftazidime for AmpC de-repressed cephalosporin-resistant mutants - the default is `NA`. Currently only works when `version_expertrules` is `3.2` and higher; these versions of '*EUCAST Expert Rules on Enterobacterales*' state that results of cefotaxime, ceftriaxone and ceftazidime should be reported with a note, or results should be suppressed (emptied) for these three drugs. A value of `NA` (the default) for this argument will remove results for these three drugs, while e.g. a value of `"R"` will make the results for these drugs resistant. Use `NULL` or `FALSE` to not alter results for these three drugs of AmpC de-repressed cephalosporin-resistant mutants. Using `TRUE` is equal to using `"R"`. \cr For *EUCAST Expert Rules* v3.2, this rule applies to: `r vector_and(gsub("[^a-zA-Z ]+", "", unlist(strsplit(INTERPRETIVE_RULES_DF[which(INTERPRETIVE_RULES_DF$reference.version %in% c(3.2, 3.3) & INTERPRETIVE_RULES_DF$reference.rule %like% "ampc"), "this_value"][1], "|", fixed = TRUE))), quotes = "*")`.
 #' @param ... Column names of antimicrobials. To automatically detect antimicrobial column names, do not provide any named arguments; [guess_ab_col()] will then be used for detection. To manually specify a column, provide its name (case-insensitive) as an argument, e.g. `AMX = "amoxicillin"`. To skip a specific antimicrobial, set it to `NULL`, e.g. `TIC = NULL` to exclude ticarcillin. If a manually defined column does not exist in the data, it will be skipped with a warning.
 #' @param ab Any (vector of) text that can be coerced to a valid antimicrobial drug code with [as.ab()].
 #' @param administration Route of administration, either `r vector_or(dosage$administration, documentation = TRUE)`.
 #' @param only_sir_columns A [logical] to indicate whether only antimicrobial columns must be included that were transformed to class [sir][as.sir()] on beforehand. Defaults to `FALSE` if no columns of `x` have a class [sir][as.sir()].
-#' @param custom_rules Custom rules to apply, created with [custom_eucast_rules()].
+#' @param custom_rules Custom rules to apply, created with [custom_interpretive_rules()].
 #' @param overwrite A [logical] indicating whether to overwrite existing SIR values (default: `FALSE`). When `FALSE`, only non-SIR values are modified (i.e., any value that is not already S, I or R). To ensure compliance with EUCAST guidelines, **this should remain** `FALSE`, as EUCAST notes often state that an organism "should be tested for susceptibility to individual agents or be reported resistant".
 #' @param add_if_missing A [logical] indicating whether rules should also be applied to missing (`NA`) values (default: `TRUE`). When `FALSE`, rules are only applied to cells that already contain an SIR value; cells with `NA` are left untouched. This is particularly useful when using `overwrite = TRUE` with custom rules and you want to update reported results without imputing values for untested drugs.
 #' @inheritParams first_isolate
@@ -80,17 +80,17 @@ format_eucast_version_nr <- function(version, markdown = TRUE) {
 #' **Note:** This function does not translate MIC or disk values to SIR values. Use [as.sir()] for that. \cr
 #' **Note:** When ampicillin (AMP, J01CA01) is not available but amoxicillin (AMX, J01CA04) is, the latter will be used for all rules where there is a dependency on ampicillin. These drugs are interchangeable when it comes to expression of antimicrobial resistance. \cr
 #'
-#' The file containing all EUCAST rules is located here: <https://github.com/msberends/AMR/blob/main/data-raw/eucast_rules.tsv>.  **Note:** Old taxonomic names are replaced with the current taxonomy where applicable. For example, *Ochrobactrum anthropi* was renamed to *Brucella anthropi* in 2020; the original EUCAST rules v3.1 and v3.2 did not yet contain this new taxonomic name. The `AMR` package contains the full microbial taxonomy updated until `r documentation_date(max(TAXONOMY_VERSION$GBIF$accessed_date, TAXONOMY_VERSION$LPSN$accessed_date))`, see [microorganisms].
+#' The file containing all interpretive rules is located here: <https://github.com/msberends/AMR/blob/main/data-raw/interpretive_rules.tsv>.  **Note:** Old taxonomic names are replaced with the current taxonomy where applicable. For example, *Ochrobactrum anthropi* was renamed to *Brucella anthropi* in 2020; the original EUCAST rules v3.1 and v3.2 did not yet contain this new taxonomic name. The `AMR` package contains the full microbial taxonomy updated until `r documentation_date(max(TAXONOMY_VERSION$GBIF$accessed_date, TAXONOMY_VERSION$LPSN$accessed_date))`, see [microorganisms].
 #'
 #' ### Custom Rules
 #'
-#' Custom rules can be created using [custom_eucast_rules()], e.g.:
+#' Custom rules can be created using [custom_interpretive_rules()], e.g.:
 #'
 #' ```r
-#' x <- custom_eucast_rules(AMC == "R" & genus == "Klebsiella" ~ aminopenicillins == "R",
-#'                          AMC == "I" & genus == "Klebsiella" ~ aminopenicillins == "I")
+#' x <- custom_interpretive_rules(AMC == "R" & genus == "Klebsiella" ~ aminopenicillins == "R",
+#'                                AMC == "I" & genus == "Klebsiella" ~ aminopenicillins == "I")
 #'
-#' eucast_rules(example_isolates, rules = "custom", custom_rules = x)
+#' interpretive_rules(example_isolates, rules = "custom", custom_rules = x)
 #' ```
 #'
 #' ### 'Other' Rules
@@ -102,7 +102,7 @@ format_eucast_version_nr <- function(version, markdown = TRUE) {
 #'
 #' Important examples include amoxicillin and amoxicillin/clavulanic acid, and trimethoprim and trimethoprim/sulfamethoxazole. Needless to say, for these rules to work, both drugs must be available in the data set.
 #'
-#' Since these rules are not officially approved by EUCAST, they are not applied at default. To use these rules, include `"other"` to the `rules` argument, or use `eucast_rules(..., rules = "all")`. You can also set the package option [`AMR_interpretive_rules`][AMR-options], i.e. run `options(AMR_interpretive_rules = "all")`.
+#' Since these rules are not officially approved by EUCAST, they are not applied at default. To use these rules, include `"other"` to the `rules` argument, or use `interpretive_rules(..., rules = "all")`. You can also set the package option [`AMR_interpretive_rules`][AMR-options], i.e. run `options(AMR_interpretive_rules = "all")`.
 #' @aliases EUCAST
 #' @rdname interpretive_rules
 #' @export
@@ -184,7 +184,7 @@ interpretive_rules <- function(x,
   meet_criteria(version_expertrules, allow_class = c("numeric", "integer"), has_length = 1, is_in = as.double(names(EUCAST_VERSION_EXPERT_RULES)))
   meet_criteria(ampc_cephalosporin_resistance, allow_class = c("logical", "character", "sir"), has_length = 1, allow_NA = TRUE, allow_NULL = TRUE)
   meet_criteria(only_sir_columns, allow_class = "logical", has_length = 1)
-  meet_criteria(custom_rules, allow_class = "custom_eucast_rules", allow_NULL = TRUE)
+  meet_criteria(custom_rules, allow_class = c("custom_interpretive_rules", "custom_eucast_rules"), allow_NULL = TRUE)
   meet_criteria(overwrite, allow_class = "logical", has_length = 1)
   meet_criteria(add_if_missing, allow_class = "logical", has_length = 1)
 
@@ -193,11 +193,6 @@ interpretive_rules <- function(x,
     "Either set {.arg overwrite} or {.arg add_if_missing} to {.code TRUE}, or both."
   )
 
-  stop_if(
-    guideline == "CLSI",
-    "CLSI guideline is not yet supported."
-  )
-
   stop_if(
     !is.na(ampc_cephalosporin_resistance) && !any(c("expert", "all") %in% rules),
     "For the {.arg ampc_cephalosporin_resistance} argument to work, the {.arg rules} argument must contain {.code \"expert\"} or {.code \"all\"}."
@@ -205,8 +200,14 @@ interpretive_rules <- function(x,
 
   add_MO_lookup_to_AMR_env()
 
+  if (guideline %like% "EUCAST") {
+    guideline <- "EUCAST"
+  } else if (guideline %like% "CLSI") {
+    guideline <- "CLSI"
+  }
+
   if ("custom" %in% rules && is.null(custom_rules)) {
-    warning_("in {.help [{.fun eucast_rules}](AMR::eucast_rules)}: no custom rules were set with the {.arg custom_rules} argument",
+    warning_("in {.help [{.fun interpretive_rules}](AMR::interpretive_rules)}: no custom rules were set with the {.arg custom_rules} argument",
       immediate = TRUE
     )
     rules <- rules[rules != "custom"]
@@ -229,13 +230,13 @@ interpretive_rules <- function(x,
 
   if (interactive() && isTRUE(verbose) && isTRUE(info)) {
     txt <- paste0(
-      "WARNING: In Verbose mode, the eucast_rules() function does not apply rules to the data, but instead returns a data set in logbook form with comprehensive info about which rows and columns would be effected and in which way.",
+      "WARNING: In Verbose mode, the interpretive_rules() function does not apply rules to the data, but instead returns a data set in logbook form with comprehensive info about which rows and columns would be effected and in which way.",
       "\n\nThis may overwrite your existing data if you use e.g.:",
-      "\ndata <- eucast_rules(data, verbose = TRUE)\n\nDo you want to continue?"
+      "\ndata <- interpretive_rules(data, verbose = TRUE)\n\nDo you want to continue?"
     )
     showQuestion <- import_fn("showQuestion", "rstudioapi", error_on_fail = FALSE)
     if (!is.null(showQuestion)) {
-      q_continue <- showQuestion("Using verbose = TRUE with eucast_rules()", txt)
+      q_continue <- showQuestion("Using verbose = TRUE with interpretive_rules()", txt)
     } else {
       q_continue <- utils::menu(choices = c("OK", "Cancel"), graphics = FALSE, title = txt)
     }
@@ -330,7 +331,7 @@ interpretive_rules <- function(x,
     verbose = verbose,
     info = info,
     only_sir_columns = only_sir_columns,
-    fn = "eucast_rules",
+    fn = "interpretive_rules",
     ...
   )
 
@@ -489,7 +490,7 @@ interpretive_rules <- function(x,
           "Rules by the ",
           font_bold(paste0("AMR package v", utils::packageDescription("AMR")$Version)),
           " (", format(as.Date(utils::packageDescription("AMR")$Date), format = "%Y"),
-          "), see {.help [{.fun eucast_rules}](AMR::eucast_rules)}\n"
+          "), see {.help [{.fun interpretive_rules}](AMR::interpretive_rules)}\n"
         )
       ))
       cat("\n\n")
@@ -611,59 +612,62 @@ interpretive_rules <- function(x,
 
   if (!any(c("all", "custom") %in% rules) && !is.null(custom_rules)) {
     if (isTRUE(info)) {
-      message_("Skipping custom EUCAST rules, since the {.arg rules} argument does not contain {.code \"custom\"}.")
+      message_("Skipping custom interpretive rules, since the {.arg rules} argument does not contain {.code \"custom\"}.")
     }
     custom_rules <- NULL
   }
 
-  # >>> Apply Official EUCAST rules <<< ---------------------------------------------------
+  # >>> Apply Official interpretive rules <<< ---------------------------------------------------
   eucast_notification_shown <- FALSE
-  if (!is.null(list(...)$eucast_rules_df)) {
-    # this allows: eucast_rules(x, eucast_rules_df = AMR:::EUCAST_RULES_DF |> filter(is.na(have_these_values)))
-    eucast_rules_df_total <- list(...)$eucast_rules_df
+  if (!is.null(list(...)$interpretive_rules_df)) {
+    # this allows: interpretive_rules(x, interpretive_rules_df = AMR:::INTERPRETIVE_RULES_DF |> filter(is.na(have_these_values)))
+    interpretive_rules_df_total <- list(...)$interpretive_rules_df
+  } else if (!is.null(list(...)$eucast_rules_df)) {
+    # deprecated parameter name kept for backward compatibility
+    interpretive_rules_df_total <- list(...)$eucast_rules_df
   } else {
-    # otherwise internal data file, created in data-raw/_pre_commit_checks.R
-    eucast_rules_df_total <- EUCAST_RULES_DF
+    # internal data file, created in data-raw/_pre_commit_checks.R
+    interpretive_rules_df_total <- INTERPRETIVE_RULES_DF
   }
 
-  ## filter on user-set guideline versions ----
-  eucast_rules_df <- data.frame()
+  ## filter on guideline provider and user-set guideline versions ----
+  interpretive_rules_df <- data.frame()
   if (any(c("all", "breakpoints") %in% rules)) {
-    eucast_rules_df <- eucast_rules_df %pm>%
-      rbind_AMR(eucast_rules_df_total %pm>%
-        subset(reference.rule_group %like% "breakpoint" & reference.version == version_breakpoints))
+    interpretive_rules_df <- interpretive_rules_df %pm>%
+      rbind_AMR(interpretive_rules_df_total %pm>%
+        subset(rule.provider == guideline & reference.rule_group %like% "breakpoint" & reference.version == version_breakpoints))
   }
   if (any(c("all", "expected_phenotypes") %in% rules)) {
-    eucast_rules_df <- eucast_rules_df %pm>%
-      rbind_AMR(eucast_rules_df_total %pm>%
-        subset(reference.rule_group %like% "expected" & reference.version == version_expected_phenotypes))
+    interpretive_rules_df <- interpretive_rules_df %pm>%
+      rbind_AMR(interpretive_rules_df_total %pm>%
+        subset(rule.provider == guideline & reference.rule_group %like% "expected" & reference.version == version_expected_phenotypes))
   }
   if (any(c("all", "expert") %in% rules)) {
-    eucast_rules_df <- eucast_rules_df %pm>%
-      rbind_AMR(eucast_rules_df_total %pm>%
-        subset(reference.rule_group %like% "expert" & reference.version == version_expertrules))
+    interpretive_rules_df <- interpretive_rules_df %pm>%
+      rbind_AMR(interpretive_rules_df_total %pm>%
+        subset(rule.provider == guideline & reference.rule_group %like% "expert" & reference.version == version_expertrules))
   }
   ## filter out AmpC de-repressed cephalosporin-resistant mutants ----
   # no need to filter on version number here - the rules contain these version number, so are inherently filtered
   # cefotaxime, ceftriaxone, ceftazidime
   if (is.null(ampc_cephalosporin_resistance) || isFALSE(ampc_cephalosporin_resistance)) {
-    eucast_rules_df <- subset(
-      eucast_rules_df,
+    interpretive_rules_df <- subset(
+      interpretive_rules_df,
       reference.rule %unlike% "ampc"
     )
   } else {
     if (isTRUE(ampc_cephalosporin_resistance)) {
       ampc_cephalosporin_resistance <- "R"
     }
-    if (!is.null(eucast_rules_df$reference.rule)) {
-      eucast_rules_df[which(eucast_rules_df$reference.rule %like% "ampc"), "to_value"] <- as.character(ampc_cephalosporin_resistance)
+    if (!is.null(interpretive_rules_df$reference.rule)) {
+      interpretive_rules_df[which(interpretive_rules_df$reference.rule %like% "ampc"), "to_value"] <- as.character(ampc_cephalosporin_resistance)
     }
   }
 
   # sometimes, the screenings are missing but the names are actually available
-  # we only hints on remaining rows in `eucast_rules_df`
+  # we only hints on remaining rows in `interpretive_rules_df`
   screening_abx <- as.character(AMR::antimicrobials$ab[which(AMR::antimicrobials$ab %like% "-S$")])
-  screening_abx <- screening_abx[screening_abx %in% unique(unlist(strsplit(EUCAST_RULES_DF$and_these_antibiotics[!is.na(EUCAST_RULES_DF$and_these_antibiotics)], ", *")))]
+  screening_abx <- screening_abx[screening_abx %in% unique(unlist(strsplit(interpretive_rules_df_total$and_these_antibiotics[!is.na(interpretive_rules_df_total$and_these_antibiotics)], ", *")))]
   if (isTRUE(info)) {
     cat("\n")
   }
@@ -682,12 +686,12 @@ interpretive_rules <- function(x,
   }
 
   ## Go over all rules and apply them ----
-  for (i in seq_len(nrow(eucast_rules_df))) {
-    rule_previous <- eucast_rules_df[max(1, i - 1), "reference.rule", drop = TRUE]
-    rule_current <- eucast_rules_df[i, "reference.rule", drop = TRUE]
-    rule_next <- eucast_rules_df[min(nrow(eucast_rules_df), i + 1), "reference.rule", drop = TRUE]
-    rule_group_previous <- eucast_rules_df[max(1, i - 1), "reference.rule_group", drop = TRUE]
-    rule_group_current <- eucast_rules_df[i, "reference.rule_group", drop = TRUE]
+  for (i in seq_len(nrow(interpretive_rules_df))) {
+    rule_previous <- interpretive_rules_df[max(1, i - 1), "reference.rule", drop = TRUE]
+    rule_current <- interpretive_rules_df[i, "reference.rule", drop = TRUE]
+    rule_next <- interpretive_rules_df[min(nrow(interpretive_rules_df), i + 1), "reference.rule", drop = TRUE]
+    rule_group_previous <- interpretive_rules_df[max(1, i - 1), "reference.rule_group", drop = TRUE]
+    rule_group_current <- interpretive_rules_df[i, "reference.rule_group", drop = TRUE]
     # don't apply rules if user doesn't want to apply them
     if (rule_group_current %like% "breakpoint" && !any(c("all", "breakpoints") %in% rules)) {
       next
@@ -702,16 +706,16 @@ interpretive_rules <- function(x,
     if (isFALSE(info) || isFALSE(verbose)) {
       rule_text <- ""
     } else {
-      if (is.na(eucast_rules_df[i, "and_these_antibiotics", drop = TRUE])) {
-        rule_text <- paste0("always report as '", eucast_rules_df[i, "to_value", drop = TRUE], "': ", get_antibiotic_names(eucast_rules_df[i, "then_change_these_antibiotics", drop = TRUE]))
+      if (is.na(interpretive_rules_df[i, "and_these_antibiotics", drop = TRUE])) {
+        rule_text <- paste0("always report as '", interpretive_rules_df[i, "to_value", drop = TRUE], "': ", get_antibiotic_names(interpretive_rules_df[i, "then_change_these_antibiotics", drop = TRUE]))
       } else {
         rule_text <- paste0(
-          "report as '", eucast_rules_df[i, "to_value", drop = TRUE], "' when ",
+          "report as '", interpretive_rules_df[i, "to_value", drop = TRUE], "' when ",
           format_antibiotic_names(
-            ab_names = get_antibiotic_names(eucast_rules_df[i, "and_these_antibiotics", drop = TRUE]),
-            ab_results = eucast_rules_df[i, "have_these_values", drop = TRUE]
+            ab_names = get_antibiotic_names(interpretive_rules_df[i, "and_these_antibiotics", drop = TRUE]),
+            ab_results = interpretive_rules_df[i, "have_these_values", drop = TRUE]
           ), ": ",
-          get_antibiotic_names(eucast_rules_df[i, "then_change_these_antibiotics", drop = TRUE])
+          get_antibiotic_names(interpretive_rules_df[i, "then_change_these_antibiotics", drop = TRUE])
         )
       }
     }
@@ -720,7 +724,7 @@ interpretive_rules <- function(x,
       rule_previous <- ""
       rule_group_previous <- ""
     }
-    if (i == nrow(eucast_rules_df)) {
+    if (i == nrow(interpretive_rules_df)) {
       rule_next <- ""
     }
 
@@ -789,13 +793,13 @@ interpretive_rules <- function(x,
     }
 
     ## Get rule from file ------------------------------------------------------
-    if_mo_property <- trimws(eucast_rules_df[i, "if_mo_property", drop = TRUE])
-    like_is_one_of <- trimws(eucast_rules_df[i, "like.is.one_of", drop = TRUE])
-    mo_value <- trimws(eucast_rules_df[i, "this_value", drop = TRUE])
-    source_antibiotics <- eucast_rules_df[i, "and_these_antibiotics", drop = TRUE]
-    source_value <- trimws(unlist(strsplit(eucast_rules_df[i, "have_these_values", drop = TRUE], ",", fixed = TRUE)))
-    target_antibiotics <- eucast_rules_df[i, "then_change_these_antibiotics", drop = TRUE]
-    target_value <- eucast_rules_df[i, "to_value", drop = TRUE]
+    if_mo_property <- trimws(interpretive_rules_df[i, "if_mo_property", drop = TRUE])
+    like_is_one_of <- trimws(interpretive_rules_df[i, "like.is.one_of", drop = TRUE])
+    mo_value <- trimws(interpretive_rules_df[i, "this_value", drop = TRUE])
+    source_antibiotics <- interpretive_rules_df[i, "and_these_antibiotics", drop = TRUE]
+    source_value <- trimws(unlist(strsplit(interpretive_rules_df[i, "have_these_values", drop = TRUE], ",", fixed = TRUE)))
+    target_antibiotics <- interpretive_rules_df[i, "then_change_these_antibiotics", drop = TRUE]
+    target_value <- interpretive_rules_df[i, "to_value", drop = TRUE]
 
     # if amo_value contains a group name, expand that name with all species in it
     if (any(trimws(strsplit(mo_value, ",")[[1]]) %in% AMR::microorganisms.groups$mo_group_name, na.rm = TRUE)) {
@@ -894,7 +898,7 @@ interpretive_rules <- function(x,
   if (!is.null(custom_rules)) {
     if (isTRUE(info)) {
       cat("\n")
-      cat(font_bold("Custom EUCAST rules, set by user"), "\n")
+      cat(font_bold("Custom interpretive rules, set by user"), "\n")
     }
     for (i in seq_len(length(custom_rules))) {
       rule <- custom_rules[[i]]
@@ -929,8 +933,8 @@ interpretive_rules <- function(x,
         to = target_value,
         rule = c(
           rule_text,
-          "Custom EUCAST rules",
-          paste0("Custom EUCAST rule ", i),
+          "Custom interpretive rules",
+          paste0("Custom interpretive rule ", i),
           paste0(
             "Object '", deparse(substitute(custom_rules)),
             "' consisting of ", length(custom_rules), " custom rules"
@@ -1075,7 +1079,7 @@ interpretive_rules <- function(x,
     warn_lacking_sir_class <- warn_lacking_sir_class[order(colnames(x.bak))]
     warn_lacking_sir_class <- warn_lacking_sir_class[!is.na(warn_lacking_sir_class)]
     warning_(
-      "in {.help [{.fun eucast_rules}](AMR::eucast_rules)}: not all columns with antimicrobial results are of class {.cls sir}. Transform them on beforehand, e.g.:\n\n",
+      "in {.help [{.fun interpretive_rules}](AMR::interpretive_rules)}: not all columns with antimicrobial results are of class {.cls sir}. Transform them on beforehand, e.g.:\n\n",
       "\u00a0\u00a0", AMR_env$bullet_icon, " ", highlight_code(paste0(x_deparsed, " |> as.sir(", ifelse(length(warn_lacking_sir_class) == 1,
         warn_lacking_sir_class,
         paste0(warn_lacking_sir_class[1], ":", warn_lacking_sir_class[length(warn_lacking_sir_class)])
@@ -1177,7 +1181,7 @@ edit_sir <- function(x,
         new_edits[rows, cols] == "NS")
     non_SIR <- !isSIR
     if (isFALSE(overwrite) && any(isSIR) && message_not_thrown_before("edit_sir.warning_overwrite")) {
-      warning_("in {.help [{.fun eucast_rules}](AMR::eucast_rules)}: some columns had SIR values which were not overwritten, since {.code overwrite = FALSE}.")
+      warning_("in {.help [{.fun interpretive_rules}](AMR::interpretive_rules)}: some columns had SIR values which were not overwritten, since {.code overwrite = FALSE}.")
     }
     # determine which cells to modify based on overwrite and add_if_missing
     if (isTRUE(overwrite)) {
@@ -1211,7 +1215,7 @@ edit_sir <- function(x,
           })
           suppressWarnings(do_assign())
           warning_(
-            "in {.help [{.fun eucast_rules}](AMR::eucast_rules)}: value \"", to, "\" added to the factor levels of column",
+            "in {.help [{.fun interpretive_rules}](AMR::interpretive_rules)}: value \"", to, "\" added to the factor levels of column",
             ifelse(length(cols) == 1, "", "s"),
             " ", vector_and(cols, quotes = "`", sort = FALSE),
             " because this value was not an existing factor level."
@@ -1219,7 +1223,7 @@ edit_sir <- function(x,
           txt_warning()
           warned <<- FALSE
         } else {
-          warning_("in {.help [{.fun eucast_rules}](AMR::eucast_rules)}: ", w$message)
+          warning_("in {.help [{.fun interpretive_rules}](AMR::interpretive_rules)}: ", w$message)
           txt_warning()
         }
       },

R/mo.R

@@ -322,6 +322,15 @@ as.mo <- function(x,
         return(as.character(MO_lookup_current$mo[match(x_out, MO_lookup_current$fullname_lower)]))
       }
 
+      # Issue #287: "X complex" is not a distinct taxon - strip " complex" and try "X"
+      if (grepl(" complex$", x_out, ignore.case = FALSE)) {
+        x_out <- sub(" complex$", "", x_out)
+        x_search_cleaned <- sub(" [Cc]omplex$", "", x_search_cleaned)
+        if (x_out %in% MO_lookup_current$fullname_lower) {
+          return(as.character(MO_lookup_current$mo[match(x_out, MO_lookup_current$fullname_lower)]))
+        }
+      }
+
       # input must not be too short
       if (nchar(x_out) < 3) {
         return("UNKNOWN")
@@ -343,6 +352,18 @@ as.mo <- function(x,
             (MO_lookup_current$species_first == substr(x_parts[2], 1, 1) |
               MO_lookup_current$subspecies_first == substr(x_parts[2], 1, 1) |
               MO_lookup_current$subspecies_first == substr(x_parts[3], 1, 1)))
+          # Issue #288: if the species (and subspecies) word(s) in the input exactly match
+          # exactly one candidate, use only that candidate and bypass the 0.55 cutoff.
+          # This prevents prevalent bacteria from outranking a rarer organism whose species
+          # epithet is an unambiguous exact match, e.g. "S. apiospermum" → Scedosporium.
+          sp_exact <- tolower(MO_lookup_current$species[filtr]) == x_parts[2]
+          if (length(x_parts) == 3) {
+            sp_exact <- sp_exact & tolower(MO_lookup_current$subspecies[filtr]) == x_parts[3]
+          }
+          if (sum(sp_exact) == 1) {
+            filtr <- filtr[sp_exact]
+            minimum_matching_score <- 0
+          }
         } else {
           filtr <- which(MO_lookup_current$full_first == substr(x_parts[1], 1, 1) |
             MO_lookup_current$species_first == substr(x_parts[2], 1, 1) |
@@ -1002,17 +1023,19 @@ print.mo_uncertainties <- function(x, n = 10, ...) {
       message_(out2, as_note = FALSE)
     }
 
-    other_matches <- paste0(
-      "Also matched: ",
-      vector_and(
-        paste0(
-          candidates_formatted,
-          font_blue(paste0(" (", scores_formatted, ")"), collapse = NULL)
-        ),
-        quotes = FALSE, sort = FALSE
+    if (x[i, ]$candidates != "") {
+      other_matches <- paste0(
+        "Also matched: ",
+        vector_and(
+          paste0(
+            candidates_formatted,
+            font_blue(paste0(" (", scores_formatted, ")"), collapse = NULL)
+          ),
+          quotes = FALSE, sort = FALSE
+        )
       )
-    )
-    message_(other_matches, as_note = FALSE)
+      message_(other_matches, as_note = FALSE)
+    }
   }
 
   if (isTRUE(any_maxed_out)) {

R/mo_property.R

@@ -42,21 +42,23 @@
 #' - `mo_ref("Enterobacter aerogenes")` will return `"Tindall et al., 2017"` (with a note about the renaming)
 #' - `mo_ref("Enterobacter aerogenes", keep_synonyms = TRUE)` will return `"Hormaeche et al., 1960"` (with a once-per-session warning that the name is outdated)
 #'
-#' The short name ([mo_shortname()]) returns the first character of the genus and the full species, such as `"E. coli"`, for species and subspecies. Exceptions are abbreviations of staphylococci (such as *"CoNS"*, Coagulase-Negative Staphylococci) and beta-haemolytic streptococci (such as *"GBS"*, Group B Streptococci). Please bear in mind that e.g. *E. coli* could mean *Escherichia coli* (kingdom of Bacteria) as well as *Entamoeba coli* (kingdom of Protozoa). Returning to the full name will be done using [as.mo()] internally, giving priority to bacteria and human pathogens, i.e. `"E. coli"` will be considered *Escherichia coli*. As a result, `mo_fullname(mo_shortname("Entamoeba coli"))` returns `"Escherichia coli"`.
+#' [mo_ref()] returns the abbreviated authority of the nomenclatural act that created the queried name combination. When `keep_synonyms = FALSE` (default), this is the authority of the currently accepted name. When `keep_synonyms = TRUE`, this is the authority under which the queried (possibly outdated) name was published. Emendations (changes to the species description without a name change) are not reflected; only the combination or original description authority is returned.
+#'
+#' The short name ([mo_shortname()]) returns the first character of the genus and the full species, such as `"E. coli"`, for species and subspecies. Exceptions are abbreviations of staphylococci (such as *"CoNS"*, Coagulase-Negative Staphylococci) and beta-haemolytic streptococci (such as *"GBS"*, Group B Streptococci). Please bear in mind that e.g. *E. coli* could mean *Escherichia coli* (kingdom of Bacteria) as well as *Entamoeba coli* (kingdom of Protozoa). Returning to the full name will be done using [as.mo()] internally, giving priority to bacteria and human pathogens, i.e. `"E. coli"` will always be considered *Escherichia coli*. As a result, `mo_fullname(mo_shortname("Entamoeba coli"))` returns `"Escherichia coli"`.
 #'
 #' Since the top-level of the taxonomy is sometimes referred to as 'kingdom' and sometimes as 'domain', the functions [mo_kingdom()] and [mo_domain()] return the exact same results.
 #'
 #' Determination of human pathogenicity ([mo_pathogenicity()]) is strongly based on Bartlett *et al.* (2022, \doi{10.1099/mic.0.001269}). This function returns a [factor] with the levels *Pathogenic*, *Potentially pathogenic*, *Non-pathogenic*, and *Unknown*.
 #'
-#' Determination of the Gram stain ([mo_gramstain()]) will be based on the taxonomic kingdom and phylum. Originally, Cavalier-Smith defined the so-called subkingdoms Negibacteria and Posibacteria (2002, [PMID 11837318](https://pubmed.ncbi.nlm.nih.gov/11837318/)), and only considered these phyla as Posibacteria: Actinobacteria, Chloroflexi, Firmicutes, and Tenericutes. These phyla were later renamed to Actinomycetota, Chloroflexota, Bacillota, and Mycoplasmatota (2021, [PMID 34694987](https://pubmed.ncbi.nlm.nih.gov/34694987/)). Bacteria in these phyla are considered Gram-positive in this `AMR` package, except for members of the class Negativicutes (within phylum Bacillota) which are Gram-negative. All other bacteria are considered Gram-negative. Species outside the kingdom of Bacteria will return a value `NA`. Functions [mo_is_gram_negative()] and [mo_is_gram_positive()] always return `TRUE` or `FALSE` (or `NA` when the input is `NA` or the MO code is `UNKNOWN`), thus always return `FALSE` for species outside the taxonomic kingdom of Bacteria.
+#' Determination of the Gram stain ([mo_gramstain()] is based on the taxonomic kingdom and phylum. Originally, Cavalier-Smith defined the so-called subkingdoms Negibacteria and Posibacteria (2002, [PMID 11837318](https://pubmed.ncbi.nlm.nih.gov/11837318/)), and only considered these phyla as Posibacteria: Actinobacteria, Chloroflexi, Firmicutes, and Tenericutes. These phyla were later renamed to Actinomycetota, Chloroflexota, Bacillota, and Mycoplasmatota (2021, [PMID 34694987](https://pubmed.ncbi.nlm.nih.gov/34694987/)). Bacteria in these phyla are considered Gram-positive in this `AMR` package, except for members of the class Negativicutes (within phylum Bacillota) which are Gram-negative. All other bacteria are considered Gram-negative. Species outside the kingdom of Bacteria will return a value `NA`. Functions [mo_is_gram_negative()] and [mo_is_gram_positive()] always return `TRUE` or `FALSE` (or `NA` when the input is `NA` or the MO code is `UNKNOWN`), thus always return `FALSE` for species outside the taxonomic kingdom of Bacteria.
 #'
-#' Determination of yeasts ([mo_is_yeast()]) will be based on the taxonomic kingdom and class. *Budding yeasts* are yeasts that reproduce asexually through a process called budding, where a new cell develops from a small protrusion on the parent cell. Taxonomically, these are members of the phylum Ascomycota, class Saccharomycetes (also called Hemiascomycetes) or Pichiomycetes. *True yeasts* quite specifically refers to yeasts in the underlying order Saccharomycetales (such as *Saccharomyces cerevisiae*). Thus, for all microorganisms that are member of the taxonomic class Saccharomycetes or Pichiomycetes, the function will return `TRUE`. It returns `FALSE` otherwise (or `NA` when the input is `NA` or the MO code is `UNKNOWN`).
+#' Determination of yeasts ([mo_is_yeast()]) is based on the taxonomic kingdom and class. *Budding yeasts* are yeasts that reproduce asexually through a process called budding, where a new cell develops from a small protrusion on the parent cell. Taxonomically, these are members of the phylum Ascomycota, class Saccharomycetes (also called Hemiascomycetes) or Pichiomycetes. *True yeasts* quite specifically refers to yeasts in the underlying order Saccharomycetales (such as *Saccharomyces cerevisiae*). Thus, for all microorganisms that are member of the taxonomic class Saccharomycetes or Pichiomycetes, the function will return `TRUE`. It returns `FALSE` otherwise (or `NA` when the input is `NA` or the MO code is `UNKNOWN`).
 #'
-#' Determination of intrinsic resistance ([mo_is_intrinsic_resistant()]) will be based on the [intrinsic_resistant] data set, which is based on `r format_eucast_version_nr(names(EUCAST_VERSION_EXPECTED_PHENOTYPES[1]))`. The [mo_is_intrinsic_resistant()] function can be vectorised over both argument `x` (input for microorganisms) and `ab` (input for antimicrobials).
+#' Determination of intrinsic resistance ([mo_is_intrinsic_resistant()]) is based on the [intrinsic_resistant] data set, which is based on `r format_eucast_version_nr(names(EUCAST_VERSION_EXPECTED_PHENOTYPES[1]))`. The [mo_is_intrinsic_resistant()] function can be vectorised over both argument `x` (input for microorganisms) and `ab` (input for antimicrobials).
 #'
-#' Determination of bacterial oxygen tolerance ([mo_oxygen_tolerance()]) will be based on BacDive, see *Source*. The function [mo_is_anaerobic()] only returns `TRUE` if the oxygen tolerance is `"anaerobe"`, indicting an obligate anaerobic species or genus. It always returns `FALSE` for species outside the taxonomic kingdom of Bacteria.
+#' Determination of both bacterial oxygen tolerance ([mo_oxygen_tolerance()]) and morphology ([mo_morphology()]) are  based on BacDive, see *Source*. The function [mo_is_anaerobic()] only returns `TRUE` if the oxygen tolerance is `"anaerobe"`, indicating an obligate anaerobic species or genus. It always returns `FALSE` for species outside the taxonomic kingdom of Bacteria.
 #'
-#' The function [mo_url()] will return the direct URL to the online database entry, which also shows the scientific reference of the concerned species. [This MycoBank URL](`r TAXONOMY_VERSION$MycoBank$url`) will be used for fungi wherever available , [this LPSN URL](`r TAXONOMY_VERSION$MycoBank$url`) for bacteria wherever available, and [this GBIF link](`r TAXONOMY_VERSION$GBIF$url`) otherwise.
+#' The function [mo_url()] will return the direct URL to the online database entry, which also shows the scientific reference of the concerned species. [This MycoBank URL](`r TAXONOMY_VERSION$MycoBank$url`) is used for fungi wherever available , [this LPSN URL](`r TAXONOMY_VERSION$MycoBank$url`) for bacteria wherever available, and [this GBIF link](`r TAXONOMY_VERSION$GBIF$url`) otherwise.
 #'
 #' SNOMED codes ([mo_snomed()]) was last updated on `r documentation_date(TAXONOMY_VERSION$SNOMED$accessed_date)`. See *Source* and the [microorganisms] data set for more info.
 #'
@@ -100,8 +102,10 @@
 #'
 #' # other properties ---------------------------------------------------------
 #'
-#' mo_pathogenicity("Klebsiella pneumoniae")
+#' mo_morphology("Klebsiella pneumoniae")
 #' mo_gramstain("Klebsiella pneumoniae")
+#' mo_gramstain("Klebsiella pneumoniae", add_morphology = TRUE)
+#' mo_pathogenicity("Klebsiella pneumoniae")
 #' mo_snomed("Klebsiella pneumoniae")
 #' mo_type("Klebsiella pneumoniae")
 #' mo_rank("Klebsiella pneumoniae")
@@ -460,8 +464,9 @@ mo_pathogenicity <- function(x, language = get_AMR_locale(), keep_synonyms = get
 }
 
 #' @rdname mo_property
+#' @param add_morphology a [logical] to indicate whether the morphology (from [mo_morphology()]) should be added to the Gram stain result, e.g. `"Gram-negative rods"` instead of `"Gram-negative"`. The default is `FALSE`.
 #' @export
-mo_gramstain <- function(x, language = get_AMR_locale(), keep_synonyms = getOption("AMR_keep_synonyms", FALSE), ...) {
+mo_gramstain <- function(x, language = get_AMR_locale(), keep_synonyms = getOption("AMR_keep_synonyms", FALSE), add_morphology = FALSE, ...) {
   if (missing(x)) {
     # this tries to find the data and an 'mo' column
     x <- find_mo_col(fn = "mo_gramstain")
@@ -469,6 +474,7 @@ mo_gramstain <- function(x, language = get_AMR_locale(), keep_synonyms = getOpti
   meet_criteria(x, allow_NA = TRUE)
   language <- validate_language(language)
   meet_criteria(keep_synonyms, allow_class = "logical", has_length = 1)
+  meet_criteria(add_morphology, allow_class = "logical", has_length = 1)
 
   x.mo <- as.mo(x, language = language, keep_synonyms = keep_synonyms, ...)
   metadata <- get_mo_uncertainties()
@@ -494,6 +500,12 @@ mo_gramstain <- function(x, language = get_AMR_locale(), keep_synonyms = getOpti
   # and of course our own ID for Gram-positives
   | x.mo %in% c("B_GRAMP", "B_ANAER-POS")] <- "Gram-positive"
 
+  if (isTRUE(add_morphology)) {
+    morphs <- mo_morphology(x.mo, language = NULL)
+    morphs[is.na(x)] <- ""
+    x[!is.na(x)] <- paste(x[!is.na(x)], tolower(morphs[!is.na(x)]))
+  }
+
   load_mo_uncertainties(metadata)
   translate_into_language(x, language = language, only_unknown = FALSE)
 }
@@ -634,6 +646,20 @@ mo_is_anaerobic <- function(x, language = get_AMR_locale(), keep_synonyms = getO
   out
 }
 
+#' @rdname mo_property
+#' @export
+mo_morphology <- function(x, language = get_AMR_locale(), keep_synonyms = getOption("AMR_keep_synonyms", FALSE), ...) {
+  if (missing(x)) {
+    # this tries to find the data and an 'mo' column
+    x <- find_mo_col(fn = "mo_morphology")
+  }
+  meet_criteria(x, allow_NA = TRUE)
+  language <- validate_language(language)
+  meet_criteria(keep_synonyms, allow_class = "logical", has_length = 1)
+
+  mo_validate(x = x, property = "morphology", language = language, keep_synonyms = keep_synonyms, ...)
+}
+
 #' @rdname mo_property
 #' @export
 mo_snomed <- function(x, language = get_AMR_locale(), keep_synonyms = getOption("AMR_keep_synonyms", FALSE), ...) {

R/zz_deprecated.R

@@ -70,6 +70,13 @@ as.data.frame.deprecated_amr_dataset <- function(x, ...) {
 # - `antibiotics` in `antibiogram()`
 # - `converse_capped_values` in `as.sir()`
 
+#' @rdname AMR-deprecated
+#' @export
+custom_eucast_rules <- function(...) {
+  deprecation_warning("custom_eucast_rules", "custom_interpretive_rules", is_function = TRUE)
+  custom_interpretive_rules(...)
+}
+
 #' @rdname AMR-deprecated
 #' @export
 ab_class <- function(...) {

_pkgdown.yml

@@ -156,17 +156,17 @@ reference:
     - "`atc_online_property`"
     - "`add_custom_antimicrobials`"
 
-  - title: "Preparing data: antimicrobial results"
+  - title: "Interpreting data: antimicrobial results"
     desc: >
       With `as.mic()` and `as.disk()` you can transform your raw input to valid MIC or disk diffusion values.
       Use `as.sir()` for cleaning raw data to let it only contain "R", "I" and "S", or to interpret MIC or disk diffusion values as SIR based on the lastest EUCAST and CLSI guidelines.
-      Afterwards, you can extend antibiotic interpretations by applying [EUCAST rules](https://www.eucast.org/expert_rules_and_intrinsic_resistance/) with `eucast_rules()`.
+      Afterwards, you can extend antibiotic interpretations by applying interpretive rules, for example [from EUCAST](https://www.eucast.org/expert_rules_and_intrinsic_resistance/) with `interpretive_rules()`.
     contents:
     - "`as.sir`"
     - "`as.mic`"
     - "`as.disk`"
-    - "`eucast_rules`"
-    - "`custom_eucast_rules`"
+    - "`interpretive_rules`"
+    - "`custom_interpretive_rules`"
 
   - title: "Analysing data"
     desc: >
@@ -265,7 +265,7 @@ reference:
 
   - title: "Other: statistical tests"
     desc: >
-      Some statistical tests or methods are not part of base R and were added to this package for convenience.
+      Some statistical tests or methods usable for AMR analyses are not part of base R and were added to this package for convenience.
     contents:
     - "`g.test`"
     - "`kurtosis`"

data-raw/_pre_commit_checks.R

@@ -42,9 +42,9 @@ pre_commit_lst <- list()
 
 usethis::ui_info(paste0("Updating internal package data"))
 
-# See 'data-raw/eucast_rules.tsv' for the EUCAST reference file
-pre_commit_lst$EUCAST_RULES_DF <- utils::read.delim(
-  file = "data-raw/eucast_rules.tsv",
+# See 'data-raw/interpretive_rules.tsv' for the interpretive rules reference file
+pre_commit_lst$INTERPRETIVE_RULES_DF <- utils::read.delim(
+  file = "data-raw/interpretive_rules.tsv",
   skip = 9,
   sep = "\t",
   stringsAsFactors = FALSE,
@@ -364,7 +364,7 @@ pre_commit_lst$MO_RELEVANT_GENERA <- c(
 )
 
 # antibiotic groups
-# (these will also be used for eucast_rules() and understanding data-raw/eucast_rules.tsv)
+# (these will also be used for interpretive_rules() and understanding data-raw/interpretive_rules.tsv)
 pre_commit_lst$AB_AMINOGLYCOSIDES <- antimicrobials %>%
   filter(group %like% "aminoglycoside|paromomycin|spectinomycin") %>%
   pull(ab)

data-raw/_reproduction_scripts/reproduction_of_microorganisms.R

@@ -122,8 +122,8 @@ get_author_year <- function(ref) {
   authors <- gsub("[A-Z-][a-z-]?[.]", "", authors, ignore.case = FALSE)
   # remove trailing and leading spaces
   authors <- trimws(authors)
-  # keep only the part after last 'emend.' to get the latest authors
-  authors <- gsub(".*emend[.] ?", "", authors)
+  # strip emend. and everything after it to retain the combination authority
+  authors <- gsub(" ?emend[.]?.*", "", authors)
   # only keep first author and replace all others by 'et al'
   authors <- gsub("(,| and| et| &| ex| emend\\.?) .*", " et al.", authors)
   # et al. always with ending dot
@@ -746,7 +746,7 @@ taxonomy_mycobank <- taxonomy_mycobank %>%
         tax_h,
       tax_i %in% taxonomy_mycobank$fullname[taxonomy_mycobank$rank == "genus"] ~
         tax_i,
-      tax_k %in% taxonomy_mycobank$fullname[taxonomy_mycobank$rank == "genus"] ~
+      tax_j %in% taxonomy_mycobank$fullname[taxonomy_mycobank$rank == "genus"] ~
         tax_j,
       tax_k %in% taxonomy_mycobank$fullname[taxonomy_mycobank$rank == "genus"] ~
         tax_k,
@@ -2858,6 +2858,135 @@ taxonomy <- taxonomy %>%
   relocate(oxygen_tolerance, .after = ref)
 
 
+# Add morphology ---------------------------------------------------------------------
+
+# We will use the BacDive data base for this:
+# - go to https://bacdive.dsmz.de/advsearch
+# - filter 'Cell shape' on "*" and click Submit
+# - click on the 'Download table as CSV' button
+bacdive_shape <- vroom::vroom("data-raw/bacdive_shape.csv", skip = 2) %>%
+  select(species, shape = `Cell shape`)
+bacdive_shape <- bacdive_shape %>%
+  # fill in missing species from previous rows
+  mutate(fullname = if_else(is.na(species), lag(species), species)) %>%
+  filter(
+    !is.na(species),
+    !is.na(shape),
+    species %unlike% "unclassified"
+  ) %>%
+  select(-species)
+bacdive_shape <- bacdive_shape %>%
+  # map raw BacDive values to a controlled vocabulary
+  mutate(
+    shape = case_when(
+      shape %in% c("coccus-shaped", "sphere-shaped", "diplococcus-shaped") ~ "cocci",
+      shape %in% c("oval-shaped", "ovoid-shaped") ~ "coccobacilli",
+      shape %in% c("rod-shaped", "curved-shaped", "vibrio-shaped", "flask-shaped") ~ "rods",
+      shape %in% c("spiral-shaped", "helical-shaped") ~ "spirilla",
+      shape == "filament-shaped" ~ "filamentous",
+      TRUE ~ NA_character_
+    )
+  ) %>%
+  filter(!is.na(shape)) %>%
+  # now determine shape per species by majority vote
+  group_by(fullname) %>%
+  summarise(
+    morphology = names(sort(table(shape), decreasing = TRUE))[1]
+  )
+# now find all synonyms and copy them from their current taxonomic names
+synonyms_shape <- taxonomy %>%
+  filter(status == "synonym") %>%
+  transmute(
+    mo,
+    fullname_old = fullname,
+    current = synonym_mo_to_accepted_mo(
+      mo,
+      fill_in_accepted = FALSE,
+      dataset = taxonomy
+    )
+  ) %>%
+  filter(!is.na(current)) %>%
+  mutate(fullname = taxonomy$fullname[match(current, taxonomy$mo)]) %>%
+  left_join(bacdive_shape, by = "fullname") %>%
+  filter(!is.na(morphology)) %>%
+  select(fullname, morphology)
+
+bacdive_shape <- bacdive_shape %>%
+  bind_rows(synonyms_shape) %>%
+  distinct()
+
+bacdive_shape_genus <- bacdive_shape %>%
+  mutate(
+    shape_raw = morphology,
+    genus = taxonomy$genus[match(fullname, taxonomy$fullname)]
+  ) %>%
+  group_by(fullname = genus) %>%
+  summarise(
+    morphology = names(sort(table(shape_raw), decreasing = TRUE))[1]
+  )
+bacdive_shape <- bacdive_shape %>%
+  bind_rows(bacdive_shape_genus) %>%
+  arrange(fullname)
+
+bacdive_shape_other <- taxonomy %>%
+  filter(
+    kingdom == "Bacteria",
+    rank == "species",
+    !fullname %in% bacdive_shape$fullname,
+    genus %in% bacdive_shape$fullname
+  ) %>%
+  select(fullname, genus) %>%
+  left_join(bacdive_shape, by = c("genus" = "fullname")) %>%
+  mutate(
+    morphology = paste("likely", morphology)
+  ) %>%
+  select(fullname, morphology) %>%
+  distinct(fullname, .keep_all = TRUE)
+
+bacdive_shape <- bacdive_shape %>%
+  bind_rows(bacdive_shape_other) %>%
+  arrange(fullname) %>%
+  distinct(fullname, .keep_all = TRUE)
+
+taxonomy <- taxonomy %>%
+  left_join(bacdive_shape, by = "fullname") %>%
+  relocate(morphology, .after = oxygen_tolerance)
+
+# Override: genera that are clinically established coccobacilli but where BacDive
+# majority vote yields "rods" due to observer disagreement on the rod/oval boundary.
+# These genera are universally reported as coccobacilli on Gram stain in clinical
+# microbiology practice.
+coccobacilli_genera <- c(
+  "Acinetobacter", "Aggregatibacter", "Brucella",
+  "Gardnerella", "Haemophilus", "Kingella",
+  "Moraxella", "Pasteurella"
+)
+taxonomy <- taxonomy %>%
+  mutate(
+    morphology = case_when(
+      genus %in% coccobacilli_genera & is.na(morphology) ~ "likely coccobacilli",
+      genus %in% coccobacilli_genera &
+        morphology %in% c("rods", "cocci") ~ "coccobacilli",
+      genus %in% coccobacilli_genera &
+        morphology %in% c("likely rods", "likely cocci") ~ "likely coccobacilli",
+      TRUE ~ morphology
+    )
+  )
+
+# Spirochaetes: the entire phylum is spirochaete by definition, fill in where missing
+taxonomy <- taxonomy %>%
+  mutate(
+    morphology = case_when(
+      phylum %in% c("Spirochaetota", "Spirochaetes") & is.na(morphology) ~ "likely spirilla",
+      phylum %in% c("Spirochaetota", "Spirochaetes") &
+        morphology %in% c("rods", "likely rods") ~ "spirilla",
+      TRUE ~ morphology
+    )
+  )
+
+
+
+
 # Restore 'synonym' microorganisms to 'accepted' --------------------------------------------------
 
 # If there are some synonyms that need to be corrected to 'accepted', you can do that here.

man/AMR-deprecated.Rd

@@ -2,10 +2,13 @@
 % Please edit documentation in R/zz_deprecated.R
 \name{AMR-deprecated}
 \alias{AMR-deprecated}
+\alias{custom_eucast_rules}
 \alias{ab_class}
 \alias{ab_selector}
 \title{Deprecated Functions, Arguments, or Datasets}
 \usage{
+custom_eucast_rules(...)
+
 ab_class(...)
 
 ab_selector(...)

man/antibiogram.Rd

@@ -25,7 +25,8 @@ antibiogram(x, antimicrobials = where(is.sir), mo_transform = "shortname",
   ifelse(wisca, 14, 18)), col_mo = NULL, language = get_AMR_locale(),
   minimum = 30, combine_SI = TRUE, sep = " + ", sort_columns = TRUE,
   wisca = FALSE, simulations = 1000, conf_interval = 0.95,
-  interval_side = "two-tailed", info = interactive(), ...)
+  interval_side = "two-tailed", info = interactive(), parallel = FALSE,
+  ...)
 
 wisca(x, antimicrobials = where(is.sir), ab_transform = "name",
   syndromic_group = NULL, only_all_tested = FALSE, digits = 1,
@@ -33,7 +34,7 @@ wisca(x, antimicrobials = where(is.sir), ab_transform = "name",
   col_mo = NULL, language = get_AMR_locale(), combine_SI = TRUE,
   sep = " + ", sort_columns = TRUE, simulations = 1000,
   conf_interval = 0.95, interval_side = "two-tailed",
-  info = interactive(), ...)
+  info = interactive(), parallel = FALSE, ...)
 
 retrieve_wisca_parameters(wisca_model, ...)
 
@@ -80,7 +81,7 @@ retrieve_wisca_parameters(wisca_model, ...)
 
 \item{digits}{Number of digits to use for rounding the antimicrobial coverage, defaults to 1 for WISCA and 0 otherwise.}
 
-\item{formatting_type}{Numeric value (1–22 for WISCA, 1-12 for non-WISCA) indicating how the 'cells' of the antibiogram table should be formatted. See \emph{Details} > \emph{Formatting Type} for a list of options.}
+\item{formatting_type}{Numeric value (1-22 for WISCA, 1-12 for non-WISCA) indicating how the 'cells' of the antibiogram table should be formatted. See \emph{Details} > \emph{Formatting Type} for a list of options.}
 
 \item{col_mo}{Column name of the names or codes of the microorganisms (see \code{\link[=as.mo]{as.mo()}}) - the default is the first column of class \code{\link{mo}}. Values will be coerced using \code{\link[=as.mo]{as.mo()}}.}
 
@@ -104,6 +105,8 @@ retrieve_wisca_parameters(wisca_model, ...)
 
 \item{info}{A \link{logical} to indicate info should be printed - the default is \code{TRUE} only in interactive mode.}
 
+\item{parallel}{A \link{logical} to indicate if parallel computing must be used, defaults to \code{FALSE}. Requires the \code{\link[future.apply:future_lapply]{future.apply}} package. For WISCA, Monte Carlo simulations are distributed across workers; for grouped antibiograms, each group is processed by a separate worker. \strong{A non-sequential \code{\link[future:plan]{future::plan()}} must already be active before setting \code{parallel = TRUE}} -- for example, \code{future::plan(future::multisession)}. An error is thrown if \code{parallel = TRUE} is used without a plan set by the user.}
+
 \item{...}{When used in \link[knitr:kable]{R Markdown or Quarto}: arguments passed on to \code{\link[knitr:kable]{knitr::kable()}} (otherwise, has no use).}
 
 \item{wisca_model}{The outcome of \code{\link[=wisca]{wisca()}} or \code{\link[=antibiogram]{antibiogram(..., wisca = TRUE)}}.}

man/custom_interpretive_rules.Rd

@@ -1,10 +1,10 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/custom_eucast_rules.R
-\name{custom_eucast_rules}
-\alias{custom_eucast_rules}
-\title{Define Custom EUCAST Rules}
+% Please edit documentation in R/custom_interpretive_rules.R
+\name{custom_interpretive_rules}
+\alias{custom_interpretive_rules}
+\title{Define Custom Interpretive Rules}
 \usage{
-custom_eucast_rules(...)
+custom_interpretive_rules(...)
 }
 \arguments{
 \item{...}{Rules in \link[base:tilde]{formula} notation, see below for instructions, and in \emph{Examples}.}
@@ -13,22 +13,22 @@ custom_eucast_rules(...)
 A \link{list} containing the custom rules
 }
 \description{
-Define custom EUCAST rules for your organisation or specific analysis and use the output of this function in \code{\link[=eucast_rules]{eucast_rules()}}.
+Define custom interpretive rules for your organisation or specific analysis and use the output of this function in \code{\link[=interpretive_rules]{interpretive_rules()}}.
 }
 \details{
-Some organisations have their own adoption of EUCAST rules. This function can be used to define custom EUCAST rules to be used in the \code{\link[=eucast_rules]{eucast_rules()}} function.
+Some organisations have their own adoption of interpretive rules. This function can be used to define custom rules to be used in the \code{\link[=interpretive_rules]{interpretive_rules()}} function.
 \subsection{Basics}{
 
 If you are familiar with the \code{\link[dplyr:case-and-replace-when]{case_when()}} function of the \code{dplyr} package, you will recognise the input method to set your own rules. Rules must be set using what \R considers to be the 'formula notation'. The rule itself is written \emph{before} the tilde (\code{~}) and the consequence of the rule is written \emph{after} the tilde:
 
-\if{html}{\out{<div class="sourceCode r">}}\preformatted{x <- custom_eucast_rules(TZP == "S" ~ aminopenicillins == "S",
-                         TZP == "R" ~ aminopenicillins == "R")
+\if{html}{\out{<div class="sourceCode r">}}\preformatted{x <- custom_interpretive_rules(TZP == "S" ~ aminopenicillins == "S",
+                               TZP == "R" ~ aminopenicillins == "R")
 }\if{html}{\out{</div>}}
 
-These are two custom EUCAST rules: if TZP (piperacillin/tazobactam) is "S", all aminopenicillins (ampicillin and amoxicillin) must be made "S", and if TZP is "R", aminopenicillins must be made "R". These rules can also be printed to the console, so it is immediately clear how they work:
+These are two custom interpretive rules: if TZP (piperacillin/tazobactam) is "S", all aminopenicillins (ampicillin and amoxicillin) must be made "S", and if TZP is "R", aminopenicillins must be made "R". These rules can also be printed to the console, so it is immediately clear how they work:
 
 \if{html}{\out{<div class="sourceCode r">}}\preformatted{x
-#> A set of custom EUCAST rules:
+#> A set of custom interpretive rules:
 #>
 #>   1. If TZP is "S" then set to  S :
 #>      amoxicillin (AMX), ampicillin (AMP)
@@ -48,11 +48,11 @@ df
 #> 1      Escherichia coli   R    S     S
 #> 2 Klebsiella pneumoniae   R    S     S
 
-eucast_rules(df,
-             rules = "custom",
-             custom_rules = x,
-             info = FALSE,
-             overwrite = TRUE)
+interpretive_rules(df,
+                   rules = "custom",
+                   custom_rules = x,
+                   info = FALSE,
+                   overwrite = TRUE)
 #>                      mo TZP ampi cipro
 #> 1      Escherichia coli   R    R     S
 #> 2 Klebsiella pneumoniae   R    R     S
@@ -63,16 +63,16 @@ eucast_rules(df,
 
 There is one exception in columns used for the rules: all column names of the \link{microorganisms} data set can also be used, but do not have to exist in the data set. These column names are: \code{"mo"}, \code{"fullname"}, \code{"status"}, \code{"kingdom"}, \code{"phylum"}, \code{"class"}, \code{"order"}, \code{"family"}, \code{"genus"}, \code{"species"}, \code{"subspecies"}, \code{"rank"}, \code{"ref"}, \code{"oxygen_tolerance"}, \code{"source"}, \code{"lpsn"}, \code{"lpsn_parent"}, \code{"lpsn_renamed_to"}, \code{"mycobank"}, \code{"mycobank_parent"}, \code{"mycobank_renamed_to"}, \code{"gbif"}, \code{"gbif_parent"}, \code{"gbif_renamed_to"}, \code{"prevalence"}, and \code{"snomed"}. Thus, this next example will work as well, despite the fact that the \code{df} data set does not contain a column \code{genus}:
 
-\if{html}{\out{<div class="sourceCode r">}}\preformatted{y <- custom_eucast_rules(
+\if{html}{\out{<div class="sourceCode r">}}\preformatted{y <- custom_interpretive_rules(
   TZP == "S" & genus == "Klebsiella" ~ aminopenicillins == "S",
   TZP == "R" & genus == "Klebsiella" ~ aminopenicillins == "R"
 )
 
-eucast_rules(df,
-             rules = "custom",
-             custom_rules = y,
-             info = FALSE,
-             overwrite = TRUE)
+interpretive_rules(df,
+                   rules = "custom",
+                   custom_rules = y,
+                   info = FALSE,
+                   overwrite = TRUE)
 #>                      mo TZP ampi cipro
 #> 1      Escherichia coli   R    S     S
 #> 2 Klebsiella pneumoniae   R    R     S
@@ -90,9 +90,9 @@ You can define antimicrobial groups instead of single antimicrobials for the rul
 
 Rules can also be applied to multiple antimicrobials and antimicrobial groups simultaneously. Use the \code{c()} function to combine multiple antimicrobials. For instance, the following example sets all aminopenicillins and ureidopenicillins to "R" if column TZP (piperacillin/tazobactam) is "R":
 
-\if{html}{\out{<div class="sourceCode r">}}\preformatted{x <- custom_eucast_rules(TZP == "R" ~ c(aminopenicillins, ureidopenicillins) == "R")
+\if{html}{\out{<div class="sourceCode r">}}\preformatted{x <- custom_interpretive_rules(TZP == "R" ~ c(aminopenicillins, ureidopenicillins) == "R")
 x
-#> A set of custom EUCAST rules:
+#> A set of custom interpretive rules:
 #>
 #>   1. If TZP is "R" then set to "R":
 #>      amoxicillin (AMX), ampicillin (AMP), azlocillin (AZL), mezlocillin (MEZ), piperacillin (PIP), piperacillin/tazobactam (TZP)
@@ -147,7 +147,7 @@ These 43 antimicrobial groups are allowed in the rules (case-insensitive) and ca
 }
 }
 \examples{
-x <- custom_eucast_rules(
+x <- custom_interpretive_rules(
   AMC == "R" & genus == "Klebsiella" ~ aminopenicillins == "R",
   AMC == "I" & genus == "Klebsiella" ~ aminopenicillins == "I"
 )
@@ -165,7 +165,7 @@ eucast_rules(example_isolates,
 # combine rule sets
 x2 <- c(
   x,
-  custom_eucast_rules(TZP == "R" ~ carbapenems == "R")
+  custom_interpretive_rules(TZP == "R" ~ carbapenems == "R")
 )
 x2
 }

man/g.test.Rd

@@ -46,7 +46,7 @@ A list with class \code{"htest"} containing the following
     \code{(observed - expected) / sqrt(expected)}.}
   \item{stdres}{standardized residuals,
     \code{(observed - expected) / sqrt(V)}, where \code{V} is the
-    residual cell variance (Agresti, 2007, section 2.4.5
+    residual cell variance {(\if{html}{\out{<a href="#reference+chisq.test.Rd+R+3AAgresti+3A2007" class="citation">}}Agresti 2007\if{html}{\out{</a>}}, section 2.4.5)}
     for the case where \code{x} is a matrix, \code{n * p * (1 - p)} otherwise).}
 }
 \description{

man/ggplot_pca.Rd

@@ -42,8 +42,9 @@ ggplot_pca(x, choices = 1:2, scale = 1, pc.biplot = TRUE,
   }
 
 \item{pc.biplot}{
-    If true, use what Gabriel (1971) refers to as a "principal component
-    biplot", with \code{lambda = 1} and observations scaled up by sqrt(n) and
+    If true, use what {\if{html}{\cite{}\out{<a href="#reference+biplot.princomp.Rd+R+3AGabriel+3A1971" class="citation">}}Gabriel (1971)\if{html}{\out{</a>}}} refers to as a
+    \dQuote{principal component biplot},
+    with \code{lambda = 1} and observations scaled up by sqrt(n) and
     variables scaled down by sqrt(n).  Then inner products between
     variables approximate covariances and distances between observations
     approximate Mahalanobis distance.

man/interpretive_rules.Rd

@@ -46,7 +46,7 @@ eucast_dosage(ab, administration = "iv", version_breakpoints = 15)
 
 \item{info}{A \link{logical} to indicate whether progress should be printed to the console - the default is only print while in interactive sessions.}
 
-\item{rules}{A \link{character} vector that specifies which rules should be applied. Must be one or more of \code{"breakpoints"}, \code{"expected_phenotypes"}, \code{"expert"}, \code{"other"}, \code{"custom"}, \code{"all"}, and defaults to \code{c("breakpoints", "expected_phenotypes")}. The default value can be set to another value using the package option \code{\link[=AMR-options]{AMR_interpretive_rules}}: \code{options(AMR_interpretive_rules = "all")}. If using \code{"custom"}, be sure to fill in argument \code{custom_rules} too. Custom rules can be created with \code{\link[=custom_eucast_rules]{custom_eucast_rules()}}.}
+\item{rules}{A \link{character} vector that specifies which rules should be applied. Must be one or more of \code{"breakpoints"}, \code{"expected_phenotypes"}, \code{"expert"}, \code{"other"}, \code{"custom"}, \code{"all"}, and defaults to \code{c("breakpoints", "expected_phenotypes")}. The default value can be set to another value using the package option \code{\link[=AMR-options]{AMR_interpretive_rules}}: \code{options(AMR_interpretive_rules = "all")}. If using \code{"custom"}, be sure to fill in argument \code{custom_rules} too. Custom rules can be created with \code{\link[=custom_interpretive_rules]{custom_interpretive_rules()}}.}
 
 \item{guideline}{A guideline name, either "EUCAST" (default) or "CLSI". This can be set with the package option \code{\link[=AMR-options]{AMR_guideline}}.}
 
@@ -62,7 +62,7 @@ eucast_dosage(ab, administration = "iv", version_breakpoints = 15)
 
 \item{only_sir_columns}{A \link{logical} to indicate whether only antimicrobial columns must be included that were transformed to class \link[=as.sir]{sir} on beforehand. Defaults to \code{FALSE} if no columns of \code{x} have a class \link[=as.sir]{sir}.}
 
-\item{custom_rules}{Custom rules to apply, created with \code{\link[=custom_eucast_rules]{custom_eucast_rules()}}.}
+\item{custom_rules}{Custom rules to apply, created with \code{\link[=custom_interpretive_rules]{custom_interpretive_rules()}}.}
 
 \item{overwrite}{A \link{logical} indicating whether to overwrite existing SIR values (default: \code{FALSE}). When \code{FALSE}, only non-SIR values are modified (i.e., any value that is not already S, I or R). To ensure compliance with EUCAST guidelines, \strong{this should remain} \code{FALSE}, as EUCAST notes often state that an organism "should be tested for susceptibility to individual agents or be reported resistant".}
 
@@ -86,15 +86,15 @@ To improve the interpretation of the antibiogram before CLSI/EUCAST interpretive
 \strong{Note:} This function does not translate MIC or disk values to SIR values. Use \code{\link[=as.sir]{as.sir()}} for that. \cr
 \strong{Note:} When ampicillin (AMP, J01CA01) is not available but amoxicillin (AMX, J01CA04) is, the latter will be used for all rules where there is a dependency on ampicillin. These drugs are interchangeable when it comes to expression of antimicrobial resistance. \cr
 
-The file containing all EUCAST rules is located here: \url{https://github.com/msberends/AMR/blob/main/data-raw/eucast_rules.tsv}.  \strong{Note:} Old taxonomic names are replaced with the current taxonomy where applicable. For example, \emph{Ochrobactrum anthropi} was renamed to \emph{Brucella anthropi} in 2020; the original EUCAST rules v3.1 and v3.2 did not yet contain this new taxonomic name. The \code{AMR} package contains the full microbial taxonomy updated until June 24th, 2024, see \link{microorganisms}.
+The file containing all interpretive rules is located here: \url{https://github.com/msberends/AMR/blob/main/data-raw/interpretive_rules.tsv}.  \strong{Note:} Old taxonomic names are replaced with the current taxonomy where applicable. For example, \emph{Ochrobactrum anthropi} was renamed to \emph{Brucella anthropi} in 2020; the original EUCAST rules v3.1 and v3.2 did not yet contain this new taxonomic name. The \code{AMR} package contains the full microbial taxonomy updated until June 24th, 2024, see \link{microorganisms}.
 \subsection{Custom Rules}{
 
-Custom rules can be created using \code{\link[=custom_eucast_rules]{custom_eucast_rules()}}, e.g.:
+Custom rules can be created using \code{\link[=custom_interpretive_rules]{custom_interpretive_rules()}}, e.g.:
 
-\if{html}{\out{<div class="sourceCode r">}}\preformatted{x <- custom_eucast_rules(AMC == "R" & genus == "Klebsiella" ~ aminopenicillins == "R",
-                         AMC == "I" & genus == "Klebsiella" ~ aminopenicillins == "I")
+\if{html}{\out{<div class="sourceCode r">}}\preformatted{x <- custom_interpretive_rules(AMC == "R" & genus == "Klebsiella" ~ aminopenicillins == "R",
+                               AMC == "I" & genus == "Klebsiella" ~ aminopenicillins == "I")
 
-eucast_rules(example_isolates, rules = "custom", custom_rules = x)
+interpretive_rules(example_isolates, rules = "custom", custom_rules = x)
 }\if{html}{\out{</div>}}
 }
 
@@ -108,7 +108,7 @@ Before further processing, two non-EUCAST rules about drug combinations can be a
 
 Important examples include amoxicillin and amoxicillin/clavulanic acid, and trimethoprim and trimethoprim/sulfamethoxazole. Needless to say, for these rules to work, both drugs must be available in the data set.
 
-Since these rules are not officially approved by EUCAST, they are not applied at default. To use these rules, include \code{"other"} to the \code{rules} argument, or use \code{eucast_rules(..., rules = "all")}. You can also set the package option \code{\link[=AMR-options]{AMR_interpretive_rules}}, i.e. run \code{options(AMR_interpretive_rules = "all")}.
+Since these rules are not officially approved by EUCAST, they are not applied at default. To use these rules, include \code{"other"} to the \code{rules} argument, or use \code{interpretive_rules(..., rules = "all")}. You can also set the package option \code{\link[=AMR-options]{AMR_interpretive_rules}}, i.e. run \code{options(AMR_interpretive_rules = "all")}.
 }
 }
 \section{Download Our Reference Data}{

man/microorganisms.Rd

@@ -12,8 +12,9 @@ A \link[tibble:tibble]{tibble} with 78 679 observations and 26 variables:
 \item \code{status} \cr Status of the taxon, either \code{"accepted"}, \code{"not validly published"}, \code{"synonym"}, or \code{"unknown"}
 \item \code{kingdom}, \code{phylum}, \code{class}, \code{order}, \code{family}, \code{genus}, \code{species}, \code{subspecies}\cr Taxonomic rank of the microorganism. Note that for fungi, \emph{phylum} is equal to their taxonomic \emph{division}. Also, for fungi, \emph{subkingdom} and \emph{subdivision} were left out since they do not occur in the bacterial taxonomy.
 \item \code{rank}\cr Text of the taxonomic rank of the microorganism, such as \code{"species"} or \code{"genus"}
-\item \code{ref}\cr Author(s) and year of related scientific publication. This contains only the \emph{first surname} and year of the \emph{latest} authors, e.g. "Wallis \emph{et al.} 2006 \emph{emend.} Smith and Jones 2018" becomes "Smith \emph{et al.}, 2018". This field is directly retrieved from the source specified in the column \code{source}. Moreover, accents were removed to comply with CRAN that only allows ASCII characters.
+\item \code{ref}\cr Abbreviated authority citation for the nomenclatural act that established the current name combination, following ICNP conventions. For species described in their current genus (\emph{sp. nov.}), this is the original description author(s) and year. For species transferred to a different genus (\emph{comb. nov.}), this is the reclassification author(s) and year. Emendations are excluded. For synonyms, this is the authority under which the synonym was originally published. This field is directly retrieved from the source specified in the column \code{source}. Diacritics were removed to comply with CRAN, that only allows ASCII characters.
 \item \code{oxygen_tolerance} \cr Oxygen tolerance, either \code{"aerobe"}, \code{"anaerobe"}, \code{"anaerobe/microaerophile"}, \code{"facultative anaerobe"}, \code{"likely facultative anaerobe"}, \code{"microaerophile"}, or NA. These data were retrieved from BacDive (see \emph{Source}). Items that contain "likely" are missing from BacDive and were extrapolated from other species within the same genus to guess the oxygen tolerance. Currently 68.3\% of all ~39 000 bacteria in the data set contain an oxygen tolerance.
+\item \code{morphology} \cr Morphology (cell shape), either \code{""}. These data were retrieved from BacDive (see \emph{Source}). Genera that are clinically established as coccobacilli (the HACEK group and beyond, such as \emph{Haemophilus} and \emph{Acinetobacter}) are classified as such regardless of BacDive majority vote. Items that contain "likely" are missing from BacDive and were extrapolated from other species within the same genus. Currently 0\% of all ~39 000 bacteria in the data set contain a morphology.
 \item \code{source}\cr Either \code{"GBIF"}, \code{"LPSN"}, \code{"Manually added"}, \code{"MycoBank"}, or \code{"manually added"} (see \emph{Source})
 \item \code{lpsn}\cr Identifier ('Record number') of List of Prokaryotic names with Standing in Nomenclature (LPSN). This will be the first/highest LPSN identifier to keep one identifier per row. For example, \emph{Acetobacter ascendens} has LPSN Record number 7864 and 11011. Only the first is available in the \code{microorganisms} data set. \emph{\strong{This is a unique identifier}}, though available for only ~33 000 records.
 \item \code{lpsn_parent}\cr LPSN identifier of the parent taxon

man/mo_property.Rd

@@ -24,6 +24,7 @@
 \alias{mo_is_intrinsic_resistant}
 \alias{mo_oxygen_tolerance}
 \alias{mo_is_anaerobic}
+\alias{mo_morphology}
 \alias{mo_snomed}
 \alias{mo_ref}
 \alias{mo_authors}
@@ -86,7 +87,8 @@ mo_pathogenicity(x, language = get_AMR_locale(),
   keep_synonyms = getOption("AMR_keep_synonyms", FALSE), ...)
 
 mo_gramstain(x, language = get_AMR_locale(),
-  keep_synonyms = getOption("AMR_keep_synonyms", FALSE), ...)
+  keep_synonyms = getOption("AMR_keep_synonyms", FALSE),
+  add_morphology = FALSE, ...)
 
 mo_is_gram_negative(x, language = get_AMR_locale(),
   keep_synonyms = getOption("AMR_keep_synonyms", FALSE), ...)
@@ -106,6 +108,9 @@ mo_oxygen_tolerance(x, language = get_AMR_locale(),
 mo_is_anaerobic(x, language = get_AMR_locale(),
   keep_synonyms = getOption("AMR_keep_synonyms", FALSE), ...)
 
+mo_morphology(x, language = get_AMR_locale(),
+  keep_synonyms = getOption("AMR_keep_synonyms", FALSE), ...)
+
 mo_snomed(x, language = get_AMR_locale(),
   keep_synonyms = getOption("AMR_keep_synonyms", FALSE), ...)
 
@@ -161,6 +166,8 @@ The default is \code{FALSE}, which will return a note if outdated taxonomic name
 
 \item{...}{Other arguments passed on to \code{\link[=as.mo]{as.mo()}}, such as 'minimum_matching_score', 'ignore_pattern', and 'remove_from_input'.}
 
+\item{add_morphology}{a \link{logical} to indicate whether the morphology (from \code{\link[=mo_morphology]{mo_morphology()}}) should be added to the Gram stain result, e.g. \code{"Gram-negative rods"} instead of \code{"Gram-negative"}. The default is \code{FALSE}.}
+
 \item{ab}{Any (vector of) text that can be coerced to a valid antibiotic drug code with \code{\link[=as.ab]{as.ab()}}.}
 
 \item{open}{Browse the URL using \code{\link[utils:browseURL]{browseURL()}}.}
@@ -189,21 +196,23 @@ All functions will, at default, \strong{not} keep old taxonomic properties, as s
 \item \code{mo_ref("Enterobacter aerogenes", keep_synonyms = TRUE)} will return \code{"Hormaeche et al., 1960"} (with a once-per-session warning that the name is outdated)
 }
 
-The short name (\code{\link[=mo_shortname]{mo_shortname()}}) returns the first character of the genus and the full species, such as \code{"E. coli"}, for species and subspecies. Exceptions are abbreviations of staphylococci (such as \emph{"CoNS"}, Coagulase-Negative Staphylococci) and beta-haemolytic streptococci (such as \emph{"GBS"}, Group B Streptococci). Please bear in mind that e.g. \emph{E. coli} could mean \emph{Escherichia coli} (kingdom of Bacteria) as well as \emph{Entamoeba coli} (kingdom of Protozoa). Returning to the full name will be done using \code{\link[=as.mo]{as.mo()}} internally, giving priority to bacteria and human pathogens, i.e. \code{"E. coli"} will be considered \emph{Escherichia coli}. As a result, \code{mo_fullname(mo_shortname("Entamoeba coli"))} returns \code{"Escherichia coli"}.
+\code{\link[=mo_ref]{mo_ref()}} returns the abbreviated authority of the nomenclatural act that created the queried name combination. When \code{keep_synonyms = FALSE} (default), this is the authority of the currently accepted name. When \code{keep_synonyms = TRUE}, this is the authority under which the queried (possibly outdated) name was published. Emendations (changes to the species description without a name change) are not reflected; only the combination or original description authority is returned.
+
+The short name (\code{\link[=mo_shortname]{mo_shortname()}}) returns the first character of the genus and the full species, such as \code{"E. coli"}, for species and subspecies. Exceptions are abbreviations of staphylococci (such as \emph{"CoNS"}, Coagulase-Negative Staphylococci) and beta-haemolytic streptococci (such as \emph{"GBS"}, Group B Streptococci). Please bear in mind that e.g. \emph{E. coli} could mean \emph{Escherichia coli} (kingdom of Bacteria) as well as \emph{Entamoeba coli} (kingdom of Protozoa). Returning to the full name will be done using \code{\link[=as.mo]{as.mo()}} internally, giving priority to bacteria and human pathogens, i.e. \code{"E. coli"} will always be considered \emph{Escherichia coli}. As a result, \code{mo_fullname(mo_shortname("Entamoeba coli"))} returns \code{"Escherichia coli"}.
 
 Since the top-level of the taxonomy is sometimes referred to as 'kingdom' and sometimes as 'domain', the functions \code{\link[=mo_kingdom]{mo_kingdom()}} and \code{\link[=mo_domain]{mo_domain()}} return the exact same results.
 
 Determination of human pathogenicity (\code{\link[=mo_pathogenicity]{mo_pathogenicity()}}) is strongly based on Bartlett \emph{et al.} (2022, \doi{10.1099/mic.0.001269}). This function returns a \link{factor} with the levels \emph{Pathogenic}, \emph{Potentially pathogenic}, \emph{Non-pathogenic}, and \emph{Unknown}.
 
-Determination of the Gram stain (\code{\link[=mo_gramstain]{mo_gramstain()}}) will be based on the taxonomic kingdom and phylum. Originally, Cavalier-Smith defined the so-called subkingdoms Negibacteria and Posibacteria (2002, \href{https://pubmed.ncbi.nlm.nih.gov/11837318/}{PMID 11837318}), and only considered these phyla as Posibacteria: Actinobacteria, Chloroflexi, Firmicutes, and Tenericutes. These phyla were later renamed to Actinomycetota, Chloroflexota, Bacillota, and Mycoplasmatota (2021, \href{https://pubmed.ncbi.nlm.nih.gov/34694987/}{PMID 34694987}). Bacteria in these phyla are considered Gram-positive in this \code{AMR} package, except for members of the class Negativicutes (within phylum Bacillota) which are Gram-negative. All other bacteria are considered Gram-negative. Species outside the kingdom of Bacteria will return a value \code{NA}. Functions \code{\link[=mo_is_gram_negative]{mo_is_gram_negative()}} and \code{\link[=mo_is_gram_positive]{mo_is_gram_positive()}} always return \code{TRUE} or \code{FALSE} (or \code{NA} when the input is \code{NA} or the MO code is \code{UNKNOWN}), thus always return \code{FALSE} for species outside the taxonomic kingdom of Bacteria.
+Determination of the Gram stain (\code{\link[=mo_gramstain]{mo_gramstain()}} is based on the taxonomic kingdom and phylum. Originally, Cavalier-Smith defined the so-called subkingdoms Negibacteria and Posibacteria (2002, \href{https://pubmed.ncbi.nlm.nih.gov/11837318/}{PMID 11837318}), and only considered these phyla as Posibacteria: Actinobacteria, Chloroflexi, Firmicutes, and Tenericutes. These phyla were later renamed to Actinomycetota, Chloroflexota, Bacillota, and Mycoplasmatota (2021, \href{https://pubmed.ncbi.nlm.nih.gov/34694987/}{PMID 34694987}). Bacteria in these phyla are considered Gram-positive in this \code{AMR} package, except for members of the class Negativicutes (within phylum Bacillota) which are Gram-negative. All other bacteria are considered Gram-negative. Species outside the kingdom of Bacteria will return a value \code{NA}. Functions \code{\link[=mo_is_gram_negative]{mo_is_gram_negative()}} and \code{\link[=mo_is_gram_positive]{mo_is_gram_positive()}} always return \code{TRUE} or \code{FALSE} (or \code{NA} when the input is \code{NA} or the MO code is \code{UNKNOWN}), thus always return \code{FALSE} for species outside the taxonomic kingdom of Bacteria.
 
-Determination of yeasts (\code{\link[=mo_is_yeast]{mo_is_yeast()}}) will be based on the taxonomic kingdom and class. \emph{Budding yeasts} are yeasts that reproduce asexually through a process called budding, where a new cell develops from a small protrusion on the parent cell. Taxonomically, these are members of the phylum Ascomycota, class Saccharomycetes (also called Hemiascomycetes) or Pichiomycetes. \emph{True yeasts} quite specifically refers to yeasts in the underlying order Saccharomycetales (such as \emph{Saccharomyces cerevisiae}). Thus, for all microorganisms that are member of the taxonomic class Saccharomycetes or Pichiomycetes, the function will return \code{TRUE}. It returns \code{FALSE} otherwise (or \code{NA} when the input is \code{NA} or the MO code is \code{UNKNOWN}).
+Determination of yeasts (\code{\link[=mo_is_yeast]{mo_is_yeast()}}) is based on the taxonomic kingdom and class. \emph{Budding yeasts} are yeasts that reproduce asexually through a process called budding, where a new cell develops from a small protrusion on the parent cell. Taxonomically, these are members of the phylum Ascomycota, class Saccharomycetes (also called Hemiascomycetes) or Pichiomycetes. \emph{True yeasts} quite specifically refers to yeasts in the underlying order Saccharomycetales (such as \emph{Saccharomyces cerevisiae}). Thus, for all microorganisms that are member of the taxonomic class Saccharomycetes or Pichiomycetes, the function will return \code{TRUE}. It returns \code{FALSE} otherwise (or \code{NA} when the input is \code{NA} or the MO code is \code{UNKNOWN}).
 
-Determination of intrinsic resistance (\code{\link[=mo_is_intrinsic_resistant]{mo_is_intrinsic_resistant()}}) will be based on the \link{intrinsic_resistant} data set, which is based on \href{https://www.eucast.org/bacteria/important-additional-information/expert-rules/}{'EUCAST Expected Resistant Phenotypes' v1.2} (2023). The \code{\link[=mo_is_intrinsic_resistant]{mo_is_intrinsic_resistant()}} function can be vectorised over both argument \code{x} (input for microorganisms) and \code{ab} (input for antimicrobials).
+Determination of intrinsic resistance (\code{\link[=mo_is_intrinsic_resistant]{mo_is_intrinsic_resistant()}}) is based on the \link{intrinsic_resistant} data set, which is based on \href{https://www.eucast.org/bacteria/important-additional-information/expert-rules/}{'EUCAST Expected Resistant Phenotypes' v1.2} (2023). The \code{\link[=mo_is_intrinsic_resistant]{mo_is_intrinsic_resistant()}} function can be vectorised over both argument \code{x} (input for microorganisms) and \code{ab} (input for antimicrobials).
 
-Determination of bacterial oxygen tolerance (\code{\link[=mo_oxygen_tolerance]{mo_oxygen_tolerance()}}) will be based on BacDive, see \emph{Source}. The function \code{\link[=mo_is_anaerobic]{mo_is_anaerobic()}} only returns \code{TRUE} if the oxygen tolerance is \code{"anaerobe"}, indicting an obligate anaerobic species or genus. It always returns \code{FALSE} for species outside the taxonomic kingdom of Bacteria.
+Determination of both bacterial oxygen tolerance (\code{\link[=mo_oxygen_tolerance]{mo_oxygen_tolerance()}}) and morphology (\code{\link[=mo_morphology]{mo_morphology()}}) are  based on BacDive, see \emph{Source}. The function \code{\link[=mo_is_anaerobic]{mo_is_anaerobic()}} only returns \code{TRUE} if the oxygen tolerance is \code{"anaerobe"}, indicating an obligate anaerobic species or genus. It always returns \code{FALSE} for species outside the taxonomic kingdom of Bacteria.
 
-The function \code{\link[=mo_url]{mo_url()}} will return the direct URL to the online database entry, which also shows the scientific reference of the concerned species. \href{https://www.mycobank.org}{This MycoBank URL} will be used for fungi wherever available , \href{https://www.mycobank.org}{this LPSN URL} for bacteria wherever available, and \href{https://www.gbif.org}{this GBIF link} otherwise.
+The function \code{\link[=mo_url]{mo_url()}} will return the direct URL to the online database entry, which also shows the scientific reference of the concerned species. \href{https://www.mycobank.org}{This MycoBank URL} is used for fungi wherever available , \href{https://www.mycobank.org}{this LPSN URL} for bacteria wherever available, and \href{https://www.gbif.org}{this GBIF link} otherwise.
 
 SNOMED codes (\code{\link[=mo_snomed]{mo_snomed()}}) was last updated on July 16th, 2024. See \emph{Source} and the \link{microorganisms} data set for more info.
 
@@ -260,8 +269,10 @@ mo_shortname("Klebsiella pneumoniae")
 
 # other properties ---------------------------------------------------------
 
-mo_pathogenicity("Klebsiella pneumoniae")
+mo_morphology("Klebsiella pneumoniae")
 mo_gramstain("Klebsiella pneumoniae")
+mo_gramstain("Klebsiella pneumoniae", add_morphology = TRUE)
+mo_pathogenicity("Klebsiella pneumoniae")
 mo_snomed("Klebsiella pneumoniae")
 mo_type("Klebsiella pneumoniae")
 mo_rank("Klebsiella pneumoniae")

tests/testthat/test-_deprecated.R

@@ -30,6 +30,15 @@
 test_that("test-_deprecated.R", {
   skip_on_cran()
 
-  expect_warning(example_isolates[, ab_class("mycobact")])
-  expect_warning(example_isolates[, ab_selector(name %like% "trim")])
+  if (getRversion() > "4.0.0") {
+    expect_warning(example_isolates[, ab_class("mycobact")])
+    expect_warning(example_isolates[, ab_selector(name %like% "trim")])
+
+    # deprecated custom_interpretive_rules() still works and emits a warning
+    expect_warning(
+      x_old <- custom_eucast_rules(AMC == "R" ~ aminopenicillins == "R"),
+      regexp = "custom_eucast_rules"
+    )
+    expect_inherits(x_old, "custom_interpretive_rules")
+  }
 })

tests/testthat/test-antibiogram.R

@@ -130,6 +130,77 @@ test_that("test-antibiogram.R", {
     expect_equal(colnames(ab9), c("ward", "gender", "Piperacillin/tazobactam", "Piperacillin/tazobactam + Gentamicin", "Piperacillin/tazobactam + Tobramycin"))
   }
 
+  # Parallel computing ----------------------------------------------------
+  # Tests must pass even when only 1 core is available; parallel = TRUE then
+  # silently falls back to sequential, but results must still be correct.
+
+  if (AMR:::pkg_is_available("future.apply")) {
+    set.seed(42)
+
+    # sequential reference for WISCA
+    wisca_seq <- suppressWarnings(suppressMessages(
+      wisca(example_isolates, antimicrobials = c("TZP", "TZP+TOB", "TZP+GEN"), simulations = 100, info = FALSE)
+    ))
+
+    future::plan(future::multicore)
+
+    # 1. parallel = TRUE produces the same antibiogram structure as sequential
+    wisca_par <- suppressWarnings(suppressMessages(
+      wisca(example_isolates, antimicrobials = c("TZP", "TZP+TOB", "TZP+GEN"), simulations = 100, parallel = TRUE, info = FALSE)
+    ))
+    expect_inherits(wisca_par, "antibiogram")
+    expect_equal(colnames(wisca_par), colnames(wisca_seq))
+    expect_true(isTRUE(attributes(wisca_par)$wisca))
+
+    # 2. coverage values are non-NA and fall within [0, 1]
+    ln <- attributes(wisca_par)$long_numeric
+    expect_false(anyNA(ln$coverage))
+    expect_false(anyNA(ln$lower_ci))
+    expect_false(anyNA(ln$upper_ci))
+    expect_true(all(ln$coverage >= 0 & ln$coverage <= 1))
+    expect_true(all(ln$lower_ci <= ln$coverage))
+    expect_true(all(ln$upper_ci >= ln$coverage))
+
+    # 3. a second parallel run gives the same column names
+    wisca_par2 <- suppressWarnings(suppressMessages(
+      wisca(example_isolates, antimicrobials = c("TZP", "TZP+TOB", "TZP+GEN"), simulations = 100, parallel = TRUE, info = FALSE)
+    ))
+    expect_equal(colnames(wisca_par), colnames(wisca_par2))
+
+    # 4. parallel with workers = 1 gives same structure as sequential
+    future::plan(future::multicore, workers = 1)
+    wisca_par1 <- suppressWarnings(suppressMessages(
+      wisca(example_isolates, antimicrobials = c("TZP", "TZP+TOB", "TZP+GEN"), simulations = 100, parallel = TRUE, info = FALSE)
+    ))
+    expect_equal(colnames(wisca_seq), colnames(wisca_par1))
+
+    # 5. grouped antibiogram in parallel yields identical structure to sequential
+    if (AMR:::pkg_is_available("dplyr", min_version = "1.0.0", also_load = TRUE)) {
+      future::plan(future::sequential)
+      ab_grp_seq <- suppressWarnings(suppressMessages(
+        example_isolates %>%
+          group_by(ward) %>%
+          wisca(antimicrobials = c("TZP", "TZP+TOB"), simulations = 50, info = FALSE)
+      ))
+      future::plan(future::multicore)
+      ab_grp_par <- suppressWarnings(suppressMessages(
+        example_isolates %>%
+          group_by(ward) %>%
+          wisca(antimicrobials = c("TZP", "TZP+TOB"), simulations = 50, parallel = TRUE, info = FALSE)
+      ))
+      expect_equal(colnames(ab_grp_seq), colnames(ab_grp_par))
+      expect_equal(nrow(ab_grp_seq), nrow(ab_grp_par))
+    }
+
+    # 6. parallel = TRUE without a plan raises an informative error
+    future::plan(future::sequential)
+    expect_error(
+      suppressWarnings(wisca(example_isolates, antimicrobials = "TZP", parallel = TRUE, info = FALSE)),
+      "non-sequential"
+    )
+
+    future::plan(future::sequential)
+  }
 
   # Generate plots with ggplot2 or base R --------------------------------
 

tests/testthat/test-data.R

@@ -53,12 +53,12 @@ test_that("test-data.R", {
   expect_false(anyNA(microorganisms.codes$mo))
   expect_true(all(dosage$ab %in% AMR::antimicrobials$ab))
   expect_true(all(dosage$name %in% AMR::antimicrobials$name))
-  eucast_abx <- AMR:::EUCAST_RULES_DF$and_these_antibiotics
-  eucast_abx <- unique(unlist(strsplit(eucast_abx[!is.na(eucast_abx)], ", +")))
-  expect_true(all(eucast_abx %in% AMR::antimicrobials$ab),
+  interpretive_abx <- AMR:::INTERPRETIVE_RULES_DF$and_these_antibiotics
+  interpretive_abx <- unique(unlist(strsplit(interpretive_abx[!is.na(interpretive_abx)], ", +")))
+  expect_true(all(interpretive_abx %in% AMR::antimicrobials$ab),
     info = paste0(
       "Missing in `antimicrobials` data set: ",
-      toString(eucast_abx[which(!eucast_abx %in% AMR::antimicrobials$ab)])
+      toString(interpretive_abx[which(!interpretive_abx %in% AMR::antimicrobials$ab)])
     )
   )
 

tests/testthat/test-interpretive_rules.R

@@ -27,13 +27,14 @@
 # how to conduct AMR data analysis: https://amr-for-r.org              #
 # ==================================================================== #
 
-test_that("test-eucast_rules.R", {
+test_that("test-interpretive_rules.R", {
   skip_on_cran()
 
   # thoroughly check input table
   expect_equal(
-    sort(colnames(AMR:::EUCAST_RULES_DF)),
+    sort(colnames(AMR:::INTERPRETIVE_RULES_DF)),
     sort(c(
+      "rule.provider",
       "if_mo_property", "like.is.one_of", "this_value",
       "and_these_antibiotics", "have_these_values",
       "then_change_these_antibiotics", "to_value",
@@ -42,7 +43,7 @@ test_that("test-eucast_rules.R", {
       "note"
     ))
   )
-  MOs_mentioned <- unique(AMR:::EUCAST_RULES_DF$this_value)
+  MOs_mentioned <- unique(AMR:::INTERPRETIVE_RULES_DF$this_value)
   MOs_mentioned <- sort(trimws(unlist(strsplit(MOs_mentioned[!AMR:::is_valid_regex(MOs_mentioned)], ",", fixed = TRUE))))
   MOs_test <- suppressWarnings(
     trimws(paste(
@@ -54,19 +55,19 @@ test_that("test-eucast_rules.R", {
   MOs_test[MOs_test == ""] <- mo_fullname(MOs_mentioned[MOs_test == ""], keep_synonyms = TRUE, language = NULL)
   expect_equal(MOs_mentioned, MOs_test)
 
-  expect_error(suppressWarnings(eucast_rules(example_isolates, col_mo = "Non-existing")))
-  expect_error(eucast_rules(x = "text"))
-  expect_error(eucast_rules(data.frame(a = "test")))
-  expect_error(eucast_rules(data.frame(mo = "test"), rules = "invalid rules set"))
+  expect_error(suppressWarnings(interpretive_rules(example_isolates, col_mo = "Non-existing")))
+  expect_error(interpretive_rules(x = "text"))
+  expect_error(interpretive_rules(data.frame(a = "test")))
+  expect_error(interpretive_rules(data.frame(mo = "test"), rules = "invalid rules set"))
 
-  # expect_warning(eucast_rules(data.frame(mo = "Escherichia coli", vancomycin = "S", stringsAsFactors = TRUE)))
+  # expect_warning(interpretive_rules(data.frame(mo = "Escherichia coli", vancomycin = "S", stringsAsFactors = TRUE)))
 
   expect_identical(
     colnames(example_isolates),
-    colnames(suppressWarnings(eucast_rules(example_isolates, info = FALSE)))
+    colnames(suppressWarnings(interpretive_rules(example_isolates, info = FALSE)))
   )
 
-  expect_output(suppressMessages(eucast_rules(example_isolates, info = TRUE)))
+  expect_output(suppressMessages(interpretive_rules(example_isolates, info = TRUE)))
 
   a <- data.frame(
     mo = c(
@@ -86,8 +87,8 @@ test_that("test-eucast_rules.R", {
     amox = "R", # Amoxicillin
     stringsAsFactors = FALSE
   )
-  expect_identical(suppressWarnings(eucast_rules(a, "mo", info = FALSE)), b)
-  expect_output(suppressMessages(suppressWarnings(eucast_rules(a, "mo", info = TRUE))))
+  expect_identical(suppressWarnings(interpretive_rules(a, "mo", info = FALSE)), b)
+  expect_output(suppressMessages(suppressWarnings(interpretive_rules(a, "mo", info = TRUE))))
 
   a <- data.frame(
     mo = c(
@@ -105,7 +106,7 @@ test_that("test-eucast_rules.R", {
     COL = "R", # Colistin
     stringsAsFactors = FALSE
   )
-  expect_equal(suppressWarnings(eucast_rules(a, "mo", info = FALSE)), b)
+  expect_equal(suppressWarnings(interpretive_rules(a, "mo", info = FALSE)), b)
 
   # piperacillin must be R in Enterobacteriaceae when tica is R
   if (AMR:::pkg_is_available("dplyr", min_version = "1.0.0", also_load = TRUE)) {
@@ -117,7 +118,7 @@ test_that("test-eucast_rules.R", {
             TIC = as.sir("R"),
             PIP = as.sir("S")
           ) %>%
-          eucast_rules(col_mo = "mo", version_expertrules = 3.1, rules = "expert", info = FALSE, overwrite = TRUE) %>%
+          interpretive_rules(col_mo = "mo", version_expertrules = 3.1, rules = "expert", info = FALSE, overwrite = TRUE) %>%
           pull(PIP) %>%
           unique() %>%
           as.character()
@@ -127,7 +128,7 @@ test_that("test-eucast_rules.R", {
   }
 
   # azithromycin and clarythromycin must be equal to Erythromycin
-  a <- suppressWarnings(as.sir(eucast_rules(
+  a <- suppressWarnings(as.sir(interpretive_rules(
     data.frame(
       mo = example_isolates$mo,
       ERY = example_isolates$ERY,
@@ -149,7 +150,7 @@ test_that("test-eucast_rules.R", {
   # amox is inferred by benzylpenicillin in Kingella kingae
   expect_equal(
     suppressWarnings(
-      as.list(eucast_rules(
+      as.list(interpretive_rules(
         data.frame(
           mo = as.mo("Kingella kingae"),
           PEN = "S",
@@ -164,16 +165,16 @@ test_that("test-eucast_rules.R", {
 
   # also test norf
   if (AMR:::pkg_is_available("dplyr", min_version = "1.0.0", also_load = TRUE)) {
-    expect_output(suppressWarnings(eucast_rules(example_isolates %>% mutate(NOR = "S", NAL = "S"), info = TRUE)))
+    expect_output(suppressWarnings(interpretive_rules(example_isolates %>% mutate(NOR = "S", NAL = "S"), info = TRUE)))
   }
 
   # check verbose output
-  expect_output(suppressWarnings(eucast_rules(example_isolates, verbose = TRUE, rules = "all", info = TRUE)))
+  expect_output(suppressWarnings(interpretive_rules(example_isolates, verbose = TRUE, rules = "all", info = TRUE)))
 
   # AmpC de-repressed cephalo mutants
 
   expect_identical(
-    eucast_rules(
+    interpretive_rules(
       data.frame(
         mo = c("Escherichia coli", "Enterobacter cloacae"),
         cefotax = as.sir(c("S", "S"))
@@ -187,7 +188,7 @@ test_that("test-eucast_rules.R", {
   )
 
   expect_identical(
-    eucast_rules(
+    interpretive_rules(
       data.frame(
         mo = c("Escherichia coli", "Enterobacter cloacae"),
         cefotax = as.sir(c("S", "S"))
@@ -201,7 +202,7 @@ test_that("test-eucast_rules.R", {
   )
 
   expect_identical(
-    eucast_rules(
+    interpretive_rules(
       data.frame(
         mo = c("Escherichia coli", "Enterobacter cloacae"),
         cefotax = as.sir(c("S", "S"))
@@ -219,7 +220,7 @@ test_that("test-eucast_rules.R", {
   expect_inherits(eucast_dosage(c("tobra", "genta", "cipro")), "data.frame")
 
 
-  x <- custom_eucast_rules(
+  x <- custom_interpretive_rules(
     AMC == "R" & genus == "Klebsiella" ~ aminopenicillins == "R",
     AMC == "I" & genus == "Klebsiella" ~ aminopenicillins == "I",
     AMX == "S" ~ AMC == "S"
@@ -230,7 +231,7 @@ test_that("test-eucast_rules.R", {
 
   # this custom rules makes 8 changes
   expect_equal(
-    nrow(eucast_rules(example_isolates,
+    nrow(interpretive_rules(example_isolates,
       rules = "custom",
       custom_rules = x,
       info = FALSE,
@@ -240,4 +241,10 @@ test_that("test-eucast_rules.R", {
     8,
     tolerance = 0.5
   )
+
+  # clsi_rules() no longer errors (returns data unchanged until CLSI rows are added)
+  expect_identical(
+    suppressWarnings(clsi_rules(example_isolates, info = FALSE)),
+    example_isolates
+  )
 })

tests/testthat/test-mo.R

@@ -84,6 +84,16 @@ test_that("test-mo.R", {
 
   # expect_warning(as.mo("Acinetobacter calcoaceticus/baumannii complex"))
 
+  # Issue #287: "X complex" fallback to "X" when complex is not a distinct taxon
+  expect_identical(as.character(suppressWarnings(as.mo("Proteus vulgaris complex"))), as.character(suppressWarnings(as.mo("Proteus vulgaris"))))
+  expect_identical(as.character(suppressWarnings(as.mo("Enterobacter cloacae complex"))), as.character(as.mo("Enterobacter cloacae complex")))
+
+  # Issue #288: abbreviated genus with exact species epithet match should win
+  expect_identical(
+    as.character(suppressWarnings(as.mo("S. apiospermum"))),
+    as.character(suppressWarnings(as.mo("Scedosporium apiospermum")))
+  )
+
   # prevalent MO
   expect_identical(
     suppressWarnings(as.character(

tests/testthat/test-sir.R

@@ -441,94 +441,111 @@ test_that("test-sir.R", {
   # Tests must pass even when only 1 core is available; parallel = TRUE then
   # silently falls back to sequential, but results must still be identical.
 
-  set.seed(42)
-  n_par <- 200
-  df_par <- data.frame(
-    mo = "B_ESCHR_COLI",
-    AMC = as.mic(sample(c("0.25", "0.5", "1", "2", "4", "8", "16", "32"), n_par, TRUE)),
-    GEN = as.mic(sample(c("0.5", "1", "2", "4", "8", "16", "32", "64"), n_par, TRUE)),
-    CIP = as.mic(sample(c("0.001", "0.002", "0.004", "0.008", "0.016", "0.032"), n_par, TRUE)),
-    PEN = sample(c("S", "I", "R", NA_character_), n_par, TRUE),
-    stringsAsFactors = FALSE
-  )
+  if (AMR:::pkg_is_available("future.apply")) {
+    set.seed(42)
+    n_par <- 200
+    df_par <- data.frame(
+      mo = "B_ESCHR_COLI",
+      AMC = as.mic(sample(c("0.25", "0.5", "1", "2", "4", "8", "16", "32"), n_par, TRUE)),
+      GEN = as.mic(sample(c("0.5", "1", "2", "4", "8", "16", "32", "64"), n_par, TRUE)),
+      CIP = as.mic(sample(c("0.001", "0.002", "0.004", "0.008", "0.016", "0.032"), n_par, TRUE)),
+      PEN = sample(c("S", "I", "R", NA_character_), n_par, TRUE),
+      stringsAsFactors = FALSE
+    )
 
-  # clear any existing history before comparing
-  sir_interpretation_history(clean = TRUE)
-  sir_seq <- suppressMessages(as.sir(df_par, col_mo = "mo", info = FALSE))
-  log_seq <- sir_interpretation_history(clean = TRUE)
+    # clear any existing history before comparing
+    sir_interpretation_history(clean = TRUE)
+    sir_seq <- suppressMessages(as.sir(df_par, col_mo = "mo", info = FALSE))
+    log_seq <- sir_interpretation_history(clean = TRUE)
 
-  sir_par <- suppressMessages(as.sir(df_par, col_mo = "mo", info = FALSE, parallel = TRUE))
-  log_par <- sir_interpretation_history(clean = TRUE)
+    future::plan(future::multicore)
+    n_max_workers <- future::nbrOfWorkers()
 
-  # 1. parallel = TRUE gives identical SIR results to sequential
-  expect_identical(sir_seq[["AMC"]], sir_par[["AMC"]])
-  expect_identical(sir_seq[["GEN"]], sir_par[["GEN"]])
-  expect_identical(sir_seq[["CIP"]], sir_par[["CIP"]])
-  expect_identical(sir_seq[["PEN"]], sir_par[["PEN"]])
+    sir_par <- suppressMessages(as.sir(df_par, col_mo = "mo", info = FALSE, parallel = TRUE))
+    log_par <- sir_interpretation_history(clean = TRUE)
 
-  # 2. same number of log rows as sequential
-  expect_equal(nrow(log_seq), nrow(log_par))
+    # 1. parallel = TRUE gives identical SIR results to sequential
+    expect_identical(sir_seq[["AMC"]], sir_par[["AMC"]])
+    expect_identical(sir_seq[["GEN"]], sir_par[["GEN"]])
+    expect_identical(sir_seq[["CIP"]], sir_par[["CIP"]])
+    expect_identical(sir_seq[["PEN"]], sir_par[["PEN"]])
 
-  # 3. pre-existing log entries must not be duplicated
-  #    run sequential once to populate the history, then run parallel and
-  #    verify the new parallel run adds exactly as many rows as sequential
-  sir_interpretation_history(clean = TRUE)
-  suppressMessages(as.sir(df_par, col_mo = "mo", info = FALSE)) # populate history
-  pre_n <- nrow(sir_interpretation_history())
-  suppressMessages(as.sir(df_par, col_mo = "mo", info = FALSE, parallel = TRUE))
-  post_n <- nrow(sir_interpretation_history())
-  expect_equal(post_n - pre_n, nrow(log_seq)) # exactly one run's worth of new rows
-  sir_interpretation_history(clean = TRUE)
+    # 2. same number of log rows as sequential
+    expect_equal(nrow(log_seq), nrow(log_par))
 
-  # 4. two sequential runs and two parallel runs yield identical results
-  sir_par2 <- suppressMessages(as.sir(df_par, col_mo = "mo", info = FALSE, parallel = TRUE))
-  expect_identical(sir_par[["AMC"]], sir_par2[["AMC"]])
-  expect_identical(sir_par[["GEN"]], sir_par2[["GEN"]])
+    # 3. pre-existing log entries must not be duplicated
+    #    run sequential once to populate the history, then run parallel and
+    #    verify the new parallel run adds exactly as many rows as sequential
+    sir_interpretation_history(clean = TRUE)
+    future::plan(future::sequential)
+    suppressMessages(as.sir(df_par, col_mo = "mo", info = FALSE)) # populate history
+    pre_n <- nrow(sir_interpretation_history())
+    future::plan(future::multicore)
+    suppressMessages(as.sir(df_par, col_mo = "mo", info = FALSE, parallel = TRUE))
+    post_n <- nrow(sir_interpretation_history())
+    expect_equal(post_n - pre_n, nrow(log_seq)) # exactly one run's worth of new rows
+    sir_interpretation_history(clean = TRUE)
 
-  # 5. max_cores = 1 gives same results as default sequential
-  sir_mc1 <- suppressMessages(as.sir(df_par, col_mo = "mo", info = FALSE, parallel = TRUE, max_cores = 1L))
-  expect_identical(sir_seq[["AMC"]], sir_mc1[["AMC"]])
-  expect_identical(sir_seq[["GEN"]], sir_mc1[["GEN"]])
+    # 4. two sequential runs and two parallel runs yield identical results
+    sir_par2 <- suppressMessages(as.sir(df_par, col_mo = "mo", info = FALSE, parallel = TRUE))
+    expect_identical(sir_par[["AMC"]], sir_par2[["AMC"]])
+    expect_identical(sir_par[["GEN"]], sir_par2[["GEN"]])
 
-  # 6. max_cores = 2 and max_cores = 3 give same results as sequential
-  sir_mc2 <- suppressMessages(as.sir(df_par, col_mo = "mo", info = FALSE, parallel = TRUE, max_cores = 2L))
-  sir_mc3 <- suppressMessages(as.sir(df_par, col_mo = "mo", info = FALSE, parallel = TRUE, max_cores = 3L))
-  expect_identical(sir_seq[["AMC"]], sir_mc2[["AMC"]])
-  expect_identical(sir_seq[["GEN"]], sir_mc3[["GEN"]])
+    # 5. used cores = 1 gives same results as default sequential
+    future::plan(future::multicore, workers = 1)
+    sir_mc1 <- suppressMessages(as.sir(df_par, col_mo = "mo", info = FALSE, parallel = TRUE))
+    expect_identical(sir_seq[["AMC"]], sir_mc1[["AMC"]])
+    expect_identical(sir_seq[["GEN"]], sir_mc1[["GEN"]])
 
-  # 7. single-column data frame falls back silently to sequential
-  df_single <- df_par[, c("mo", "AMC")]
-  sir_single_seq <- suppressMessages(as.sir(df_single, col_mo = "mo", info = FALSE))
-  sir_single_par <- suppressMessages(as.sir(df_single, col_mo = "mo", info = FALSE, parallel = TRUE))
-  expect_identical(sir_single_seq[["AMC"]], sir_single_par[["AMC"]])
+    # 6. used cores = 2 and used cores = 3 give same results as sequential
+    if (n_max_workers >= 3) {
+      future::plan(future::multicore, workers = 2)
+      sir_mc2 <- suppressMessages(as.sir(df_par, col_mo = "mo", info = FALSE, parallel = TRUE))
+      future::plan(future::multicore, workers = 3)
+      sir_mc3 <- suppressMessages(as.sir(df_par, col_mo = "mo", info = FALSE, parallel = TRUE))
+      expect_identical(sir_seq[["AMC"]], sir_mc2[["AMC"]])
+      expect_identical(sir_seq[["GEN"]], sir_mc3[["GEN"]])
+    }
 
-  # 9. row-batch mode (n_cols < n_cores): force row splitting via max_cores and
-  #    verify identical output to sequential for a dataset with 2 AB columns so
-  #    pieces_per_col = ceiling(max_cores / 2) >= 2 and row batching activates
-  df_wide <- data.frame(
-    mo = "B_ESCHR_COLI",
-    AMC = as.mic(sample(c("1", "2", "4", "8"), n_par, TRUE)),
-    GEN = as.mic(sample(c("1", "2", "4", "8"), n_par, TRUE)),
-    stringsAsFactors = FALSE
-  )
-  sir_wide_seq <- suppressMessages(as.sir(df_wide, col_mo = "mo", info = FALSE))
-  sir_wide_par <- suppressMessages(as.sir(df_wide,
-    col_mo = "mo", info = FALSE,
-    parallel = TRUE, max_cores = 8L
-  ))
-  expect_identical(sir_wide_seq[["AMC"]], sir_wide_par[["AMC"]])
-  expect_identical(sir_wide_seq[["GEN"]], sir_wide_par[["GEN"]])
+    # 7. single-column data frame falls back silently to sequential
+    df_single <- df_par[, c("mo", "AMC")]
+    future::plan(future::sequential)
+    sir_single_seq <- suppressMessages(as.sir(df_single, col_mo = "mo", info = FALSE))
+    future::plan(future::multicore)
+    sir_single_par <- suppressMessages(as.sir(df_single, col_mo = "mo", info = FALSE, parallel = TRUE))
+    expect_identical(sir_single_seq[["AMC"]], sir_single_par[["AMC"]])
 
-  # 8. info = TRUE with parallel does not produce per-column worker messages
-  #    (messages should only appear in the main process, not duplicated from workers)
-  msgs <- capture.output(
-    suppressWarnings(as.sir(df_par, col_mo = "mo", info = TRUE, parallel = TRUE)),
-    type = "message"
-  )
-  # each AB column name should appear at most once in all messages combined
-  for (ab_nm in c("AMC", "GEN", "CIP", "PEN")) {
-    n_mentions <- sum(grepl(ab_nm, msgs, fixed = TRUE))
-    expect_lte(n_mentions, 1L)
+    # 8. row-batch mode (n_cols < n_cores): force row splitting via used cores and
+    #    verify identical output to sequential for a dataset with 2 AB columns so
+    #    pieces_per_col = ceiling(used cores / 2) >= 2 and row batching activates
+    df_wide <- data.frame(
+      mo = "B_ESCHR_COLI",
+      AMC = as.mic(sample(c("1", "2", "4", "8"), n_par, TRUE)),
+      GEN = as.mic(sample(c("1", "2", "4", "8"), n_par, TRUE)),
+      stringsAsFactors = FALSE
+    )
+    future::plan(future::sequential)
+    sir_wide_seq <- suppressMessages(as.sir(df_wide, col_mo = "mo", info = FALSE))
+    future::plan(future::multicore)
+    sir_wide_par <- suppressMessages(as.sir(df_wide,
+      col_mo = "mo", info = FALSE,
+      parallel = TRUE
+    ))
+    expect_identical(sir_wide_seq[["AMC"]], sir_wide_par[["AMC"]])
+    expect_identical(sir_wide_seq[["GEN"]], sir_wide_par[["GEN"]])
+
+    # 8. info = TRUE with parallel does not produce per-column worker messages
+    #    (messages should only appear in the main process, not duplicated from workers)
+    msgs <- capture.output(
+      suppressWarnings(as.sir(df_par, col_mo = "mo", info = TRUE, parallel = TRUE)),
+      type = "message"
+    )
+    # each AB column name should appear at most once in all messages combined
+    for (ab_nm in c("AMC", "GEN", "CIP", "PEN")) {
+      n_mentions <- sum(grepl(ab_nm, msgs, fixed = TRUE))
+      expect_lte(n_mentions, 1L)
+    }
+    future::plan(future::sequential)
   }
 })