diff --git a/404.html b/404.html index 15cd07c5..fe1a62d7 100644 --- a/404.html +++ b/404.html @@ -14,7 +14,7 @@ - + diff --git a/LICENSE-text.html b/LICENSE-text.html index 632a7b91..516404b3 100644 --- a/LICENSE-text.html +++ b/LICENSE-text.html @@ -1,5 +1,5 @@ -License • AMR (for R)License • AMR (for R) diff --git a/articles/AMR.html b/articles/AMR.html index 1e7ec6ec..4662cf50 100644 --- a/articles/AMR.html +++ b/articles/AMR.html @@ -15,7 +15,7 @@ - + @@ -204,7 +204,7 @@ website update since they are based on randomly created values and the page was written in R Markdown. However, the methodology remains unchanged. This page was -generated on 04 December 2023.

+generated on 13 February 2024.

Introduction

@@ -260,21 +260,21 @@ make the structure of your data generally look like this:

-2023-12-04 +2024-02-13 abcd Escherichia coli S S -2023-12-04 +2024-02-13 abcd Escherichia coli S R -2023-12-04 +2024-02-13 efgh Escherichia coli R diff --git a/articles/EUCAST.html b/articles/EUCAST.html index 441aa657..6ffe8021 100644 --- a/articles/EUCAST.html +++ b/articles/EUCAST.html @@ -15,7 +15,7 @@ - + diff --git a/articles/MDR.html b/articles/MDR.html index 120ffb73..85fc39f5 100644 --- a/articles/MDR.html +++ b/articles/MDR.html @@ -15,7 +15,7 @@ - + @@ -401,18 +401,18 @@ names or codes, this would have worked exactly the same way:

 head(my_TB_data)
 #>   rifampicin isoniazid gatifloxacin ethambutol pyrazinamide moxifloxacin
-#> 1          R         R            S          R            S            I
-#> 2          S         S            S          S            R            I
-#> 3          S         S            R          S            S            I
-#> 4          I         I            R          I            I            I
-#> 5          I         I            I          R            I            R
-#> 6          R         S            I          R            I            I
+#> 1          S         R            S          S            S            S
+#> 2          R         S            S          S            I            I
+#> 3          I         S            I          R            R            S
+#> 4          R         R            S          S            S            S
+#> 5          R         R            S          I            R            I
+#> 6          I         R            I          I            I            R
 #>   kanamycin
 #> 1         S
-#> 2         R
-#> 3         I
-#> 4         S
-#> 5         S
+#> 2         S
+#> 3         R
+#> 4         R
+#> 5         R
 #> 6         I

We can now add the interpretation of MDR-TB to our data set. You can use:

@@ -454,40 +454,40 @@ Unique: 5

1 Mono-resistant -3252 -65.04% -3252 -65.04% +3206 +64.12% +3206 +64.12% 2 Negative -927 -18.54% -4179 -83.58% +991 +19.82% +4197 +83.94% 3 Multi-drug-resistant -475 -9.50% -4654 -93.08% +434 +8.68% +4631 +92.62% 4 Poly-resistant -242 -4.84% -4896 -97.92% +260 +5.20% +4891 +97.82% 5 Extensively drug-resistant -104 -2.08% +109 +2.18% 5000 100.00% diff --git a/articles/PCA.html b/articles/PCA.html index 0509498a..5b852dce 100644 --- a/articles/PCA.html +++ b/articles/PCA.html @@ -15,7 +15,7 @@ - + diff --git a/articles/WHONET.html b/articles/WHONET.html index 79ca480a..74375c6f 100644 --- a/articles/WHONET.html +++ b/articles/WHONET.html @@ -15,7 +15,7 @@ - + diff --git a/articles/datasets.html b/articles/datasets.html index 88e58e78..80d2a4a4 100644 --- a/articles/datasets.html +++ b/articles/datasets.html @@ -15,7 +15,7 @@ - + @@ -193,7 +193,7 @@

The function plot is available in base R, and can be extended by other packages to depend the output based on the type of input. We extended its function to cope with resistance predictions:

