# Load required libraries
library ( tidymodels ) # For machine learning workflows, and data manipulation (dplyr, tidyr, ...)
-#> ── Attaching packages ────────────────────────────────────── tidymodels 1.2.0 ──
+#> ── Attaching packages ────────────────────────────────────── tidymodels 1.3.0 ──
#> ✔ broom 1.0.7 ✔ recipes 1.1.1
#> ✔ dials 1.4.0 ✔ rsample 1.2.1
#> ✔ dplyr 1.1.4 ✔ tibble 3.2.1
#> ✔ ggplot2 3.5.1 ✔ tidyr 1.3.1
-#> ✔ infer 1.0.7 ✔ tune 1.2.1
-#> ✔ modeldata 1.4.0 ✔ workflows 1.1.4
+#> ✔ infer 1.0.7 ✔ tune 1.3.0
+#> ✔ modeldata 1.4.0 ✔ workflows 1.2.0
#> ✔ parsnip 1.3.0 ✔ workflowsets 1.1.0
#> ✔ purrr 1.0.4 ✔ yardstick 1.3.2
#> ── Conflicts ───────────────────────────────────────── tidymodels_conflicts() ──
@@ -142,7 +142,6 @@ package.
#> ✖ dplyr ::filter() masks stats ::filter()
#> ✖ dplyr ::lag() masks stats ::lag()
#> ✖ recipes ::step() masks stats ::step()
-#> • Use suppressPackageStartupMessages() to eliminate package startup messages
library ( AMR ) # For AMR data analysis
# Load the example_isolates dataset
diff --git a/articles/EUCAST.html b/articles/EUCAST.html
index 6f396f6de..acccf972d 100644
--- a/articles/EUCAST.html
+++ b/articles/EUCAST.html
@@ -31,7 +31,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/articles/MDR.html b/articles/MDR.html
index 23d4b42c2..1e28d0b68 100644
--- a/articles/MDR.html
+++ b/articles/MDR.html
@@ -31,7 +31,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/articles/PCA.html b/articles/PCA.html
index 9e9c97ba7..9256c16f6 100644
--- a/articles/PCA.html
+++ b/articles/PCA.html
@@ -31,7 +31,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/articles/WHONET.html b/articles/WHONET.html
index 9a96a1111..a9895b513 100644
--- a/articles/WHONET.html
+++ b/articles/WHONET.html
@@ -31,7 +31,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/articles/datasets.html b/articles/datasets.html
index 7bd283e69..36601c372 100644
--- a/articles/datasets.html
+++ b/articles/datasets.html
@@ -31,7 +31,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
@@ -79,7 +79,7 @@
-
AMR 2.1.1.9152
+
AMR 2.1.1.9153
(this beta version will eventually become v3.0. We’re happy to reach a new major milestone soon, which will be all about the new One Health support! Install this beta using the instructions here .)
-
A New Milestone: AMR v3.0 with One Health Support (= Human + Veterinary + Environmental)
+
A New Milestone: AMR v3.0 with One Health Support (= Human + Veterinary + Environmental)
This package now supports not only tools for AMR data analysis in clinical settings, but also for veterinary and environmental microbiology. This was made possible through a collaboration with the University of Prince Edward Island’s Atlantic Veterinary College , Canada. To celebrate this great improvement of the package, we also updated the package logo to reflect this change.
-
Breaking
+
Breaking
Removed all functions and references that used the deprecated rsi
class, which were all replaced with their sir
equivalents two years ago
-
New
+
New
One Health implementation
Function as.sir()
now has extensive support for veterinary breakpoints from CLSI. Use breakpoint_type = "animal"
and set the host
argument to a variable that contains animal species names.
@@ -110,7 +110,7 @@
-
Changed
+
Changed
SIR interpretation
It is now possible to use column names for argument ab
, mo
, and uti
: as.sir(..., ab = "column1", mo = "column2", uti = "column3")
. This greatly improves the flexibility for users.
Users can now set their own criteria (using regular expressions) as to what should be considered S, I, R, SDD, and NI.
@@ -180,7 +180,7 @@
Added console colours support of sir
class for Positron
-
Other
+
Other
Added Dr. Larisse Bolton as contributor for her fantastic implementation of WISCA in a mathematically solid way
Added Matthew Saab, Dr. Jordan Stull, and Prof. Javier Sanchez as contributors for their tremendous input on veterinary breakpoints and interpretations
Greatly improved vctrs
integration, a Tidyverse package working in the background for many Tidyverse functions. For users, this means that functions such as dplyr
’s bind_rows()
, rowwise()
and c_across()
are now supported for e.g. columns of class mic
. Despite this, this AMR
package is still zero-dependent on any other package, including dplyr
and vctrs
.
@@ -188,7 +188,7 @@
Stopped support for SAS (.xpt
) files, since their file structure and extremely inefficient and requires more disk space than GitHub allows in a single commit.
-
Older Versions
+
Older Versions
This changelog only contains changes from AMR v3.0 (February 2025) and later.
For prior v2 versions, please see our v2 archive .
For prior v1 versions, please see our v1 archive .
diff --git a/pkgdown.yml b/pkgdown.yml
index 2ae1d86d4..39e8af51f 100644
--- a/pkgdown.yml
+++ b/pkgdown.yml
@@ -12,7 +12,7 @@ articles:
resistance_predict: resistance_predict.html
welcome_to_AMR: welcome_to_AMR.html
WHONET: WHONET.html
-last_built: 2025-02-18T08:44Z
+last_built: 2025-02-22T20:30Z
urls:
reference: https://msberends.github.io/AMR/reference
article: https://msberends.github.io/AMR/articles
diff --git a/reference/AMR-deprecated.html b/reference/AMR-deprecated.html
index 4064cc0f1..9d495b373 100644
--- a/reference/AMR-deprecated.html
+++ b/reference/AMR-deprecated.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/AMR-options.html b/reference/AMR-options.html
index 5e3dd5d59..72765ebbc 100644
--- a/reference/AMR-options.html
+++ b/reference/AMR-options.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/AMR.html b/reference/AMR.html
index b7133ac31..957e81e6b 100644
--- a/reference/AMR.html
+++ b/reference/AMR.html
@@ -21,7 +21,7 @@ The AMR package is available in English, Chinese, Czech, Danish, Dutch, Finnish,
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/WHOCC.html b/reference/WHOCC.html
index f438b46d0..e508d372a 100644
--- a/reference/WHOCC.html
+++ b/reference/WHOCC.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/WHONET.html b/reference/WHONET.html
index 5e4c6ff8e..a171e9bf0 100644
--- a/reference/WHONET.html
+++ b/reference/WHONET.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/ab_from_text.html b/reference/ab_from_text.html
index 60e668401..ea00f4c3d 100644
--- a/reference/ab_from_text.html
+++ b/reference/ab_from_text.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/ab_property.html b/reference/ab_property.html
index af0c0a593..7b68e5894 100644
--- a/reference/ab_property.html
+++ b/reference/ab_property.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/add_custom_antimicrobials.html b/reference/add_custom_antimicrobials.html
index 12dbda6dc..3d9f52bd6 100644
--- a/reference/add_custom_antimicrobials.html
+++ b/reference/add_custom_antimicrobials.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/add_custom_microorganisms.html b/reference/add_custom_microorganisms.html
index d59781f71..248edee60 100644
--- a/reference/add_custom_microorganisms.html
+++ b/reference/add_custom_microorganisms.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/age.html b/reference/age.html
index 746a03aaf..bd9e39371 100644
--- a/reference/age.html
+++ b/reference/age.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
@@ -111,16 +111,16 @@
df
#> birth_date age age_exact age_at_y2k
-#> 1 1965-12-05 59 59.20548 34
-#> 2 1980-03-01 44 44.96986 19
-#> 3 1949-11-01 75 75.29863 50
-#> 4 1947-02-14 78 78.01096 52
-#> 5 1940-02-19 84 84.99726 59
-#> 6 1988-01-10 37 37.10685 11
-#> 7 1997-08-27 27 27.47945 2
-#> 8 1978-01-26 47 47.06301 21
-#> 9 1972-06-17 52 52.67397 27
-#> 10 1986-08-10 38 38.52603 13
+#> 1 1965-12-05 59 59.21644 34
+#> 2 1980-03-01 44 44.98082 19
+#> 3 1949-11-01 75 75.30959 50
+#> 4 1947-02-14 78 78.02192 52
+#> 5 1940-02-19 85 85.00822 59
+#> 6 1988-01-10 37 37.11781 11
+#> 7 1997-08-27 27 27.49041 2
+#> 8 1978-01-26 47 47.07397 21
+#> 9 1972-06-17 52 52.68493 27
+#> 10 1986-08-10 38 38.53699 13
On this page
diff --git a/reference/age_groups.html b/reference/age_groups.html
index 191d5099c..d4fb0de25 100644
--- a/reference/age_groups.html
+++ b/reference/age_groups.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/antibiogram.html b/reference/antibiogram.html
index 4f3f30100..8da1b7a0f 100644
--- a/reference/antibiogram.html
+++ b/reference/antibiogram.html
@@ -9,7 +9,7 @@ Adhering to previously described approaches (see Source) and especially the Baye
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/antibiotics.html b/reference/antibiotics.html
index 122066f59..0439a5dce 100644
--- a/reference/antibiotics.html
+++ b/reference/antibiotics.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/antimicrobial_selectors.html b/reference/antimicrobial_selectors.html
index d3abb33e9..6d8bf7462 100644
--- a/reference/antimicrobial_selectors.html
+++ b/reference/antimicrobial_selectors.html
@@ -17,7 +17,7 @@ my_data_with_all_these_columns %>%
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/as.ab.html b/reference/as.ab.html
index 7dde01642..c8f4754cf 100644
--- a/reference/as.ab.html
+++ b/reference/as.ab.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/as.av.html b/reference/as.av.html
index 50c1daf45..2cf10d3b2 100644
--- a/reference/as.av.html
+++ b/reference/as.av.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/as.disk.html b/reference/as.disk.html
index 3fd759caf..95fb01e58 100644
--- a/reference/as.disk.html
+++ b/reference/as.disk.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/as.mic.html b/reference/as.mic.html
index 48bdc1b93..a0fa0797d 100644
--- a/reference/as.mic.html
+++ b/reference/as.mic.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
@@ -83,7 +83,7 @@
mic_range
-a manual range to limit the MIC values, e.g., mic_range = c(0.001, 32)
. Use NA
to prevent a limit on one side, e.g., mic_range = c(NA, 32)
.
+a manual range to rescale the MIC values, e.g., mic_range = c(0.001, 32)
. Use NA
to prevent rescaling on one side, e.g., mic_range = c(NA, 32)
.
as.mic
diff --git a/reference/as.mo.html b/reference/as.mo.html
index c76e218a1..e5777d1b4 100644
--- a/reference/as.mo.html
+++ b/reference/as.mo.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/as.sir.html b/reference/as.sir.html
index 407ab4de3..7d7553a38 100644
--- a/reference/as.sir.html
+++ b/reference/as.sir.html
@@ -21,7 +21,7 @@ All breakpoints used for interpretation are available in our clinical_breakpoint
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
@@ -782,16 +782,16 @@ A microorganism is categorised as "Resistant" when there is a high likelihood of
#> # A tibble: 57 × 16
#> datetime index ab_given mo_given host_given ab mo
#> * <dttm> <int> <chr> <chr> <chr> <ab> <mo>
-#> 1 2025-02-18 08:45:38 4 AMX B_STRPT… human AMX B_ STRPT_ PNMN
-#> 2 2025-02-18 08:45:44 4 genta Escheri… human GEN B_ [ORD]_ ENTRBCTR
-#> 3 2025-02-18 08:45:44 4 genta Escheri… human GEN B_ [ORD]_ ENTRBCTR
-#> 4 2025-02-18 08:45:45 4 genta Escheri… cattle GEN B_ ESCHR_ COLI
-#> 5 2025-02-18 08:45:45 4 genta Escheri… cattle GEN B_ ESCHR_ COLI
-#> 6 2025-02-18 08:45:38 3 AMX B_STRPT… human AMX B_ STRPT_ PNMN
-#> 7 2025-02-18 08:45:44 3 tobra Escheri… human TOB B_ [ORD]_ ENTRBCTR
-#> 8 2025-02-18 08:45:44 3 tobra Escheri… human TOB B_ [ORD]_ ENTRBCTR
-#> 9 2025-02-18 08:45:45 3 tobra Escheri… horses TOB B_ ESCHR_ COLI
-#> 10 2025-02-18 08:45:45 3 tobra Escheri… horses TOB B_ ESCHR_ COLI
+#> 1 2025-02-22 20:31:37 4 AMX B_STRPT… human AMX B_ STRPT_ PNMN
+#> 2 2025-02-22 20:31:43 4 genta Escheri… human GEN B_ [ORD]_ ENTRBCTR
+#> 3 2025-02-22 20:31:44 4 genta Escheri… human GEN B_ [ORD]_ ENTRBCTR
+#> 4 2025-02-22 20:31:44 4 genta Escheri… cattle GEN B_ ESCHR_ COLI
+#> 5 2025-02-22 20:31:45 4 genta Escheri… cattle GEN B_ ESCHR_ COLI
+#> 6 2025-02-22 20:31:37 3 AMX B_STRPT… human AMX B_ STRPT_ PNMN
+#> 7 2025-02-22 20:31:43 3 tobra Escheri… human TOB B_ [ORD]_ ENTRBCTR
+#> 8 2025-02-22 20:31:44 3 tobra Escheri… human TOB B_ [ORD]_ ENTRBCTR
+#> 9 2025-02-22 20:31:44 3 tobra Escheri… horses TOB B_ ESCHR_ COLI
+#> 10 2025-02-22 20:31:45 3 tobra Escheri… horses TOB B_ ESCHR_ COLI
#> # ℹ 47 more rows
#> # ℹ 9 more variables: host <chr>, method <chr>, input <chr>, outcome <sir>,
#> # notes <chr>, guideline <chr>, ref_table <chr>, uti <lgl>,
diff --git a/reference/atc_online.html b/reference/atc_online.html
index 1e0badbcd..eb5246469 100644
--- a/reference/atc_online.html
+++ b/reference/atc_online.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/av_from_text.html b/reference/av_from_text.html
index 73c0fdc7e..dc472e8ee 100644
--- a/reference/av_from_text.html
+++ b/reference/av_from_text.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/av_property.html b/reference/av_property.html
index 23092438f..bbb6a4376 100644
--- a/reference/av_property.html
+++ b/reference/av_property.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/availability.html b/reference/availability.html
index f81a0ff49..56762a33e 100644
--- a/reference/availability.html
+++ b/reference/availability.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/bug_drug_combinations.html b/reference/bug_drug_combinations.html
index 1b3235142..bf04fef7f 100644
--- a/reference/bug_drug_combinations.html
+++ b/reference/bug_drug_combinations.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/clinical_breakpoints.html b/reference/clinical_breakpoints.html
index 529559705..f29f45e5a 100644
--- a/reference/clinical_breakpoints.html
+++ b/reference/clinical_breakpoints.html
@@ -21,7 +21,7 @@ Use as.sir() to transform MICs or disks measurements to SIR values."> AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/count.html b/reference/count.html
index b491f3a59..8ec724945 100644
--- a/reference/count.html
+++ b/reference/count.html
@@ -9,7 +9,7 @@ count_resistant() should be used to count resistant isolates, count_susceptible(
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/custom_eucast_rules.html b/reference/custom_eucast_rules.html
index 0c3a592c6..0ea642c1c 100644
--- a/reference/custom_eucast_rules.html
+++ b/reference/custom_eucast_rules.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/dosage.html b/reference/dosage.html
index 8c5334607..828348ccd 100644
--- a/reference/dosage.html
+++ b/reference/dosage.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/eucast_rules.html b/reference/eucast_rules.html
index d185d7ac2..d820483bb 100644
--- a/reference/eucast_rules.html
+++ b/reference/eucast_rules.html
@@ -9,7 +9,7 @@ To improve the interpretation of the antibiogram before EUCAST rules are applied
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/example_isolates.html b/reference/example_isolates.html
index 9b8718346..dd3108240 100644
--- a/reference/example_isolates.html
+++ b/reference/example_isolates.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/example_isolates_unclean.html b/reference/example_isolates_unclean.html
index f90252c50..ace07a7c5 100644
--- a/reference/example_isolates_unclean.html
+++ b/reference/example_isolates_unclean.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/export_ncbi_biosample.html b/reference/export_ncbi_biosample.html
index 90aa3f1e0..74467b312 100644
--- a/reference/export_ncbi_biosample.html
+++ b/reference/export_ncbi_biosample.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/first_isolate.html b/reference/first_isolate.html
index f40607f7b..d923b55a3 100644
--- a/reference/first_isolate.html
+++ b/reference/first_isolate.html
@@ -9,7 +9,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/g.test.html b/reference/g.test.html
index 2e24b3d27..c0cbf6a8d 100644
--- a/reference/g.test.html
+++ b/reference/g.test.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/get_episode.html b/reference/get_episode.html
index 398a9336f..d37a137d4 100644
--- a/reference/get_episode.html
+++ b/reference/get_episode.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/ggplot_pca.html b/reference/ggplot_pca.html
index 1f68dd686..18c361d49 100644
--- a/reference/ggplot_pca.html
+++ b/reference/ggplot_pca.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/ggplot_sir.html b/reference/ggplot_sir.html
index e4c1e1544..b01588779 100644
--- a/reference/ggplot_sir.html
+++ b/reference/ggplot_sir.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/guess_ab_col.html b/reference/guess_ab_col.html
index d7dc58b87..4b1c77654 100644
--- a/reference/guess_ab_col.html
+++ b/reference/guess_ab_col.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/index.html b/reference/index.html
index 25d5b96d8..f965a7bc1 100644
--- a/reference/index.html
+++ b/reference/index.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/intrinsic_resistant.html b/reference/intrinsic_resistant.html
index 8f8964750..a55c127df 100644
--- a/reference/intrinsic_resistant.html
+++ b/reference/intrinsic_resistant.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/italicise_taxonomy.html b/reference/italicise_taxonomy.html
index a55a9d8d3..d95513ced 100644
--- a/reference/italicise_taxonomy.html
+++ b/reference/italicise_taxonomy.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/join.html b/reference/join.html
index 8aca00c90..c4e93ff2f 100644
--- a/reference/join.html
+++ b/reference/join.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/key_antimicrobials.html b/reference/key_antimicrobials.html
index 99592ed5e..a04bef142 100644
--- a/reference/key_antimicrobials.html
+++ b/reference/key_antimicrobials.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/kurtosis.html b/reference/kurtosis.html
index 6a68c6d51..3664dabba 100644
--- a/reference/kurtosis.html
+++ b/reference/kurtosis.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/like.html b/reference/like.html
index 4803c1515..49018683c 100644
--- a/reference/like.html
+++ b/reference/like.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/mdro.html b/reference/mdro.html
index b94218812..193d39bd4 100644
--- a/reference/mdro.html
+++ b/reference/mdro.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/mean_amr_distance.html b/reference/mean_amr_distance.html
index 2638c9979..3a4420276 100644
--- a/reference/mean_amr_distance.html
+++ b/reference/mean_amr_distance.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/microorganisms.codes.html b/reference/microorganisms.codes.html
index 8e875ce49..01bcec8e1 100644
--- a/reference/microorganisms.codes.html
+++ b/reference/microorganisms.codes.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/microorganisms.groups.html b/reference/microorganisms.groups.html
index 72ca88231..fc2caeea6 100644
--- a/reference/microorganisms.groups.html
+++ b/reference/microorganisms.groups.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/microorganisms.html b/reference/microorganisms.html
index c830a686e..fb3cc5211 100644
--- a/reference/microorganisms.html
+++ b/reference/microorganisms.html
@@ -9,7 +9,7 @@ This data set is carefully crafted, yet made 100% reproducible from public and a
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/mo_matching_score.html b/reference/mo_matching_score.html
index 8955f8582..3b5bb2d46 100644
--- a/reference/mo_matching_score.html
+++ b/reference/mo_matching_score.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/mo_property.html b/reference/mo_property.html
index 39cf13c54..e468a945f 100644
--- a/reference/mo_property.html
+++ b/reference/mo_property.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/mo_source.html b/reference/mo_source.html
index 440892b69..feea25dba 100644
--- a/reference/mo_source.html
+++ b/reference/mo_source.html
@@ -9,7 +9,7 @@ This is the fastest way to have your organisation (or analysis) specific codes p
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/pca.html b/reference/pca.html
index d3f017634..badb73453 100644
--- a/reference/pca.html
+++ b/reference/pca.html
@@ -7,7 +7,7 @@
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
diff --git a/reference/plot-10.png b/reference/plot-10.png
index 156ca234e..8dec4586d 100644
Binary files a/reference/plot-10.png and b/reference/plot-10.png differ
diff --git a/reference/plot-11.png b/reference/plot-11.png
index 43ac4cc7c..ed646966b 100644
Binary files a/reference/plot-11.png and b/reference/plot-11.png differ
diff --git a/reference/plot-12.png b/reference/plot-12.png
index 8251241ad..58ca2e113 100644
Binary files a/reference/plot-12.png and b/reference/plot-12.png differ
diff --git a/reference/plot-13.png b/reference/plot-13.png
index c2d191300..156ca234e 100644
Binary files a/reference/plot-13.png and b/reference/plot-13.png differ
diff --git a/reference/plot-14.png b/reference/plot-14.png
index 177760a90..43ac4cc7c 100644
Binary files a/reference/plot-14.png and b/reference/plot-14.png differ
diff --git a/reference/plot-15.png b/reference/plot-15.png
index 9a5680959..8251241ad 100644
Binary files a/reference/plot-15.png and b/reference/plot-15.png differ
diff --git a/reference/plot-16.png b/reference/plot-16.png
index 04f079f59..c2d191300 100644
Binary files a/reference/plot-16.png and b/reference/plot-16.png differ
diff --git a/reference/plot-17.png b/reference/plot-17.png
index 6e46df467..113f104f8 100644
Binary files a/reference/plot-17.png and b/reference/plot-17.png differ
diff --git a/reference/plot-18.png b/reference/plot-18.png
index 757b104c2..3ec2e587f 100644
Binary files a/reference/plot-18.png and b/reference/plot-18.png differ
diff --git a/reference/plot-19.png b/reference/plot-19.png
index 231b81794..9a5680959 100644
Binary files a/reference/plot-19.png and b/reference/plot-19.png differ
diff --git a/reference/plot-20.png b/reference/plot-20.png
index 8c67ffa28..04f079f59 100644
Binary files a/reference/plot-20.png and b/reference/plot-20.png differ
diff --git a/reference/plot-21.png b/reference/plot-21.png
new file mode 100644
index 000000000..6e46df467
Binary files /dev/null and b/reference/plot-21.png differ
diff --git a/reference/plot-22.png b/reference/plot-22.png
new file mode 100644
index 000000000..757b104c2
Binary files /dev/null and b/reference/plot-22.png differ
diff --git a/reference/plot-23.png b/reference/plot-23.png
new file mode 100644
index 000000000..231b81794
Binary files /dev/null and b/reference/plot-23.png differ
diff --git a/reference/plot-24.png b/reference/plot-24.png
new file mode 100644
index 000000000..8c67ffa28
Binary files /dev/null and b/reference/plot-24.png differ
diff --git a/reference/plot-8.png b/reference/plot-8.png
index 8dec4586d..17e45a612 100644
Binary files a/reference/plot-8.png and b/reference/plot-8.png differ
diff --git a/reference/plot-9.png b/reference/plot-9.png
index ed646966b..26d26629e 100644
Binary files a/reference/plot-9.png and b/reference/plot-9.png differ
diff --git a/reference/plot.html b/reference/plot.html
index 1aa37316a..fe28b0d0b 100644
--- a/reference/plot.html
+++ b/reference/plot.html
@@ -9,7 +9,7 @@ Especially the scale_*_mic() functions are relevant wrappers to plot MIC values
AMR (for R)
- 2.1.1.9152
+ 2.1.1.9153
@@ -156,7 +156,7 @@ Especially the scale_*_mic() functions are relevant wrappers to plot MIC values
mic_range
-a manual range to limit the MIC values, e.g., mic_range = c(0.001, 32)
. Use NA
to prevent a limit on one side, e.g., mic_range = c(NA, 32)
.
+A manual range to rescale the MIC values (using rescale_mic()
), e.g., mic_range = c(0.001, 32)
. Use NA
to prevent rescaling on one side, e.g., mic_range = c(NA, 32)
. Note: This rescales values but does not filter them - use the ggplot2 limits
argument separately to exclude values from the plot.
...
@@ -332,25 +332,25 @@ Especially the scale_*_mic() functions are relevant wrappers to plot MIC values
scale_x_mic ( ) +
labs ( title = "with scale_x_mic()" )
}
-#> Error in if (!is.na(mic_range[1]) && mic_range[1] < lims[1]) { lims[1] <- mic_range[1]}: missing value where TRUE/FALSE needed
+
if ( require ( "ggplot2" ) ) {
mic_plot +
scale_x_mic ( keep_operators = "all" ) +
labs ( title = "with scale_x_mic() keeping all operators" )
}
-#> Error in if (!is.na(mic_range[1]) && mic_range[1] < lims[1]) { lims[1] <- mic_range[1]}: missing value where TRUE/FALSE needed
+
if ( require ( "ggplot2" ) ) {
mic_plot +
scale_x_mic ( mic_range = c ( 1 , 16 ) ) +
labs ( title = "with scale_x_mic() using a manual 'within' range" )
}
-
+
if ( require ( "ggplot2" ) ) {
mic_plot +
scale_x_mic ( mic_range = c ( 0.032 , 256 ) ) +
labs ( title = "with scale_x_mic() using a manual 'outside' range" )
}
-
+
# Plotting using scale_y_mic() -----------------------------------------
@@ -364,7 +364,7 @@ Especially the scale_*_mic() functions are relevant wrappers to plot MIC values
geom_violin ( linetype = 2 , colour = "grey" , fill = NA ) +
scale_y_mic ( )
}
-#> Error in if (!is.na(mic_range[1]) && mic_range[1] < lims[1]) { lims[1] <- mic_range[1]}: missing value where TRUE/FALSE needed
+
if ( require ( "ggplot2" ) ) {
ggplot ( data.frame ( mic = some_mic_values ,
group = some_groups ) ,
@@ -373,7 +373,7 @@ Especially the scale_*_mic() functions are relevant wrappers to plot MIC values
geom_violin ( linetype = 2 , colour = "grey" , fill = NA ) +
scale_y_mic ( mic_range = c ( NA , 2 ) )
}
-
+
# Plotting using scale_fill_mic() -----------------------------------------
@@ -387,7 +387,7 @@ Especially the scale_*_mic() functions are relevant wrappers to plot MIC values
geom_col ( ) +
scale_fill_mic ( mic_range = c ( 0.5 , 16 ) )
}
-
+
# Plotting using scale_x_sir() -----------------------------------------
if ( require ( "ggplot2" ) ) {
@@ -397,7 +397,7 @@ Especially the scale_*_mic() functions are relevant wrappers to plot MIC values
geom_col ( ) +
scale_x_sir ( )
}
-
+
# Plotting using scale_y_mic() and scale_colour_sir() ------------------
@@ -421,36 +421,36 @@ Especially the scale_*_mic() functions are relevant wrappers to plot MIC values
#> Interpreting MIC values: ' cipro ' (CIP, ciprofloxacin), EUCAST 2024 ...
#> NOTE
#> • Multiple breakpoints available for ciprofloxacin (CIP) in Escherichia coli - assuming body site 'Non-meningitis'.
-
+
if ( require ( "ggplot2" ) ) {
# and now with our MIC and SIR scale functions:
plain +
scale_y_mic ( ) +
scale_colour_sir ( )
}
-#> Error in if (!is.na(mic_range[1]) && mic_range[1] < lims[1]) { lims[1] <- mic_range[1]}: missing value where TRUE/FALSE needed
+
if ( require ( "ggplot2" ) ) {
plain +
scale_y_mic ( mic_range = c ( 0.005 , 32 ) , name = "Our MICs!" ) +
scale_colour_sir ( language = "nl" , eucast_I = FALSE ,
name = "In Dutch!" )
}
-
+
# Plotting using ggplot2's autoplot() ----------------------------------
if ( require ( "ggplot2" ) ) {
autoplot ( some_mic_values )
}
-
+
if ( require ( "ggplot2" ) ) {
autoplot ( some_disk_values , mo = "Escherichia coli" , ab = "cipro" )
}
-
+
if ( require ( "ggplot2" ) ) {
autoplot ( some_sir_values )
}
-
+
# Plotting using scale_y_percent() -------------------------------------
@@ -471,9 +471,9 @@ Especially the scale_*_mic() functions are relevant wrappers to plot MIC values
limits = c ( 0 , 1 ) ) +
theme_sir ( )
}
-
-
-
+
+
+
# }
diff --git a/reference/proportion.html b/reference/proportion.html
index a9092fce9..12d978f18 100644
--- a/reference/proportion.html
+++ b/reference/proportion.html
@@ -9,7 +9,7 @@ resistance() should be used to calculate resistance, susceptibility() should be