diff --git a/articles/resistance_predict_files/figure-html/unnamed-chunk-4-1.png b/articles/resistance_predict_files/figure-html/unnamed-chunk-4-1.png index d7f40bdc..772320a5 100644 Binary files a/articles/resistance_predict_files/figure-html/unnamed-chunk-4-1.png and b/articles/resistance_predict_files/figure-html/unnamed-chunk-4-1.png differ diff --git a/articles/resistance_predict_files/figure-html/unnamed-chunk-5-1.png b/articles/resistance_predict_files/figure-html/unnamed-chunk-5-1.png index 11a4302a..8457f3c0 100644 Binary files a/articles/resistance_predict_files/figure-html/unnamed-chunk-5-1.png and b/articles/resistance_predict_files/figure-html/unnamed-chunk-5-1.png differ diff --git a/articles/resistance_predict_files/figure-html/unnamed-chunk-5-2.png b/articles/resistance_predict_files/figure-html/unnamed-chunk-5-2.png index 261f9679..2c8a32e3 100644 Binary files a/articles/resistance_predict_files/figure-html/unnamed-chunk-5-2.png and b/articles/resistance_predict_files/figure-html/unnamed-chunk-5-2.png differ diff --git a/articles/resistance_predict_files/figure-html/unnamed-chunk-6-1.png b/articles/resistance_predict_files/figure-html/unnamed-chunk-6-1.png index bcd9c7c0..69c1a280 100644 Binary files a/articles/resistance_predict_files/figure-html/unnamed-chunk-6-1.png and b/articles/resistance_predict_files/figure-html/unnamed-chunk-6-1.png differ diff --git a/articles/resistance_predict_files/figure-html/unnamed-chunk-7-1.png b/articles/resistance_predict_files/figure-html/unnamed-chunk-7-1.png index 6ce08ff0..cc1eb61b 100644 Binary files a/articles/resistance_predict_files/figure-html/unnamed-chunk-7-1.png and b/articles/resistance_predict_files/figure-html/unnamed-chunk-7-1.png differ diff --git a/articles/welcome_to_AMR.html b/articles/welcome_to_AMR.html index 053d1ca9..ca1838c9 100644 --- a/articles/welcome_to_AMR.html +++ b/articles/welcome_to_AMR.html @@ -15,7 +15,7 @@ - + diff --git a/authors.html b/authors.html index dccca020..581bee52 100644 --- a/authors.html +++ b/authors.html @@ -1,5 +1,5 @@ -Authors and Citation • AMR (for R)Authors and Citation • AMR (for R) diff --git a/deps/Fira_Code-0.4.7/font.css b/deps/Fira_Code-0.4.8/font.css similarity index 100% rename from deps/Fira_Code-0.4.7/font.css rename to deps/Fira_Code-0.4.8/font.css diff --git a/deps/Fira_Code-0.4.7/uU9eCBsR6Z2vfE9aq3bL0fxyUs4tcw4W_D1sFVQ.woff b/deps/Fira_Code-0.4.8/uU9eCBsR6Z2vfE9aq3bL0fxyUs4tcw4W_D1sFVQ.woff similarity index 100% rename from deps/Fira_Code-0.4.7/uU9eCBsR6Z2vfE9aq3bL0fxyUs4tcw4W_D1sFVQ.woff rename to deps/Fira_Code-0.4.8/uU9eCBsR6Z2vfE9aq3bL0fxyUs4tcw4W_D1sFVQ.woff diff --git a/deps/data-deps.txt b/deps/data-deps.txt index bc81fc50..179a3bca 100644 --- a/deps/data-deps.txt +++ b/deps/data-deps.txt @@ -2,4 +2,4 @@ - + diff --git a/index.html b/index.html index 21aeff1f..7db2229d 100644 --- a/index.html +++ b/index.html @@ -17,7 +17,7 @@ - + @@ -364,7 +364,7 @@ c("bacteria", aminoglycosides(), carbapenems())]

This base R code will work in any version of R since April 2013 (R-3.0). Moreover, this code works identically with the data.table package, only by starting with:

-example_isolates <- data.table::as.data.table(example_isolates)
+example_isolates <- data.table::as.data.table(example_isolates)

Generating antibiograms diff --git a/news/index.html b/news/index.html index 527097b1..3bccb0d5 100644 --- a/news/index.html +++ b/news/index.html @@ -1,5 +1,5 @@ -Changelog • AMR (for R)Changelog • AMR (for R) @@ -347,7 +347,7 @@
  • Argument combine_IR has been removed from this package (affecting functions count_df(), proportion_df(), and sir_df() and some plotting functions), since it was replaced with combine_SI three years ago
  • Using units in ab_ddd(..., units = "...") had been deprecated for some time and is now not supported anymore. Use ab_ddd_units() instead.
  • -
  • Support for data.frame-enhancing R packages, more specifically: data.table::data.table, janitor::tabyl, tibble::tibble, and tsibble::tsibble. AMR package functions that have a data set as output (such as sir_df() and bug_drug_combinations()), will now return the same data type as the input.
  • +
  • Support for data.frame-enhancing R packages, more specifically: data.table::data.table, janitor::tabyl, tibble::tibble, and tsibble::tsibble. AMR package functions that have a data set as output (such as sir_df() and bug_drug_combinations()), will now return the same data type as the input.
  • All data sets in this package are now a tibble, instead of base R data.frames. Older R versions are still supported, even if they do not support tibbles.
  • Our data sets are now also continually exported to Apache Feather and Apache Parquet formats. You can find more info in this article on our website.
  • For as.sir(): diff --git a/pkgdown.yml b/pkgdown.yml index 13b9bb6c..81b6b00a 100644 --- a/pkgdown.yml +++ b/pkgdown.yml @@ -11,7 +11,7 @@ articles: other_pkg: other_pkg.html resistance_predict: resistance_predict.html welcome_to_AMR: welcome_to_AMR.html -last_built: 2023-12-04T07:23Z +last_built: 2024-02-13T12:50Z urls: reference: https://msberends.github.io/AMR/reference article: https://msberends.github.io/AMR/articles diff --git a/reference/AMR-options.html b/reference/AMR-options.html index 693a12db..aba1b6f5 100644 --- a/reference/AMR-options.html +++ b/reference/AMR-options.html @@ -1,5 +1,5 @@ -Options for the AMR package — AMR-options • AMR (for R)Options for the AMR package — AMR-options • AMR (for R) diff --git a/reference/AMR.html b/reference/AMR.html index 0594635a..fbd451e8 100644 --- a/reference/AMR.html +++ b/reference/AMR.html @@ -6,7 +6,7 @@ This work was published in the Journal of Statistical Software (Volume 104(3); d and doi:10.33612/diss.192486375 ). After installing this package, R knows ~52 000 microorganisms (updated december 2022) and all ~600 antibiotic, antimycotic and antiviral drugs by name and code (including ATC, EARS-Net, ASIARS-Net, PubChem, LOINC and SNOMED CT), and knows all about valid SIR and MIC values. The integral clinical breakpoint guidelines from CLSI and EUCAST are included, even with epidemiological cut-off (ECOFF) values. It supports and can read any data format, including WHONET data. This package works on Windows, macOS and Linux with all versions of R since R-3.0 (April 2013). It was designed to work in any setting, including those with very limited resources. It was created for both routine data analysis and academic research at the Faculty of Medical Sciences of the public University of Groningen, in collaboration with non-profit organisations Certe Medical Diagnostics and Advice Foundation and University Medical Center Groningen. -The AMR package is available in English, Chinese, Czech, Danish, Dutch, Finnish, French, German, Greek, Italian, Japanese, Norwegian, Polish, Portuguese, Romanian, Russian, Spanish, Swedish, Turkish, and Ukrainian. Antimicrobial drug (group) names and colloquial microorganism names are provided in these languages.">The AMR Package — AMR • AMR (for R)The AMR Package — AMR • AMR (for R)WHOCC: WHO Collaborating Centre for Drug Statistics Methodology — WHOCC • AMR (for R)WHOCC: WHO Collaborating Centre for Drug Statistics Methodology — WHOCC • AMR (for R) diff --git a/reference/WHONET.html b/reference/WHONET.html index a8be0244..d47b5a8d 100644 --- a/reference/WHONET.html +++ b/reference/WHONET.html @@ -1,5 +1,5 @@ -Data Set with 500 Isolates - WHONET Example — WHONET • AMR (for R)Data Set with 500 Isolates - WHONET Example — WHONET • AMR (for R) diff --git a/reference/ab_from_text.html b/reference/ab_from_text.html index 311c8b5f..a4211577 100644 --- a/reference/ab_from_text.html +++ b/reference/ab_from_text.html @@ -1,5 +1,5 @@ -Retrieve Antimicrobial Drug Names and Doses from Clinical Text — ab_from_text • AMR (for R)Retrieve Antimicrobial Drug Names and Doses from Clinical Text — ab_from_text • AMR (for R) diff --git a/reference/ab_property.html b/reference/ab_property.html index 28c612f7..e27ccc34 100644 --- a/reference/ab_property.html +++ b/reference/ab_property.html @@ -1,5 +1,5 @@ -Get Properties of an Antibiotic — ab_property • AMR (for R)Get Properties of an Antibiotic — ab_property • AMR (for R) diff --git a/reference/add_custom_antimicrobials.html b/reference/add_custom_antimicrobials.html index 192c3b8d..5857bd4c 100644 --- a/reference/add_custom_antimicrobials.html +++ b/reference/add_custom_antimicrobials.html @@ -1,5 +1,5 @@ -Add Custom Antimicrobials — add_custom_antimicrobials • AMR (for R)Add Custom Antimicrobials — add_custom_antimicrobials • AMR (for R) diff --git a/reference/add_custom_microorganisms.html b/reference/add_custom_microorganisms.html index 65f08df2..3b2a9110 100644 --- a/reference/add_custom_microorganisms.html +++ b/reference/add_custom_microorganisms.html @@ -1,5 +1,5 @@ -Add Custom Microorganisms — add_custom_microorganisms • AMR (for R)Add Custom Microorganisms — add_custom_microorganisms • AMR (for R) @@ -283,7 +283,7 @@ #> [1] "" #> #> $ref -#> [1] "Self-added, 2023" +#> [1] "Self-added, 2024" #> #> $snomed #> [1] NA diff --git a/reference/age.html b/reference/age.html index ae20f318..3ae12ffe 100644 --- a/reference/age.html +++ b/reference/age.html @@ -1,5 +1,5 @@ -Age in Years of Individuals — age • AMR (for R)Age in Years of Individuals — age • AMR (for R) @@ -222,16 +222,16 @@ df #> birth_date age age_exact age_at_y2k -#> 1 1998-04-08 25 25.65753 1 -#> 2 1972-01-04 51 51.91507 27 -#> 3 1997-10-15 26 26.13699 2 -#> 4 1968-01-21 55 55.86849 31 -#> 5 1954-03-04 69 69.75342 45 -#> 6 1983-02-12 40 40.80822 16 -#> 7 1971-07-13 52 52.39452 28 -#> 8 1931-10-10 92 92.15068 68 -#> 9 1941-12-06 81 81.99452 58 -#> 10 1983-03-09 40 40.73973 16 +#> 1 1965-12-05 58 58.19126 34 +#> 2 1980-03-01 43 43.95355 19 +#> 3 1949-11-01 74 74.28415 50 +#> 4 1947-02-14 76 76.99727 52 +#> 5 1940-02-19 83 83.98361 59 +#> 6 1988-01-10 36 36.09290 11 +#> 7 1997-08-27 26 26.46448 2 +#> 8 1978-01-26 46 46.04918 21 +#> 9 1972-06-17 51 51.65847 27 +#> 10 1986-08-10 37 37.51093 13