diff --git a/DESCRIPTION b/DESCRIPTION index b44526f0..675f7bad 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: AMR -Version: 1.8.2.9063 -Date: 2022-12-16 +Version: 1.8.2.9064 +Date: 2022-12-17 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 diff --git a/NEWS.md b/NEWS.md index b13c96ab..f11c0f4f 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,10 +1,10 @@ -# AMR 1.8.2.9063 +# AMR 1.8.2.9064 *(this beta version will eventually become v2.0! We're happy to reach a new major milestone soon!)* This is a new major release of the AMR package, with great new additions but also some breaking changes for current users. These are all listed below. -**TL;DR** +**[TL;DR](https://en.wikipedia.org/wiki/TL;DR)** * Microbiological taxonomy (`microorganisms` data set) updated to 2022 and now based on LPSN and GBIF * Much increased algorithms to translate user input to valid taxonomy @@ -13,9 +13,9 @@ This is a new major release of the AMR package, with great new additions but als * Extended support for antiviral agents (`antivirals` data set), with many new functions * Now available in 16 languages * Many new interesting functions, such as `rsi_confidence_interval()` and `mean_amr_distance()` -* Hundreds of bug fixes +* Many small bug fixes -### New +## New #### Interpretation of MIC and disk diffusion values @@ -30,9 +30,11 @@ We added support for the following languages: Chinese, Greek, Japanese, Polish, We are very grateful for the valuable input by our colleagues from other countries. The `AMR` package is now available in 16 languages and according to download stats used in almost all countries in the world! #### Microbiological taxonomy + The `microorganisms` no longer relies on the Catalogue of Life, but on the List of Prokaryotic names with Standing in Nomenclature (LPSN) and is supplemented with the 'backbone taxonomy' from the Global Biodiversity Information Facility (GBIF). The structure of this data set has changed to include separate LPSN and GBIF identifiers. Almost all previous MO codes were retained. It contains over 1,400 taxonomic names from 2022. We also made the following changes regarding the included taxonomy or microorganisms functions: + * Updated full microbiological taxonomy according to the latest daily LPSN data set (December 2022) and latest yearly GBIF taxonomy backbone (November 2022) * Support for all 1,515 city-like serovars of *Salmonella*, such as *Salmonella* Goldcoast. Formally, these are serovars belonging to the *S. enterica* species, but they are reported with only the name of the genus and the city. For this reason, the serovars are in the `subspecies` column of the `microorganisms` data set and "enterica" is in the `species` column, but the full name does not contain the species name (*enterica*). * All new algorithm for `as.mo()` (and thus all `mo_*()` functions) while still following our original set-up as described in our recently published JSS paper (DOI [10.18637/jss.v104.i03](https://doi.org/10.18637/jss.v104.i03)). @@ -52,6 +54,7 @@ We also made the following changes regarding the included taxonomy or microorgan The new function `add_custom_antimicrobials()` allows users to add custom antimicrobial codes and names to the `AMR` package. The `antibiotics` data set was greatly updated: + * The following 20 antibiotics have been added (also includes the [new J01RA ATC group](https://www.whocc.no/atc_ddd_index/?code=J01RA&showdescription=no)): azithromycin/fluconazole/secnidazole (AFC), cefepime/amikacin (CFA), cefixime/ornidazole (CEO), ceftriaxone/beta-lactamase inhibitor (CEB), ciprofloxacin/metronidazole (CIM), ciprofloxacin/ornidazole (CIO), ciprofloxacin/tinidazole (CIT), furazidin (FUR), isoniazid/sulfamethoxazole/trimethoprim/pyridoxine (IST), lascufloxacin (LSC), levofloxacin/ornidazole (LEO), nemonoxacin (NEM), norfloxacin/metronidazole (NME), norfloxacin/tinidazole (NTI), ofloxacin/ornidazole (OOR), oteseconazole (OTE), rifampicin/ethambutol/isoniazid (REI), sarecycline (SRC), tetracycline/oleandomycin (TOL), and thioacetazone (TAT) * Added some missing ATC codes * Updated DDDs and PubChem Compound IDs @@ -77,7 +80,7 @@ We now added extensive support for antiviral agents! For the first time, the `AM * Function `mo_current()` to get the currently valid taxonomic name of a microorganism * Function `add_custom_antimicrobials()` to add custom antimicrobial codes and names to the `AMR` package -### Changes +## Changes * Argument `combine_IR` has been removed from this package (affecting functions `count_df()`, `proportion_df()`, and `rsi_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. @@ -108,7 +111,8 @@ We now added extensive support for antiviral agents! For the first time, the `AM * Fix for `mo_shortname()` in case of higher taxonomic ranks (order, class, phylum) * Cleaning columns with `as.rsi()`, `as.mic()`, or `as.disk()` will now show the column name in the warning for invalid results -### Other +## Other + * New website to make use of the new Bootstrap 5 and pkgdown 2.0. The website now contains results for all examples and will be automatically regenerated with every change to our repository, using GitHub Actions * Added Peter Dutey-Magni, Dmytro Mykhailenko, Anton Mymrikov, and Jonas Salm as contributors, to thank them for their valuable input * All R and Rmd files in this project are now styled using the `styler` package @@ -116,109 +120,6 @@ We now added extensive support for antiviral agents! For the first time, the `AM * An enormous lot of code cleaning, fixing some small bugs on the way -# AMR 1.8.2 - -This is a small intermediate update to include the reference to our publication in the Journal of Statistical Software, DOI 10.18637/jss.v104.i03. - -A major update will be released by the end of 2022 or early 2023 to include the most recent EUCAST and CLSI guidelines, updated microbial taxonomy, and support for 16 languages. - - -# AMR 1.8.1 - -### Changed -* Fix for using `as.rsi()` on values containing capped values (such as `>=`), sometimes leading to `NA` -* Support for antibiotic interpretations of the MIPS laboratory system: `"U"` for S ('susceptible urine'), `"D"` for I ('susceptible dose-dependent') -* Improved algorithm of `as.mo()`, especially for ignoring non-taxonomic text, such as: - ```r - mo_name("methicillin-resistant S. aureus (MRSA)") - #> [1] "Staphylococcus aureus" - ``` -* More informative warning messages -* Added 192 as valid MIC -* Updated MIC printing in tibbles -* Increased speed for loading the package - -### Other -* Fix for unit testing on R 3.3 -* Fix for size of some image elements, as requested by CRAN - - -# AMR 1.8.0 - -### Breaking changes -* Removed `p_symbol()` and all `filter_*()` functions (except for `filter_first_isolate()`), which were all deprecated in a previous package version -* Removed the `key_antibiotics()` and `key_antibiotics_equal()` functions, which were deprecated and superseded by `key_antimicrobials()` and `antimicrobials_equal()` -* Removed all previously implemented `ggplot2::ggplot()` generics for classes ``, ``, `` and `` as they did not follow the `ggplot2` logic. They were replaced with `ggplot2::autoplot()` generics. -* Renamed function `get_locale()` to `get_AMR_locale()` to prevent conflicts with other packages - -### New -* Support for the CLSI 2021 guideline for interpreting MIC/disk diffusion values, which are incorporated in the `rsi_translation` data set. This data set now more strictly follows the WHONET software as well. -* Support for EUCAST Intrinsic Resistance and Unusual Phenotypes v3.3 (October 2021). This is now the default EUCAST guideline in the package (all older guidelines are still available) for `eucast_rules()`, `mo_is_intrinsic_resistant()` and `mdro()`. The `intrinsic_resistant` data set was also updated accordingly. -* Support for all antimicrobial drug (group) names and colloquial microorganism names in Danish, Dutch, English, French, German, Italian, Portuguese, Russian, Spanish and Swedish -* Function `set_ab_names()` to rename data set columns that resemble antimicrobial drugs. This allows for quickly renaming columns to official names, ATC codes, etc. Its second argument can be a tidyverse way of selecting: - ```r - example_isolates %>% set_ab_names(where(is.rsi)) - example_isolates %>% set_ab_names(AMC:GEN, property = "atc") - ``` -* Function `mo_lpsn()` to retrieve the [LPSN](https://lpsn.dsmz.de) record ID -* Function `ab_ddd_units()` to get units of DDDs (daily defined doses), deprecating the use of `ab_ddd(..., units = TRUE)` to be more consistent in data types of function output - -### Changed -* Updated the bacterial taxonomy to 5 October 2021 (according to [LPSN](https://lpsn.dsmz.de)), including all 11 new staphylococcal species named since 1 January last year -* The `antibiotics` data set now contains **all ATC codes** that are available through the [WHOCC website](https://www.whocc.no), regardless of drugs being present in more than one ATC group. This means that: - * Some drugs now contain multiple ATC codes (e.g., metronidazole contains 5) - * `antibiotics$atc` is now a `list` containing `character` vectors, and this `atc` column was moved to the 5th position of the `antibiotics` data set - * `ab_atc()` does not always return a character vector of length 1, and returns a `list` if the input is larger than length 1 - * `ab_info()` has a slightly different output - * Some DDDs (daily defined doses) were added or updated according to newly included ATC codes -* Antibiotic selectors - * They now also work in R-3.0 and R-3.1, supporting every version of R since 2013 like the rest of the package - * Added more selectors for antibiotic classes: `aminopenicillins()`, `antifungals()`, `antimycobacterials()`, `lincosamides()`, `lipoglycopeptides()`, `polymyxins()`, `quinolones()`, `streptogramins()`, `trimethoprims()` and `ureidopenicillins()` - * Added specific selectors for certain types for treatment: `administrable_per_os()` and `administrable_iv()`, which are based on available Defined Daily Doses (DDDs), as defined by the WHOCC. These are ideal for e.g. analysing pathogens in primary care where IV treatment is not an option. They can be combined with other AB selectors, e.g. to select penicillins that are only administrable per os (i.e., orally): - ```r - example_isolates[, penicillins() & administrable_per_os()] # base R - example_isolates %>% select(penicillins() & administrable_per_os()) # dplyr - ``` - * Added the selector `ab_selector()`, which accepts a filter to be used internally on the `antibiotics` data set, yielding great flexibility on drug properties, such as selecting antibiotic columns with an oral DDD of at least 1 gram: - ```r - example_isolates[, ab_selector(oral_ddd > 1 & oral_units == "g")] # base R - example_isolates %>% select(ab_selector(oral_ddd > 1 & oral_units == "g")) # dplyr - ``` - * Added the selector `not_intrinsic_resistant()`, which only keeps antibiotic columns that are not intrinsic resistant for all microorganisms in a data set, based on the latest EUCAST guideline on intrinsic resistance. For example, if a data set contains only microorganism codes or names of *E. coli* and *K. pneumoniae* and contains a column "vancomycin", this column will be removed (or rather, unselected) using this function. - * Added argument `only_treatable`, which defaults to `TRUE` and will exclude drugs that are only for laboratory tests and not for treating patients (such as imipenem/EDTA and gentamicin-high) - * Fix for using selectors multiple times in one call (e.g., using them in `dplyr::filter()` and immediately after in `dplyr::select()`) - * Fix for using having multiple columns that are coerced to the same antibiotic agent - * Fixed for using `all()` or `any()` on antibiotic selectors in an R Markdown file -* Added the following antimicrobial agents that are now covered by the WHO: aztreonam/nacubactam (ANC), cefepime/nacubactam (FNC), exebacase (EXE), ozenoxacin (OZN), zoliflodacin (ZFD), manogepix (MGX), ibrexafungerp (IBX), and rezafungin (RZF). None of these agents have an ATC code yet. -* Fixed the Gram stain (`mo_gramstain()`) determination of the taxonomic class Negativicutes within the phylum of Firmicutes - they were considered Gram-positives because of their phylum but are actually Gram-negative. This impacts 137 taxonomic species, genera and families, such as *Negativicoccus* and *Veillonella*. -* Dramatic speed improvement for `first_isolate()` -* Fix to prevent introducing `NA`s for old MO codes when running `as.mo()` on them -* Added more informative error messages when any of the `proportion_*()` and `count_*()` functions fail -* When printing a tibble with any old MO code, a warning will be thrown that old codes should be updated using `as.mo()` -* Improved automatic column selector when `col_*` arguments are left blank, e.g. in `first_isolate()` -* The right input types for `random_mic()`, `random_disk()` and `random_rsi()` are now enforced -* `as.rsi()` has an improved algorithm and can now also correct for textual input (such as "Susceptible", "Resistant") in all supported languages -* `as.mic()` has an improved algorithm -* When warnings are thrown because of too few isolates in any `count_*()`, `proportion_*()` function (or `resistant()` or `susceptible()`), the `dplyr` group will be shown, if available -* Fix for legends created with `scale_rsi_colours()` when using `ggplot2` v3.3.4 or higher (this is ggplot2 bug 4511, soon to be fixed) -* Fix for minor translation errors -* Fix for the MIC interpretation of *Morganellaceae* (such as *Morganella* and *Proteus*) when using the EUCAST 2021 guideline -* Improved algorithm of `as.mo()` -* Improved algorithm for generating random MICs with `random_mic()` -* Improved plot legends for MICs and disk diffusion values -* Improved speed of `as.ab()` and all `ab_*()` functions -* Added `fortify()` extensions for plotting methods -* `NA` values of the classes ``, `` and `` are now exported objects of this package, e.g. `NA_mic_` is an `NA` of class `mic` (just like the base R `NA_character_` is an `NA` of class `character`) -* The `proportion_df()`, `count_df()` and `rsi_df()` functions now return with the additional S3 class 'rsi_df' so they can be extended by other packages -* The `mdro()` function now returns `NA` for all rows that have no test results -* The `species_id` column in the `microorganisms` data set now only contains LPSN record numbers. For this reason, this column is now numeric instead of a character, and `mo_url()` has been updated to reflect this change. -* Fixed a small bug in the functions `get_episode()` and `is_new_episode()` -* `get_episode()` and `is_new_episode()` can now cope with `NA`s - -### Other -* This package is now being maintained by two epidemiologists and a data scientist from two different non-profit healthcare organisations. - - # AMR older versions -For the changelog of older versions, please see [our archive](https://github.com/msberends/AMR/blob/v1.8.0/NEWS.md). +For the changelog of versions prior to AMR v2.0, please see [our archive](https://github.com/msberends/AMR/blob/v1.8.2/NEWS.md). diff --git a/R/availability.R b/R/availability.R index e51b9950..88d80091 100644 --- a/R/availability.R +++ b/R/availability.R @@ -61,7 +61,7 @@ availability <- function(tbl, width = NULL) { R_print[is.na(R)] <- "" if (is.null(width)) { - width <- options()$width - + width <- getOption("width", 100) - (max(nchar(colnames(tbl))) + # count col 8 + diff --git a/R/eucast_rules.R b/R/eucast_rules.R index 3cfe865b..f4d7092e 100755 --- a/R/eucast_rules.R +++ b/R/eucast_rules.R @@ -662,7 +662,7 @@ eucast_rules <- function(x, if (rule_group_current %unlike% "other" && eucast_notification_shown == FALSE) { cat( paste0( - "\n", font_grey(strrep("-", 0.95 * options()$width)), "\n", + "\n", font_grey(strrep("-", 0.95 * getOption("width", 100))), "\n", word_wrap("Rules by the ", font_bold("European Committee on Antimicrobial Susceptibility Testing (EUCAST)")), "\n", font_blue("https://eucast.org/"), "\n" ) @@ -936,7 +936,7 @@ eucast_rules <- function(x, wouldve <- "" } - cat(paste0("\n", font_grey(strrep("-", 0.95 * options()$width)), "\n")) + cat(paste0("\n", font_grey(strrep("-", 0.95 * getOption("width", 100))), "\n")) cat(word_wrap(paste0( "The rules ", paste0(wouldve, "affected "), font_bold( @@ -1008,7 +1008,7 @@ eucast_rules <- function(x, cat("\n") } - cat(paste0(font_grey(strrep("-", 0.95 * options()$width)), "\n")) + cat(paste0(font_grey(strrep("-", 0.95 * getOption("width", 100))), "\n")) if (isFALSE(verbose) && total_n_added + total_n_changed > 0) { cat("\n", word_wrap("Use ", font_bold("eucast_rules(..., verbose = TRUE)"), " (on your original data) to get a data.frame with all specified edits instead."), "\n\n", sep = "") diff --git a/R/mo.R b/R/mo.R index 86564e95..31253d9e 100755 --- a/R/mo.R +++ b/R/mo.R @@ -268,11 +268,11 @@ as.mo <- function(x, # take out the parts, split by space x_parts <- strsplit(gsub("-", " ", x_out, fixed = TRUE), " ", fixed = TRUE)[[1]] - + # do a pre-match on first character (and if it contains a space, first chars of first two terms) if (length(x_parts) %in% c(2, 3)) { # for genus + species + subspecies - filtr <- which(AMR_env$MO_lookup$full_first == substr(x_parts[1], 1, 1) & AMR_env$MO_lookup$species_first == substr(x_parts[2], 1, 1)) + filtr <- which(AMR_env$MO_lookup$full_first == substr(x_parts[1], 1, 1) & (AMR_env$MO_lookup$species_first == substr(x_parts[2], 1, 1) | AMR_env$MO_lookup$subspecies_first == substr(x_parts[2], 1, 1))) } else if (length(x_parts) > 3) { first_chars <- paste0("(^| )", "[", paste(substr(x_parts, 1, 1), collapse = ""), "]") filtr <- which(AMR_env$MO_lookup$full_first %like_case% first_chars) @@ -307,9 +307,13 @@ as.mo <- function(x, } else { minimum_matching_score_current <- minimum_matching_score } - m[m < minimum_matching_score_current] <- NA_real_ - - top_hits <- mo_to_search[order(m, decreasing = TRUE, na.last = NA)] # na.last = NA will remove the NAs + + if (sum(m >= minimum_matching_score_current) > 10) { + # at least 10 are left over, make the ones under `m` NA + m[m < minimum_matching_score_current] <- NA_real_ + } + + top_hits <- mo_to_search[order(m, decreasing = TRUE, na.last = NA)] # na.last = NA will remove the NAs if (length(top_hits) == 0) { warning_("No hits found for \"", x_search, "\" with minimum_matching_score = ", ifelse(is.null(minimum_matching_score), paste0("NULL (=", round(min(minimum_matching_score_current, na.rm = TRUE), 3), ")"), minimum_matching_score), ". Try setting this value lower or even to 0.", call = FALSE) result_mo <- NA_character_ @@ -357,7 +361,7 @@ as.mo <- function(x, if (length(AMR_env$mo_uncertainties$original_input) <= 3) { examples <- vector_and(paste0( '"', AMR_env$mo_uncertainties$original_input, - '" (assumed ', font_italic(AMR_env$mo_uncertainties$fullname, collapse = NULL), ")" + '" (assumed ', italicise(AMR_env$mo_uncertainties$fullname), ")" ), quotes = FALSE ) @@ -377,10 +381,12 @@ as.mo <- function(x, } # end of loop over all yet unknowns # Keep or replace synonyms ---- - gbif_matches <- AMR::microorganisms$gbif_renamed_to[match(out, AMR::microorganisms$mo)] - gbif_matches[!gbif_matches %in% AMR::microorganisms$gbif] <- NA lpsn_matches <- AMR::microorganisms$lpsn_renamed_to[match(out, AMR::microorganisms$mo)] lpsn_matches[!lpsn_matches %in% AMR::microorganisms$lpsn] <- NA + # GBIF only for non-bacteria, since we use LPSN as primary source for bacteria + # (example is Strep anginosus, renamed according to GBIF, not according to LPSN) + gbif_matches <- AMR::microorganisms$gbif_renamed_to[AMR::microorganisms$kingdom != "Bacteria"][match(out, AMR::microorganisms$mo[AMR::microorganisms$kingdom != "Bacteria"])] + gbif_matches[!gbif_matches %in% AMR::microorganisms$gbif] <- NA AMR_env$mo_renamed <- list( old = out[!is.na(gbif_matches) | !is.na(lpsn_matches)], gbif_matches = gbif_matches[!is.na(gbif_matches) | !is.na(lpsn_matches)], @@ -795,7 +801,7 @@ print.mo_uncertainties <- function(x, ...) { text[scores < 0.5] <- font_red_bg(text[scores < 0.5], collapse = NULL) text } - + txt <- "" for (i in seq_len(nrow(x))) { if (x[i, ]$candidates != "") { @@ -803,7 +809,7 @@ print.mo_uncertainties <- function(x, ...) { scores <- mo_matching_score(x = x[i, ]$input, n = candidates) n_candidates <- length(candidates) - candidates_formatted <- font_italic(candidates, collapse = NULL) + candidates_formatted <- italicise(candidates) scores_formatted <- trimws(formatC(round(scores, 3), format = "f", digits = 3)) scores_formatted <- score_set_colour(scores_formatted, scores) @@ -824,7 +830,8 @@ print.mo_uncertainties <- function(x, ...) { "" ) ), - extra_indent = nchar("Also matched: ") + extra_indent = nchar("Also matched: "), + width = 0.9 * getOption("width", 100) ) } else { candidates <- "" @@ -838,11 +845,11 @@ print.mo_uncertainties <- function(x, ...) { txt <- paste(txt, paste0( paste0( - "", strrep(font_grey("-"), times = options()$width), "\n", + "", strrep(font_grey("-"), times = getOption("width", 100)), "\n", '"', x[i, ]$original_input, '"', " -> ", paste0( - font_bold(font_italic(x[i, ]$fullname)), + font_bold(italicise(x[i, ]$fullname)), " (", x[i, ]$mo, ", ", score_set_colour(score_formatted, score), ")" ) ), @@ -887,7 +894,7 @@ print.mo_renamed <- function(x, extra_txt = "", n = 25, ...) { message_( "The following microorganism", ifelse(NROW(x) > 1, "s were", " was"), " taxonomically renamed", extra_txt, ":\n", - paste0(" \u2022 ", font_italic(x$old[rows], collapse = NULL), x$ref_old[rows], + paste0(" ", AMR_env$bullet_icon, " ", font_italic(x$old[rows], collapse = NULL), x$ref_old[rows], " -> ", font_italic(x$new[rows], collapse = NULL), x$ref_new[rows], collapse = "\n" ), @@ -924,6 +931,18 @@ convert_colloquial_input <- function(x) { out[x %like_case% "mil+er+i gr"] <- "B_STRPT_MILL" out[x %like_case% "((strepto|^s).* viridans|^vgs[^a-z]*$)"] <- "B_STRPT_VIRI" out[x %like_case% "(viridans.* (strepto|^s).*|^vgs[^a-z]*$)"] <- "B_STRPT_VIRI" + + # Salmonella in different languages, like "Salmonella grupo B" + out[x %like_case% "salmonella.* [bcd]$"] <- gsub(".*salmonella.* ([bcd])$", + "B_SLMNL_GRP\\U\\1", + x[x %like_case% "salmonella.* [bcd]$"], + perl = TRUE + ) + out[x %like_case% "group [bcd] salmonella"] <- gsub(".*group ([bcd]) salmonella*", + "B_SLMNL_GRP\\U\\1", + x[x %like_case% "group [bcd] salmonella"], + perl = TRUE + ) # CoNS/CoPS in different languages (support for German, Dutch, Spanish, Portuguese) out[x %like_case% "([ck]oagulas[ea].negatie?[vf]|^[ck]o?ns[^a-z]*$)"] <- "B_STPHY_CONS" @@ -931,18 +950,15 @@ convert_colloquial_input <- function(x) { # Gram stains out[x %like_case% "gram[ -]?neg.*"] <- "B_GRAMN" + out[x %like_case% "( |^)gram[-]( |$)"] <- "B_GRAMN" out[x %like_case% "gram[ -]?pos.*"] <- "B_GRAMP" + out[x %like_case% "( |^)gram[+]( |$)"] <- "B_GRAMP" out[is.na(out) & x %like_case% "anaerob[a-z]+ (micro)?.*organism"] <- "B_ANAER" # yeasts and fungi out[x %like_case% "^yeast?"] <- "F_YEAST" out[x %like_case% "^fung(us|i)"] <- "F_FUNGUS" - # Salmonella city names, starting with capital species name - they are all S. enterica - out[x.bak %like_case% "[sS]almonella " & x %like% "paratyphi"] <- "B_SLMNL_ENTR" - out[x.bak %like_case% "[sS]almonella [A-Z][a-z]+ ?.*" & x %unlike% "typhi"] <- "B_SLMNL_ENTR" - out[x %like_case% "salmonella group"] <- "B_SLMNL" - # trivial names known to the field out[x %like_case% "meningo[ck]o[ck]"] <- "B_NESSR_MNNG" out[x %like_case% "gono[ck]o[ck]"] <- "B_NESSR_GNRR" @@ -958,6 +974,15 @@ convert_colloquial_input <- function(x) { out } +italicise <- function(x) { + out <- font_italic(x, collapse = NULL) + out[x %like_case% "Salmonella [A-Z]"] <- paste(font_italic("Salmonella"), + gsub("Salmonella ", "", x[x %like_case% "Salmonella [A-Z]"])) + out[x %like_case% "Streptococcus [A-Z]"] <- paste(font_italic("Streptococcus"), + gsub("Streptococcus ", "", x[x %like_case% "Streptococcus [A-Z]"])) + out +} + nr2char <- function(x) { if (x %in% c(1:10)) { v <- c( diff --git a/R/sysdata.rda b/R/sysdata.rda index 95cab849..00ed2ce6 100644 Binary files a/R/sysdata.rda and b/R/sysdata.rda differ diff --git a/R/zzz.R b/R/zzz.R index 73332f71..31374934 100755 --- a/R/zzz.R +++ b/R/zzz.R @@ -214,8 +214,8 @@ create_MO_lookup <- function() { MO_lookup$fullname_lower <- MO_FULLNAME_LOWER } MO_lookup$full_first <- substr(MO_lookup$fullname_lower, 1, 1) - MO_lookup$species_first <- substr(MO_lookup$species, 1, 1) - + MO_lookup$species_first <- tolower(substr(MO_lookup$species, 1, 1)) # tolower for groups (Streptococcus, Salmonella) + MO_lookup$subspecies_first <- tolower(substr(MO_lookup$subspecies, 1, 1)) # tolower for Salmonella serovars MO_lookup } diff --git a/data-raw/_pre_commit_hook.R b/data-raw/_pre_commit_hook.R index c1137d3f..96f44004 100644 --- a/data-raw/_pre_commit_hook.R +++ b/data-raw/_pre_commit_hook.R @@ -155,6 +155,8 @@ create_MO_fullname_lower <- function() { ind <- AMR_env$MO_lookup$genus == "" | grepl("^[(]unknown ", AMR_env$MO_lookup$fullname, perl = TRUE) AMR_env$MO_lookup[ind, "fullname_lower"] <- tolower(AMR_env$MO_lookup[ind, "fullname", drop = TRUE]) AMR_env$MO_lookup$fullname_lower <- trimws(gsub("[^.a-z0-9/ \\-]+", "", AMR_env$MO_lookup$fullname_lower, perl = TRUE)) + # special for Salmonella - they have cities as subspecies but not the species (enterica) in the fullname: + AMR_env$MO_lookup$fullname_lower[which(AMR_env$MO_lookup$subspecies %like_case% "^[A-Z]")] <- gsub(" enterica ", " ", AMR_env$MO_lookup$fullname_lower[which(AMR_env$MO_lookup$subspecies %like_case% "^[A-Z]")], fixed = TRUE) AMR_env$MO_lookup$fullname_lower } MO_CONS <- create_species_cons_cops("CoNS") diff --git a/data-raw/bartlett_et_al_2022_human_pathogens.xlsx b/data-raw/bartlett_et_al_2022_human_pathogens.xlsx new file mode 100644 index 00000000..e99abce1 Binary files /dev/null and b/data-raw/bartlett_et_al_2022_human_pathogens.xlsx differ diff --git a/data-raw/intrinsicR.md5 b/data-raw/intrinsicR.md5 index 8dda0397..53b82b20 100644 --- a/data-raw/intrinsicR.md5 +++ b/data-raw/intrinsicR.md5 @@ -1 +1 @@ -ddbee37dd1dfa56d90d9b70ad2ed6308 +032dfd1b044cc838f0915b0eef919471 diff --git a/data-raw/intrinsic_resistant.dta b/data-raw/intrinsic_resistant.dta index 63cdf4f9..cd4987c8 100644 Binary files a/data-raw/intrinsic_resistant.dta and b/data-raw/intrinsic_resistant.dta differ diff --git a/data-raw/intrinsic_resistant.feather b/data-raw/intrinsic_resistant.feather index 7b23db63..c3886080 100644 Binary files a/data-raw/intrinsic_resistant.feather and b/data-raw/intrinsic_resistant.feather differ diff --git a/data-raw/intrinsic_resistant.parquet b/data-raw/intrinsic_resistant.parquet index a3338b10..1fe458fa 100644 Binary files a/data-raw/intrinsic_resistant.parquet and b/data-raw/intrinsic_resistant.parquet differ diff --git a/data-raw/intrinsic_resistant.rds b/data-raw/intrinsic_resistant.rds index 85719850..3c36081a 100644 Binary files a/data-raw/intrinsic_resistant.rds and b/data-raw/intrinsic_resistant.rds differ diff --git a/data-raw/intrinsic_resistant.sas b/data-raw/intrinsic_resistant.sas index dc81118f..ea9bc4ce 100644 Binary files a/data-raw/intrinsic_resistant.sas and b/data-raw/intrinsic_resistant.sas differ diff --git a/data-raw/intrinsic_resistant.sav b/data-raw/intrinsic_resistant.sav index 25a3802e..f2293331 100644 Binary files a/data-raw/intrinsic_resistant.sav and b/data-raw/intrinsic_resistant.sav differ diff --git a/data-raw/intrinsic_resistant.txt b/data-raw/intrinsic_resistant.txt index 2c6f2972..e3393c6c 100644 --- a/data-raw/intrinsic_resistant.txt +++ b/data-raw/intrinsic_resistant.txt @@ -121559,262 +121559,262 @@ "Streptococcus gordonii" "Streptomycin" "Streptococcus gordonii" "Temocillin" "Streptococcus gordonii" "Tobramycin" -"Streptococcus group A" "Amikacin/fosfomycin" -"Streptococcus group A" "Amikacin" -"Streptococcus group A" "Apramycin" -"Streptococcus group A" "Arbekacin" -"Streptococcus group A" "Astromicin" -"Streptococcus group A" "Aztreonam" -"Streptococcus group A" "Bekanamycin" -"Streptococcus group A" "Ceftazidime" -"Streptococcus group A" "Colistin" -"Streptococcus group A" "Dibekacin" -"Streptococcus group A" "Framycetin" -"Streptococcus group A" "Fusidic acid" -"Streptococcus group A" "Gentamicin" -"Streptococcus group A" "Habekacin" -"Streptococcus group A" "Hygromycin" -"Streptococcus group A" "Isepamicin" -"Streptococcus group A" "Kanamycin/cephalexin" -"Streptococcus group A" "Kanamycin" -"Streptococcus group A" "Micronomicin" -"Streptococcus group A" "Nalidixic acid" -"Streptococcus group A" "Neomycin" -"Streptococcus group A" "Netilmicin" -"Streptococcus group A" "Pentisomicin" -"Streptococcus group A" "Propikacin" -"Streptococcus group A" "Polymyxin B" -"Streptococcus group A" "Plazomicin" -"Streptococcus group A" "Ribostamycin" -"Streptococcus group A" "Sisomicin" -"Streptococcus group A" "Streptoduocin" -"Streptococcus group A" "Streptomycin" -"Streptococcus group A" "Temocillin" -"Streptococcus group A" "Tobramycin" -"Streptococcus group B" "Amikacin/fosfomycin" -"Streptococcus group B" "Amikacin" -"Streptococcus group B" "Apramycin" -"Streptococcus group B" "Arbekacin" -"Streptococcus group B" "Astromicin" -"Streptococcus group B" "Aztreonam" -"Streptococcus group B" "Bekanamycin" -"Streptococcus group B" "Ceftazidime" -"Streptococcus group B" "Colistin" -"Streptococcus group B" "Dibekacin" -"Streptococcus group B" "Framycetin" -"Streptococcus group B" "Fusidic acid" -"Streptococcus group B" "Gentamicin" -"Streptococcus group B" "Habekacin" -"Streptococcus group B" "Hygromycin" -"Streptococcus group B" "Isepamicin" -"Streptococcus group B" "Kanamycin/cephalexin" -"Streptococcus group B" "Kanamycin" -"Streptococcus group B" "Micronomicin" -"Streptococcus group B" "Nalidixic acid" -"Streptococcus group B" "Neomycin" -"Streptococcus group B" "Netilmicin" -"Streptococcus group B" "Pentisomicin" -"Streptococcus group B" "Propikacin" -"Streptococcus group B" "Polymyxin B" -"Streptococcus group B" "Plazomicin" -"Streptococcus group B" "Ribostamycin" -"Streptococcus group B" "Sisomicin" -"Streptococcus group B" "Streptoduocin" -"Streptococcus group B" "Streptomycin" -"Streptococcus group B" "Temocillin" -"Streptococcus group B" "Tobramycin" -"Streptococcus group C" "Amikacin/fosfomycin" -"Streptococcus group C" "Amikacin" -"Streptococcus group C" "Apramycin" -"Streptococcus group C" "Arbekacin" -"Streptococcus group C" "Astromicin" -"Streptococcus group C" "Aztreonam" -"Streptococcus group C" "Bekanamycin" -"Streptococcus group C" "Ceftazidime" -"Streptococcus group C" "Colistin" -"Streptococcus group C" "Dibekacin" -"Streptococcus group C" "Framycetin" -"Streptococcus group C" "Fusidic acid" -"Streptococcus group C" "Gentamicin" -"Streptococcus group C" "Habekacin" -"Streptococcus group C" "Hygromycin" -"Streptococcus group C" "Isepamicin" -"Streptococcus group C" "Kanamycin/cephalexin" -"Streptococcus group C" "Kanamycin" -"Streptococcus group C" "Micronomicin" -"Streptococcus group C" "Nalidixic acid" -"Streptococcus group C" "Neomycin" -"Streptococcus group C" "Netilmicin" -"Streptococcus group C" "Pentisomicin" -"Streptococcus group C" "Propikacin" -"Streptococcus group C" "Polymyxin B" -"Streptococcus group C" "Plazomicin" -"Streptococcus group C" "Ribostamycin" -"Streptococcus group C" "Sisomicin" -"Streptococcus group C" "Streptoduocin" -"Streptococcus group C" "Streptomycin" -"Streptococcus group C" "Temocillin" -"Streptococcus group C" "Tobramycin" -"Streptococcus group D" "Amikacin/fosfomycin" -"Streptococcus group D" "Amikacin" -"Streptococcus group D" "Apramycin" -"Streptococcus group D" "Arbekacin" -"Streptococcus group D" "Astromicin" -"Streptococcus group D" "Aztreonam" -"Streptococcus group D" "Bekanamycin" -"Streptococcus group D" "Ceftazidime" -"Streptococcus group D" "Colistin" -"Streptococcus group D" "Dibekacin" -"Streptococcus group D" "Framycetin" -"Streptococcus group D" "Fusidic acid" -"Streptococcus group D" "Gentamicin" -"Streptococcus group D" "Habekacin" -"Streptococcus group D" "Hygromycin" -"Streptococcus group D" "Isepamicin" -"Streptococcus group D" "Kanamycin/cephalexin" -"Streptococcus group D" "Kanamycin" -"Streptococcus group D" "Micronomicin" -"Streptococcus group D" "Nalidixic acid" -"Streptococcus group D" "Neomycin" -"Streptococcus group D" "Netilmicin" -"Streptococcus group D" "Pentisomicin" -"Streptococcus group D" "Propikacin" -"Streptococcus group D" "Polymyxin B" -"Streptococcus group D" "Plazomicin" -"Streptococcus group D" "Ribostamycin" -"Streptococcus group D" "Sisomicin" -"Streptococcus group D" "Streptoduocin" -"Streptococcus group D" "Streptomycin" -"Streptococcus group D" "Temocillin" -"Streptococcus group D" "Tobramycin" -"Streptococcus group F" "Amikacin/fosfomycin" -"Streptococcus group F" "Amikacin" -"Streptococcus group F" "Apramycin" -"Streptococcus group F" "Arbekacin" -"Streptococcus group F" "Astromicin" -"Streptococcus group F" "Aztreonam" -"Streptococcus group F" "Bekanamycin" -"Streptococcus group F" "Ceftazidime" -"Streptococcus group F" "Colistin" -"Streptococcus group F" "Dibekacin" -"Streptococcus group F" "Framycetin" -"Streptococcus group F" "Fusidic acid" -"Streptococcus group F" "Gentamicin" -"Streptococcus group F" "Habekacin" -"Streptococcus group F" "Hygromycin" -"Streptococcus group F" "Isepamicin" -"Streptococcus group F" "Kanamycin/cephalexin" -"Streptococcus group F" "Kanamycin" -"Streptococcus group F" "Micronomicin" -"Streptococcus group F" "Nalidixic acid" -"Streptococcus group F" "Neomycin" -"Streptococcus group F" "Netilmicin" -"Streptococcus group F" "Pentisomicin" -"Streptococcus group F" "Propikacin" -"Streptococcus group F" "Polymyxin B" -"Streptococcus group F" "Plazomicin" -"Streptococcus group F" "Ribostamycin" -"Streptococcus group F" "Sisomicin" -"Streptococcus group F" "Streptoduocin" -"Streptococcus group F" "Streptomycin" -"Streptococcus group F" "Temocillin" -"Streptococcus group F" "Tobramycin" -"Streptococcus group G" "Amikacin/fosfomycin" -"Streptococcus group G" "Amikacin" -"Streptococcus group G" "Apramycin" -"Streptococcus group G" "Arbekacin" -"Streptococcus group G" "Astromicin" -"Streptococcus group G" "Aztreonam" -"Streptococcus group G" "Bekanamycin" -"Streptococcus group G" "Ceftazidime" -"Streptococcus group G" "Colistin" -"Streptococcus group G" "Dibekacin" -"Streptococcus group G" "Framycetin" -"Streptococcus group G" "Fusidic acid" -"Streptococcus group G" "Gentamicin" -"Streptococcus group G" "Habekacin" -"Streptococcus group G" "Hygromycin" -"Streptococcus group G" "Isepamicin" -"Streptococcus group G" "Kanamycin/cephalexin" -"Streptococcus group G" "Kanamycin" -"Streptococcus group G" "Micronomicin" -"Streptococcus group G" "Nalidixic acid" -"Streptococcus group G" "Neomycin" -"Streptococcus group G" "Netilmicin" -"Streptococcus group G" "Pentisomicin" -"Streptococcus group G" "Propikacin" -"Streptococcus group G" "Polymyxin B" -"Streptococcus group G" "Plazomicin" -"Streptococcus group G" "Ribostamycin" -"Streptococcus group G" "Sisomicin" -"Streptococcus group G" "Streptoduocin" -"Streptococcus group G" "Streptomycin" -"Streptococcus group G" "Temocillin" -"Streptococcus group G" "Tobramycin" -"Streptococcus group H" "Amikacin/fosfomycin" -"Streptococcus group H" "Amikacin" -"Streptococcus group H" "Apramycin" -"Streptococcus group H" "Arbekacin" -"Streptococcus group H" "Astromicin" -"Streptococcus group H" "Aztreonam" -"Streptococcus group H" "Bekanamycin" -"Streptococcus group H" "Ceftazidime" -"Streptococcus group H" "Colistin" -"Streptococcus group H" "Dibekacin" -"Streptococcus group H" "Framycetin" -"Streptococcus group H" "Fusidic acid" -"Streptococcus group H" "Gentamicin" -"Streptococcus group H" "Habekacin" -"Streptococcus group H" "Hygromycin" -"Streptococcus group H" "Isepamicin" -"Streptococcus group H" "Kanamycin/cephalexin" -"Streptococcus group H" "Kanamycin" -"Streptococcus group H" "Micronomicin" -"Streptococcus group H" "Nalidixic acid" -"Streptococcus group H" "Neomycin" -"Streptococcus group H" "Netilmicin" -"Streptococcus group H" "Pentisomicin" -"Streptococcus group H" "Propikacin" -"Streptococcus group H" "Polymyxin B" -"Streptococcus group H" "Plazomicin" -"Streptococcus group H" "Ribostamycin" -"Streptococcus group H" "Sisomicin" -"Streptococcus group H" "Streptoduocin" -"Streptococcus group H" "Streptomycin" -"Streptococcus group H" "Temocillin" -"Streptococcus group H" "Tobramycin" -"Streptococcus group K" "Amikacin/fosfomycin" -"Streptococcus group K" "Amikacin" -"Streptococcus group K" "Apramycin" -"Streptococcus group K" "Arbekacin" -"Streptococcus group K" "Astromicin" -"Streptococcus group K" "Aztreonam" -"Streptococcus group K" "Bekanamycin" -"Streptococcus group K" "Ceftazidime" -"Streptococcus group K" "Colistin" -"Streptococcus group K" "Dibekacin" -"Streptococcus group K" "Framycetin" -"Streptococcus group K" "Fusidic acid" -"Streptococcus group K" "Gentamicin" -"Streptococcus group K" "Habekacin" -"Streptococcus group K" "Hygromycin" -"Streptococcus group K" "Isepamicin" -"Streptococcus group K" "Kanamycin/cephalexin" -"Streptococcus group K" "Kanamycin" -"Streptococcus group K" "Micronomicin" -"Streptococcus group K" "Nalidixic acid" -"Streptococcus group K" "Neomycin" -"Streptococcus group K" "Netilmicin" -"Streptococcus group K" "Pentisomicin" -"Streptococcus group K" "Propikacin" -"Streptococcus group K" "Polymyxin B" -"Streptococcus group K" "Plazomicin" -"Streptococcus group K" "Ribostamycin" -"Streptococcus group K" "Sisomicin" -"Streptococcus group K" "Streptoduocin" -"Streptococcus group K" "Streptomycin" -"Streptococcus group K" "Temocillin" -"Streptococcus group K" "Tobramycin" +"Streptococcus Group A" "Amikacin/fosfomycin" +"Streptococcus Group A" "Amikacin" +"Streptococcus Group A" "Apramycin" +"Streptococcus Group A" "Arbekacin" +"Streptococcus Group A" "Astromicin" +"Streptococcus Group A" "Aztreonam" +"Streptococcus Group A" "Bekanamycin" +"Streptococcus Group A" "Ceftazidime" +"Streptococcus Group A" "Colistin" +"Streptococcus Group A" "Dibekacin" +"Streptococcus Group A" "Framycetin" +"Streptococcus Group A" "Fusidic acid" +"Streptococcus Group A" "Gentamicin" +"Streptococcus Group A" "Habekacin" +"Streptococcus Group A" "Hygromycin" +"Streptococcus Group A" "Isepamicin" +"Streptococcus Group A" "Kanamycin/cephalexin" +"Streptococcus Group A" "Kanamycin" +"Streptococcus Group A" "Micronomicin" +"Streptococcus Group A" "Nalidixic acid" +"Streptococcus Group A" "Neomycin" +"Streptococcus Group A" "Netilmicin" +"Streptococcus Group A" "Pentisomicin" +"Streptococcus Group A" "Propikacin" +"Streptococcus Group A" "Polymyxin B" +"Streptococcus Group A" "Plazomicin" +"Streptococcus Group A" "Ribostamycin" +"Streptococcus Group A" "Sisomicin" +"Streptococcus Group A" "Streptoduocin" +"Streptococcus Group A" "Streptomycin" +"Streptococcus Group A" "Temocillin" +"Streptococcus Group A" "Tobramycin" +"Streptococcus Group B" "Amikacin/fosfomycin" +"Streptococcus Group B" "Amikacin" +"Streptococcus Group B" "Apramycin" +"Streptococcus Group B" "Arbekacin" +"Streptococcus Group B" "Astromicin" +"Streptococcus Group B" "Aztreonam" +"Streptococcus Group B" "Bekanamycin" +"Streptococcus Group B" "Ceftazidime" +"Streptococcus Group B" "Colistin" +"Streptococcus Group B" "Dibekacin" +"Streptococcus Group B" "Framycetin" +"Streptococcus Group B" "Fusidic acid" +"Streptococcus Group B" "Gentamicin" +"Streptococcus Group B" "Habekacin" +"Streptococcus Group B" "Hygromycin" +"Streptococcus Group B" "Isepamicin" +"Streptococcus Group B" "Kanamycin/cephalexin" +"Streptococcus Group B" "Kanamycin" +"Streptococcus Group B" "Micronomicin" +"Streptococcus Group B" "Nalidixic acid" +"Streptococcus Group B" "Neomycin" +"Streptococcus Group B" "Netilmicin" +"Streptococcus Group B" "Pentisomicin" +"Streptococcus Group B" "Propikacin" +"Streptococcus Group B" "Polymyxin B" +"Streptococcus Group B" "Plazomicin" +"Streptococcus Group B" "Ribostamycin" +"Streptococcus Group B" "Sisomicin" +"Streptococcus Group B" "Streptoduocin" +"Streptococcus Group B" "Streptomycin" +"Streptococcus Group B" "Temocillin" +"Streptococcus Group B" "Tobramycin" +"Streptococcus Group C" "Amikacin/fosfomycin" +"Streptococcus Group C" "Amikacin" +"Streptococcus Group C" "Apramycin" +"Streptococcus Group C" "Arbekacin" +"Streptococcus Group C" "Astromicin" +"Streptococcus Group C" "Aztreonam" +"Streptococcus Group C" "Bekanamycin" +"Streptococcus Group C" "Ceftazidime" +"Streptococcus Group C" "Colistin" +"Streptococcus Group C" "Dibekacin" +"Streptococcus Group C" "Framycetin" +"Streptococcus Group C" "Fusidic acid" +"Streptococcus Group C" "Gentamicin" +"Streptococcus Group C" "Habekacin" +"Streptococcus Group C" "Hygromycin" +"Streptococcus Group C" "Isepamicin" +"Streptococcus Group C" "Kanamycin/cephalexin" +"Streptococcus Group C" "Kanamycin" +"Streptococcus Group C" "Micronomicin" +"Streptococcus Group C" "Nalidixic acid" +"Streptococcus Group C" "Neomycin" +"Streptococcus Group C" "Netilmicin" +"Streptococcus Group C" "Pentisomicin" +"Streptococcus Group C" "Propikacin" +"Streptococcus Group C" "Polymyxin B" +"Streptococcus Group C" "Plazomicin" +"Streptococcus Group C" "Ribostamycin" +"Streptococcus Group C" "Sisomicin" +"Streptococcus Group C" "Streptoduocin" +"Streptococcus Group C" "Streptomycin" +"Streptococcus Group C" "Temocillin" +"Streptococcus Group C" "Tobramycin" +"Streptococcus Group D" "Amikacin/fosfomycin" +"Streptococcus Group D" "Amikacin" +"Streptococcus Group D" "Apramycin" +"Streptococcus Group D" "Arbekacin" +"Streptococcus Group D" "Astromicin" +"Streptococcus Group D" "Aztreonam" +"Streptococcus Group D" "Bekanamycin" +"Streptococcus Group D" "Ceftazidime" +"Streptococcus Group D" "Colistin" +"Streptococcus Group D" "Dibekacin" +"Streptococcus Group D" "Framycetin" +"Streptococcus Group D" "Fusidic acid" +"Streptococcus Group D" "Gentamicin" +"Streptococcus Group D" "Habekacin" +"Streptococcus Group D" "Hygromycin" +"Streptococcus Group D" "Isepamicin" +"Streptococcus Group D" "Kanamycin/cephalexin" +"Streptococcus Group D" "Kanamycin" +"Streptococcus Group D" "Micronomicin" +"Streptococcus Group D" "Nalidixic acid" +"Streptococcus Group D" "Neomycin" +"Streptococcus Group D" "Netilmicin" +"Streptococcus Group D" "Pentisomicin" +"Streptococcus Group D" "Propikacin" +"Streptococcus Group D" "Polymyxin B" +"Streptococcus Group D" "Plazomicin" +"Streptococcus Group D" "Ribostamycin" +"Streptococcus Group D" "Sisomicin" +"Streptococcus Group D" "Streptoduocin" +"Streptococcus Group D" "Streptomycin" +"Streptococcus Group D" "Temocillin" +"Streptococcus Group D" "Tobramycin" +"Streptococcus Group F" "Amikacin/fosfomycin" +"Streptococcus Group F" "Amikacin" +"Streptococcus Group F" "Apramycin" +"Streptococcus Group F" "Arbekacin" +"Streptococcus Group F" "Astromicin" +"Streptococcus Group F" "Aztreonam" +"Streptococcus Group F" "Bekanamycin" +"Streptococcus Group F" "Ceftazidime" +"Streptococcus Group F" "Colistin" +"Streptococcus Group F" "Dibekacin" +"Streptococcus Group F" "Framycetin" +"Streptococcus Group F" "Fusidic acid" +"Streptococcus Group F" "Gentamicin" +"Streptococcus Group F" "Habekacin" +"Streptococcus Group F" "Hygromycin" +"Streptococcus Group F" "Isepamicin" +"Streptococcus Group F" "Kanamycin/cephalexin" +"Streptococcus Group F" "Kanamycin" +"Streptococcus Group F" "Micronomicin" +"Streptococcus Group F" "Nalidixic acid" +"Streptococcus Group F" "Neomycin" +"Streptococcus Group F" "Netilmicin" +"Streptococcus Group F" "Pentisomicin" +"Streptococcus Group F" "Propikacin" +"Streptococcus Group F" "Polymyxin B" +"Streptococcus Group F" "Plazomicin" +"Streptococcus Group F" "Ribostamycin" +"Streptococcus Group F" "Sisomicin" +"Streptococcus Group F" "Streptoduocin" +"Streptococcus Group F" "Streptomycin" +"Streptococcus Group F" "Temocillin" +"Streptococcus Group F" "Tobramycin" +"Streptococcus Group G" "Amikacin/fosfomycin" +"Streptococcus Group G" "Amikacin" +"Streptococcus Group G" "Apramycin" +"Streptococcus Group G" "Arbekacin" +"Streptococcus Group G" "Astromicin" +"Streptococcus Group G" "Aztreonam" +"Streptococcus Group G" "Bekanamycin" +"Streptococcus Group G" "Ceftazidime" +"Streptococcus Group G" "Colistin" +"Streptococcus Group G" "Dibekacin" +"Streptococcus Group G" "Framycetin" +"Streptococcus Group G" "Fusidic acid" +"Streptococcus Group G" "Gentamicin" +"Streptococcus Group G" "Habekacin" +"Streptococcus Group G" "Hygromycin" +"Streptococcus Group G" "Isepamicin" +"Streptococcus Group G" "Kanamycin/cephalexin" +"Streptococcus Group G" "Kanamycin" +"Streptococcus Group G" "Micronomicin" +"Streptococcus Group G" "Nalidixic acid" +"Streptococcus Group G" "Neomycin" +"Streptococcus Group G" "Netilmicin" +"Streptococcus Group G" "Pentisomicin" +"Streptococcus Group G" "Propikacin" +"Streptococcus Group G" "Polymyxin B" +"Streptococcus Group G" "Plazomicin" +"Streptococcus Group G" "Ribostamycin" +"Streptococcus Group G" "Sisomicin" +"Streptococcus Group G" "Streptoduocin" +"Streptococcus Group G" "Streptomycin" +"Streptococcus Group G" "Temocillin" +"Streptococcus Group G" "Tobramycin" +"Streptococcus Group H" "Amikacin/fosfomycin" +"Streptococcus Group H" "Amikacin" +"Streptococcus Group H" "Apramycin" +"Streptococcus Group H" "Arbekacin" +"Streptococcus Group H" "Astromicin" +"Streptococcus Group H" "Aztreonam" +"Streptococcus Group H" "Bekanamycin" +"Streptococcus Group H" "Ceftazidime" +"Streptococcus Group H" "Colistin" +"Streptococcus Group H" "Dibekacin" +"Streptococcus Group H" "Framycetin" +"Streptococcus Group H" "Fusidic acid" +"Streptococcus Group H" "Gentamicin" +"Streptococcus Group H" "Habekacin" +"Streptococcus Group H" "Hygromycin" +"Streptococcus Group H" "Isepamicin" +"Streptococcus Group H" "Kanamycin/cephalexin" +"Streptococcus Group H" "Kanamycin" +"Streptococcus Group H" "Micronomicin" +"Streptococcus Group H" "Nalidixic acid" +"Streptococcus Group H" "Neomycin" +"Streptococcus Group H" "Netilmicin" +"Streptococcus Group H" "Pentisomicin" +"Streptococcus Group H" "Propikacin" +"Streptococcus Group H" "Polymyxin B" +"Streptococcus Group H" "Plazomicin" +"Streptococcus Group H" "Ribostamycin" +"Streptococcus Group H" "Sisomicin" +"Streptococcus Group H" "Streptoduocin" +"Streptococcus Group H" "Streptomycin" +"Streptococcus Group H" "Temocillin" +"Streptococcus Group H" "Tobramycin" +"Streptococcus Group K" "Amikacin/fosfomycin" +"Streptococcus Group K" "Amikacin" +"Streptococcus Group K" "Apramycin" +"Streptococcus Group K" "Arbekacin" +"Streptococcus Group K" "Astromicin" +"Streptococcus Group K" "Aztreonam" +"Streptococcus Group K" "Bekanamycin" +"Streptococcus Group K" "Ceftazidime" +"Streptococcus Group K" "Colistin" +"Streptococcus Group K" "Dibekacin" +"Streptococcus Group K" "Framycetin" +"Streptococcus Group K" "Fusidic acid" +"Streptococcus Group K" "Gentamicin" +"Streptococcus Group K" "Habekacin" +"Streptococcus Group K" "Hygromycin" +"Streptococcus Group K" "Isepamicin" +"Streptococcus Group K" "Kanamycin/cephalexin" +"Streptococcus Group K" "Kanamycin" +"Streptococcus Group K" "Micronomicin" +"Streptococcus Group K" "Nalidixic acid" +"Streptococcus Group K" "Neomycin" +"Streptococcus Group K" "Netilmicin" +"Streptococcus Group K" "Pentisomicin" +"Streptococcus Group K" "Propikacin" +"Streptococcus Group K" "Polymyxin B" +"Streptococcus Group K" "Plazomicin" +"Streptococcus Group K" "Ribostamycin" +"Streptococcus Group K" "Sisomicin" +"Streptococcus Group K" "Streptoduocin" +"Streptococcus Group K" "Streptomycin" +"Streptococcus Group K" "Temocillin" +"Streptococcus Group K" "Tobramycin" "Streptococcus halichoeri" "Amikacin/fosfomycin" "Streptococcus halichoeri" "Amikacin" "Streptococcus halichoeri" "Apramycin" diff --git a/data-raw/intrinsic_resistant.xlsx b/data-raw/intrinsic_resistant.xlsx index e3f73a6b..fe5565d5 100644 Binary files a/data-raw/intrinsic_resistant.xlsx and b/data-raw/intrinsic_resistant.xlsx differ diff --git a/data-raw/microorganisms.dta b/data-raw/microorganisms.dta index 7fbf3be5..b1394a27 100644 Binary files a/data-raw/microorganisms.dta and b/data-raw/microorganisms.dta differ diff --git a/data-raw/microorganisms.feather b/data-raw/microorganisms.feather index 6cb3d000..0ad60413 100644 Binary files a/data-raw/microorganisms.feather and b/data-raw/microorganisms.feather differ diff --git a/data-raw/microorganisms.md5 b/data-raw/microorganisms.md5 index fdfc2a9b..2c461c3e 100644 --- a/data-raw/microorganisms.md5 +++ b/data-raw/microorganisms.md5 @@ -1 +1 @@ -88f3ce0e84bf8336f43cd6565215db1d +6e6f44705995094be5eddc00e0878308 diff --git a/data-raw/microorganisms.parquet b/data-raw/microorganisms.parquet index d59cb6ab..2e5abaf5 100644 Binary files a/data-raw/microorganisms.parquet and b/data-raw/microorganisms.parquet differ diff --git a/data-raw/microorganisms.rds b/data-raw/microorganisms.rds index ed21ceff..cadac011 100644 Binary files a/data-raw/microorganisms.rds and b/data-raw/microorganisms.rds differ diff --git a/data-raw/microorganisms.sas b/data-raw/microorganisms.sas index 73915180..633e0148 100644 Binary files a/data-raw/microorganisms.sas and b/data-raw/microorganisms.sas differ diff --git a/data-raw/microorganisms.sav b/data-raw/microorganisms.sav index d194fe9f..6d029e5b 100644 Binary files a/data-raw/microorganisms.sav and b/data-raw/microorganisms.sav differ diff --git a/data-raw/microorganisms.txt b/data-raw/microorganisms.txt index d3fa7855..56a088f4 100644 --- a/data-raw/microorganisms.txt +++ b/data-raw/microorganisms.txt @@ -41483,7 +41483,6 @@ "B_SLMNL_CHRD" "Salmonella Chiredzi" "accepted" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "enterica" "Chiredzi" "subspecies" "manually added" "784857" "9701185" 1 "" "B_SLMNL_CHTT" "Salmonella Chittagong" "accepted" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "enterica" "Chittagong" "subspecies" "manually added" "784857" "9701185" 1 "" "B_SLMNL_CHLR" "Salmonella choleraesuis" "synonym" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "choleraesuis" "" "species" "Weldin, 1927" "LPSN" "780746" "516547" "784857" "7515106" "3221815" "9701185" 1 "" -"B_SLMNL_CHLRS" "Salmonella Choleraesuis" "accepted" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "enterica" "Choleraesuis" "subspecies" "manually added" "784857" "9701185" 1 "" "B_SLMNL_CHLR_ARZN" "Salmonella choleraesuis arizonae" "synonym" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "choleraesuis" "arizonae" "subspecies" "Le Minor et al., 1985" "LPSN" "780747" "780746" "780755" "5427587" "7515106" "5427586" 1 "" "B_SLMNL_CHLR_BNGR" "Salmonella choleraesuis bongori" "synonym" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "choleraesuis" "bongori" "subspecies" "Le Minor et al., 1985" "LPSN" "780748" "780746" "780745" "5427597" "7515106" "5427596" 1 "" "B_SLMNL_CHLR_CHLR" "Salmonella choleraesuis choleraesuis" "synonym" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "choleraesuis" "choleraesuis" "subspecies" "Le Minor et al., 1985" "LPSN" "780749" "780746" "780758" "5427590" "7515106" "5427589" 1 "" @@ -41624,7 +41623,6 @@ "B_SLMNL_ENTR_INDC" "Salmonella enterica indica" "accepted" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "enterica" "indica" "subspecies" "Le Minor et al., 1987" "LPSN" "780760" "784857" "5427582" "9701185" 1 "" "B_SLMNL_ENTR_SALM" "Salmonella enterica salamae" "accepted" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "enterica" "salamae" "subspecies" "Le Minor et al., 1987" "LPSN" "780761" "784857" "5427584" "9701185" 1 "" "B_SLMNL_RTDS" "Salmonella enteritidis" "synonym" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "enteritidis" "" "species" "Castellani et al., 1919" "LPSN" "780762" "516547" "784857" "5427592" "3221815" "9701185" 1 "" -"B_SLMNL_ENTRT" "Salmonella Enteritidis" "accepted" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "enterica" "Enteritidis" "subspecies" "manually added" "784857" "9701185" 1 "" "B_SLMNL_ENUG" "Salmonella Enugu" "accepted" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "enterica" "Enugu" "subspecies" "manually added" "784857" "9701185" 1 "" "B_SLMNL_EPLN" "Salmonella Epalinges" "accepted" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "enterica" "Epalinges" "subspecies" "manually added" "784857" "9701185" 1 "" "B_SLMNL_EPCR" "Salmonella Epicrates" "accepted" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "enterica" "Epicrates" "subspecies" "manually added" "784857" "9701185" 1 "" @@ -42279,7 +42277,6 @@ "B_SLMNL_PLMN" "Salmonella Palamaner" "accepted" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "enterica" "Palamaner" "subspecies" "manually added" "784857" "9701185" 1 "" "B_SLMNL_PALM" "Salmonella Palime" "accepted" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "enterica" "Palime" "subspecies" "manually added" "784857" "9701185" 1 "" "B_SLMNL_PANM" "Salmonella panama" "accepted" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "panama" "" "species" "Kauffmann, 1934" "GBIF" "9407232" "3221815" 1 "" -"B_SLMNL_PANAM" "Salmonella Panama" "accepted" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "enterica" "Panama" "subspecies" "manually added" "784857" "9701185" 1 "" "B_SLMNL_PAPN" "Salmonella Papuana" "accepted" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "enterica" "Papuana" "subspecies" "manually added" "784857" "9701185" 1 "" "B_SLMNL_PARK" "Salmonella Parakou" "accepted" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "enterica" "Parakou" "subspecies" "manually added" "784857" "9701185" 1 "" "B_SLMNL_PRTY" "Salmonella paratyphi" "synonym" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "paratyphi" "" "species" "Ezaki et al., 2000" "LPSN" "784858" "516547" "784857" "5427593" "3221815" "9701185" 1 "840687007" @@ -42577,7 +42574,6 @@ "B_SLMNL_TUDU" "Salmonella Tudu" "accepted" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "enterica" "Tudu" "subspecies" "manually added" "784857" "9701185" 1 "" "B_SLMNL_TUMD" "Salmonella Tumodi" "accepted" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "enterica" "Tumodi" "subspecies" "manually added" "784857" "9701185" 1 "" "B_SLMNL_TYPH" "Salmonella typhi" "synonym" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "typhi" "" "species" "Warren et al., 1930" "LPSN" "784859" "516547" "784857" "5427594" "3221815" "9701185" 1 "712764007" -"B_SLMNL_TYPHI" "Salmonella Typhi" "accepted" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "enterica" "Typhi" "subspecies" "manually added" "784857" "9701185" 1 "" "B_SLMNL_HMRM" "Salmonella typhimurium" "synonym" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "typhimurium" "" "species" "Castellani et al., 1919" "LPSN" "780770" "516547" "784857" "5427591" "3221815" "9701185" 1 "" "B_SLMNL_THSS" "Salmonella Typhisuis" "accepted" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "enterica" "Typhisuis" "subspecies" "manually added" "784857" "9701185" 1 "" "B_SLMNL_TYRS" "Salmonella Tyresoe" "accepted" "Bacteria" "Pseudomonadota" "Gammaproteobacteria" "Enterobacterales" "Enterobacteriaceae" "Salmonella" "enterica" "Tyresoe" "subspecies" "manually added" "784857" "9701185" 1 "" @@ -45499,15 +45495,15 @@ "B_STRPT_GLLL_PSTR" "Streptococcus gallolyticus pasteurianus" "accepted" "Bacteria" "Bacillota" "Bacilli" "Lactobacillales" "Streptococcaceae" "Streptococcus" "gallolyticus" "pasteurianus" "subspecies" "Beck et al., 2008" "LPSN" "781340" "781337" "3227070" 1 "" "B_STRPT_GARV" "Streptococcus garvieae" "synonym" "Bacteria" "Bacillota" "Bacilli" "Lactobacillales" "Streptococcaceae" "Streptococcus" "garvieae" "" "species" "Collins et al., 1984" "LPSN" "781341" "517118" "777418" 1 "" "B_STRPT_GRDN" "Streptococcus gordonii" "accepted" "Bacteria" "Bacillota" "Bacilli" "Lactobacillales" "Streptococcaceae" "Streptococcus" "gordonii" "" "species" "Kilian et al., 1989" "LPSN" "781342" "517118" 1 "113986004" -"B_STRPT_GRPA" "Streptococcus group A" "accepted" "Bacteria" "Bacillota" "Bacilli" "Lactobacillales" "Streptococcaceae" "Streptococcus" "group A" "" "species" "Lancefield, 1933" "manually added" 1 "" -"B_STRPT_GRPB" "Streptococcus group B" "accepted" "Bacteria" "Bacillota" "Bacilli" "Lactobacillales" "Streptococcaceae" "Streptococcus" "group B" "" "species" "Lancefield, 1933" "manually added" 1 "" -"B_STRPT_GRPC" "Streptococcus group C" "accepted" "Bacteria" "Bacillota" "Bacilli" "Lactobacillales" "Streptococcaceae" "Streptococcus" "group C" "" "species" "Lancefield, 1933" "manually added" 1 "" -"B_STRPT_GRPD" "Streptococcus group D" "accepted" "Bacteria" "Bacillota" "Bacilli" "Lactobacillales" "Streptococcaceae" "Streptococcus" "group D" "" "species" "Lancefield, 1933" "manually added" 1 "" -"B_STRPT_GRPF" "Streptococcus group F" "accepted" "Bacteria" "Bacillota" "Bacilli" "Lactobacillales" "Streptococcaceae" "Streptococcus" "group F" "" "species" "Lancefield, 1933" "manually added" 1 "" -"B_STRPT_GRPG" "Streptococcus group G" "accepted" "Bacteria" "Bacillota" "Bacilli" "Lactobacillales" "Streptococcaceae" "Streptococcus" "group G" "" "species" "Lancefield, 1933" "manually added" 1 "" -"B_STRPT_GRPH" "Streptococcus group H" "accepted" "Bacteria" "Bacillota" "Bacilli" "Lactobacillales" "Streptococcaceae" "Streptococcus" "group H" "" "species" "Lancefield, 1933" "manually added" 1 "" -"B_STRPT_GRPK" "Streptococcus group K" "accepted" "Bacteria" "Bacillota" "Bacilli" "Lactobacillales" "Streptococcaceae" "Streptococcus" "group K" "" "species" "Lancefield, 1933" "manually added" 1 "" -"B_STRPT_GRPL" "Streptococcus group L" "accepted" "Bacteria" "Bacillota" "Bacilli" "Lactobacillales" "Streptococcaceae" "Streptococcus" "group L" "" "species" "Lancefield, 1933" "manually added" 1 "" +"B_STRPT_GRPA" "Streptococcus Group A" "accepted" "Bacteria" "Bacillota" "Bacilli" "Lactobacillales" "Streptococcaceae" "Streptococcus" "Group A" "" "species" "Lancefield, 1933" "manually added" 1 "" +"B_STRPT_GRPB" "Streptococcus Group B" "accepted" "Bacteria" "Bacillota" "Bacilli" "Lactobacillales" "Streptococcaceae" "Streptococcus" "Group B" "" "species" "Lancefield, 1933" "manually added" 1 "" +"B_STRPT_GRPC" "Streptococcus Group C" "accepted" "Bacteria" "Bacillota" "Bacilli" "Lactobacillales" "Streptococcaceae" "Streptococcus" "Group C" "" "species" "Lancefield, 1933" "manually added" 1 "" +"B_STRPT_GRPD" "Streptococcus Group D" "accepted" "Bacteria" "Bacillota" "Bacilli" "Lactobacillales" "Streptococcaceae" "Streptococcus" "Group D" "" "species" "Lancefield, 1933" "manually added" 1 "" +"B_STRPT_GRPF" "Streptococcus Group F" "accepted" "Bacteria" "Bacillota" "Bacilli" "Lactobacillales" "Streptococcaceae" "Streptococcus" "Group F" "" "species" "Lancefield, 1933" "manually added" 1 "" +"B_STRPT_GRPG" "Streptococcus Group G" "accepted" "Bacteria" "Bacillota" "Bacilli" "Lactobacillales" "Streptococcaceae" "Streptococcus" "Group G" "" "species" "Lancefield, 1933" "manually added" 1 "" +"B_STRPT_GRPH" "Streptococcus Group H" "accepted" "Bacteria" "Bacillota" "Bacilli" "Lactobacillales" "Streptococcaceae" "Streptococcus" "Group H" "" "species" "Lancefield, 1933" "manually added" 1 "" +"B_STRPT_GRPK" "Streptococcus Group K" "accepted" "Bacteria" "Bacillota" "Bacilli" "Lactobacillales" "Streptococcaceae" "Streptococcus" "Group K" "" "species" "Lancefield, 1933" "manually added" 1 "" +"B_STRPT_GRPL" "Streptococcus Group L" "accepted" "Bacteria" "Bacillota" "Bacilli" "Lactobacillales" "Streptococcaceae" "Streptococcus" "Group L" "" "species" "Lancefield, 1933" "manually added" 1 "" "B_STRPT_GWNG" "Streptococcus gwangjuense" "accepted" "Bacteria" "Bacillota" "Bacilli" "Lactobacillales" "Streptococcaceae" "Streptococcus" "gwangjuense" "" "species" "GBIF" "11190550" "3223465" 1 "" "B_STRPT_HLCH" "Streptococcus halichoeri" "accepted" "Bacteria" "Bacillota" "Bacilli" "Lactobacillales" "Streptococcaceae" "Streptococcus" "halichoeri" "" "species" "Shewmaker et al., 2016" "LPSN" "781344" "517118" 1 "438161002" "B_STRPT_HLTS" "Streptococcus halitosis" "accepted" "Bacteria" "Bacillota" "Bacilli" "Lactobacillales" "Streptococcaceae" "Streptococcus" "halitosis" "" "species" "GBIF" "10822581" "3223465" 1 "" diff --git a/data-raw/microorganisms.xlsx b/data-raw/microorganisms.xlsx index 123ffc6d..4340933b 100644 Binary files a/data-raw/microorganisms.xlsx and b/data-raw/microorganisms.xlsx differ diff --git a/data-raw/rsi.md5 b/data-raw/rsi.md5 index eff5fe46..79272568 100644 --- a/data-raw/rsi.md5 +++ b/data-raw/rsi.md5 @@ -1 +1 @@ -cc011cc85e7854e1386cc67d3daf7acd +68467f5179638ac5622281df53a5ea75 diff --git a/data-raw/rsi_translation.dta b/data-raw/rsi_translation.dta index ff156e1f..1f5240a8 100644 Binary files a/data-raw/rsi_translation.dta and b/data-raw/rsi_translation.dta differ diff --git a/data-raw/rsi_translation.feather b/data-raw/rsi_translation.feather index 15ea3bf7..c1a18e9b 100644 Binary files a/data-raw/rsi_translation.feather and b/data-raw/rsi_translation.feather differ diff --git a/data-raw/rsi_translation.parquet b/data-raw/rsi_translation.parquet index ce199e8a..c43fc42d 100644 Binary files a/data-raw/rsi_translation.parquet and b/data-raw/rsi_translation.parquet differ diff --git a/data-raw/rsi_translation.rds b/data-raw/rsi_translation.rds index 7fd114f4..d0563813 100644 Binary files a/data-raw/rsi_translation.rds and b/data-raw/rsi_translation.rds differ diff --git a/data-raw/rsi_translation.sas b/data-raw/rsi_translation.sas index d4014bc6..15961b5a 100644 Binary files a/data-raw/rsi_translation.sas and b/data-raw/rsi_translation.sas differ diff --git a/data-raw/rsi_translation.sav b/data-raw/rsi_translation.sav index 7b02929b..7a6d8400 100644 Binary files a/data-raw/rsi_translation.sav and b/data-raw/rsi_translation.sav differ diff --git a/data-raw/rsi_translation.txt b/data-raw/rsi_translation.txt index cb75706f..aa3333f3 100644 --- a/data-raw/rsi_translation.txt +++ b/data-raw/rsi_translation.txt @@ -763,8 +763,8 @@ "EUCAST 2022" "MIC" "UTI" "B_ESCHR_COLI" "Escherichia coli" 2 "NIT" "Nitrofurantoin" "Enterobacteriaceae" 64 64 TRUE "EUCAST 2022" "MIC" "UTI" "B_STPHY" "Staphylococcus" 3 "NIT" "Nitrofurantoin" "Staphs" 64 64 TRUE "EUCAST 2022" "DISK" "UTI" "B_STPHY_SPRP_SPRP" "Staphylococcus saprophyticus saprophyticus" 1 "NIT" "Nitrofurantoin" "Staphs" "100ug" 13 13 TRUE -"EUCAST 2022" "DISK" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" "100ug" 15 15 TRUE -"EUCAST 2022" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" 64 64 TRUE +"EUCAST 2022" "DISK" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" "100ug" 15 15 TRUE +"EUCAST 2022" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" 64 64 TRUE "EUCAST 2022" "DISK" "UTI" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "NOR" "Norfloxacin" "Enterobacteriaceae" "10ug" 22 22 TRUE "EUCAST 2022" "MIC" "UTI" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "NOR" "Norfloxacin" "Enterobacteriaceae" 0.5 0.5 TRUE "EUCAST 2022" "DISK" "B_AERCC" "Aerococcus" 3 "NOR" "Norfloxacin" "Aerococcus" "10ug" 17 17 FALSE @@ -1039,7 +1039,7 @@ "EUCAST 2022" "MIC" "UTI" "B_ENTRC" "Enterococcus" 3 "TMP" "Trimethoprim" "Enterococcus" 0.032 1 TRUE "EUCAST 2022" "DISK" "UTI" "B_STPHY" "Staphylococcus" 3 "TMP" "Trimethoprim" "Staphs" "5ug" 14 14 TRUE "EUCAST 2022" "MIC" "UTI" "B_STPHY" "Staphylococcus" 3 "TMP" "Trimethoprim" "Staphs" 4 4 TRUE -"EUCAST 2022" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "TMP" "Trimethoprim" "Strep A, B, C, G" 2 2 TRUE +"EUCAST 2022" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "TMP" "Trimethoprim" "Strep A, B, C, G" 2 2 TRUE "EUCAST 2022" "DISK" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "TOB" "Tobramycin" "Enterobacteriaceae" "10ug" 16 16 FALSE "EUCAST 2022" "DISK" "UTI" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "TOB" "Tobramycin" "Enterobacteriaceae" "10ug" 16 16 TRUE "EUCAST 2022" "MIC" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "TOB" "Tobramycin" "Enterobacteriaceae" 2 2 FALSE @@ -1756,8 +1756,8 @@ "EUCAST 2021" "MIC" "UTI" "B_ESCHR_COLI" "Escherichia coli" 2 "NIT" "Nitrofurantoin" "Enterobacteriaceae" 64 64 TRUE "EUCAST 2021" "MIC" "UTI" "B_STPHY" "Staphylococcus" 3 "NIT" "Nitrofurantoin" "Staphs" 64 64 TRUE "EUCAST 2021" "DISK" "UTI" "B_STPHY_SPRP_SPRP" "Staphylococcus saprophyticus saprophyticus" 1 "NIT" "Nitrofurantoin" "Staphs" "100ug" 13 13 TRUE -"EUCAST 2021" "DISK" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" "100ug" 15 15 TRUE -"EUCAST 2021" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" 64 64 TRUE +"EUCAST 2021" "DISK" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" "100ug" 15 15 TRUE +"EUCAST 2021" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" 64 64 TRUE "EUCAST 2021" "DISK" "UTI" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "NOR" "Norfloxacin" "Enterobacteriaceae" "10ug" 22 22 TRUE "EUCAST 2021" "MIC" "UTI" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "NOR" "Norfloxacin" "Enterobacteriaceae" 0.5 0.5 TRUE "EUCAST 2021" "DISK" "B_AERCC" "Aerococcus" 3 "NOR" "Norfloxacin" "Aerococcus" "10ug" 17 17 FALSE @@ -1995,7 +1995,7 @@ "EUCAST 2021" "MIC" "UTI" "B_ENTRC" "Enterococcus" 3 "TMP" "Trimethoprim" "Enterococcus" 0.032 1 TRUE "EUCAST 2021" "DISK" "UTI" "B_STPHY" "Staphylococcus" 3 "TMP" "Trimethoprim" "Staphs" "5ug" 14 14 TRUE "EUCAST 2021" "MIC" "UTI" "B_STPHY" "Staphylococcus" 3 "TMP" "Trimethoprim" "Staphs" 4 4 TRUE -"EUCAST 2021" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "TMP" "Trimethoprim" "Strep A, B, C, G" 2 2 TRUE +"EUCAST 2021" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "TMP" "Trimethoprim" "Strep A, B, C, G" 2 2 TRUE "EUCAST 2021" "DISK" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "TOB" "Tobramycin" "Enterobacteriaceae" "10ug" 16 16 FALSE "EUCAST 2021" "DISK" "UTI" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "TOB" "Tobramycin" "Enterobacteriaceae" "10ug" 16 16 TRUE "EUCAST 2021" "MIC" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "TOB" "Tobramycin" "Enterobacteriaceae" 2 2 FALSE @@ -2622,8 +2622,8 @@ "EUCAST 2020" "MIC" "UTI" "B_ESCHR_COLI" "Escherichia coli" 2 "NIT" "Nitrofurantoin" "Enterobacteriaceae" 64 64 TRUE "EUCAST 2020" "MIC" "UTI" "B_STPHY" "Staphylococcus" 3 "NIT" "Nitrofurantoin" "Staphs" 64 64 TRUE "EUCAST 2020" "DISK" "UTI" "B_STPHY_SPRP_SPRP" "Staphylococcus saprophyticus saprophyticus" 1 "NIT" "Nitrofurantoin" "Staphs" "100ug" 13 13 TRUE -"EUCAST 2020" "DISK" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" "100ug" 15 15 TRUE -"EUCAST 2020" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" 64 64 TRUE +"EUCAST 2020" "DISK" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" "100ug" 15 15 TRUE +"EUCAST 2020" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" 64 64 TRUE "EUCAST 2020" "DISK" "UTI" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "NOR" "Norfloxacin" "Enterobacteriaceae" "10ug" 22 22 TRUE "EUCAST 2020" "MIC" "UTI" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "NOR" "Norfloxacin" "Enterobacteriaceae" 0.5 0.5 TRUE "EUCAST 2020" "DISK" "B_AERCC" "Aerococcus" 3 "NOR" "Norfloxacin" "Aerococcus" "10ug" 17 17 FALSE @@ -2841,7 +2841,7 @@ "EUCAST 2020" "MIC" "UTI" "B_ENTRC" "Enterococcus" 3 "TMP" "Trimethoprim" "Enterococcus" 0.032 1 TRUE "EUCAST 2020" "DISK" "UTI" "B_STPHY" "Staphylococcus" 3 "TMP" "Trimethoprim" "Staphs" "5ug" 14 14 TRUE "EUCAST 2020" "MIC" "UTI" "B_STPHY" "Staphylococcus" 3 "TMP" "Trimethoprim" "Staphs" 4 4 TRUE -"EUCAST 2020" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "TMP" "Trimethoprim" "Strep A, B, C, G" 2 2 TRUE +"EUCAST 2020" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "TMP" "Trimethoprim" "Strep A, B, C, G" 2 2 TRUE "EUCAST 2020" "DISK" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "TOB" "Tobramycin" "Enterobacteriaceae" "10ug" 17 17 FALSE "EUCAST 2020" "DISK" "UTI" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "TOB" "Tobramycin" "Enterobacteriaceae" "10ug" 17 17 TRUE "EUCAST 2020" "MIC" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "TOB" "Tobramycin" "Enterobacteriaceae" 2 2 FALSE @@ -3421,8 +3421,8 @@ "EUCAST 2019" "MIC" "UTI" "B_ENTRC_FCLS" "Enterococcus faecalis" 2 "NIT" "Nitrofurantoin" "Enterococcus" 64 64 TRUE "EUCAST 2019" "MIC" "UTI" "B_STPHY" "Staphylococcus" 3 "NIT" "Nitrofurantoin" "Staphs" 64 64 TRUE "EUCAST 2019" "DISK" "UTI" "B_STPHY_SPRP_SPRP" "Staphylococcus saprophyticus saprophyticus" 1 "NIT" "Nitrofurantoin" "Staphs" "100ug" 13 13 TRUE -"EUCAST 2019" "DISK" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" "100ug" 15 15 TRUE -"EUCAST 2019" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" 64 64 TRUE +"EUCAST 2019" "DISK" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" "100ug" 15 15 TRUE +"EUCAST 2019" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" 64 64 TRUE "EUCAST 2019" "DISK" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "NOR" "Norfloxacin" "Enterobacteriaceae" "10ug" 22 19 FALSE "EUCAST 2019" "MIC" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "NOR" "Norfloxacin" "Enterobacteriaceae" 0.5 1 FALSE "EUCAST 2019" "DISK" "B_AERCC" "Aerococcus" 3 "NOR" "Norfloxacin" "Aerococcus" "10ug" 17 17 FALSE @@ -3627,7 +3627,7 @@ "EUCAST 2019" "MIC" "UTI" "B_ENTRC" "Enterococcus" 3 "TMP" "Trimethoprim" "Enterococcus" 0.032 1 TRUE "EUCAST 2019" "DISK" "UTI" "B_STPHY" "Staphylococcus" 3 "TMP" "Trimethoprim" "Staphs" "5ug" 17 14 TRUE "EUCAST 2019" "MIC" "UTI" "B_STPHY" "Staphylococcus" 3 "TMP" "Trimethoprim" "Staphs" 2 4 TRUE -"EUCAST 2019" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "TMP" "Trimethoprim" "Strep A, B, C, G" 2 2 TRUE +"EUCAST 2019" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "TMP" "Trimethoprim" "Strep A, B, C, G" 2 2 TRUE "EUCAST 2019" "DISK" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "TOB" "Tobramycin" "Enterobacteriaceae" "10ug" 17 14 FALSE "EUCAST 2019" "MIC" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "TOB" "Tobramycin" "Enterobacteriaceae" 2 4 FALSE "EUCAST 2019" "DISK" "B_ACNTB" "Acinetobacter" 3 "TOB" "Tobramycin" "Acinetobacter spp." "10ug" 17 17 FALSE @@ -4184,8 +4184,8 @@ "EUCAST 2018" "MIC" "UTI" "B_ENTRC_FCLS" "Enterococcus faecalis" 2 "NIT" "Nitrofurantoin" "Enterococcus" 64 64 TRUE "EUCAST 2018" "MIC" "UTI" "B_STPHY" "Staphylococcus" 3 "NIT" "Nitrofurantoin" "Staphs" 64 64 TRUE "EUCAST 2018" "DISK" "UTI" "B_STPHY_SPRP_SPRP" "Staphylococcus saprophyticus saprophyticus" 1 "NIT" "Nitrofurantoin" "Staphs" "100ug" 13 13 TRUE -"EUCAST 2018" "DISK" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" "100ug" 15 15 TRUE -"EUCAST 2018" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" 64 64 TRUE +"EUCAST 2018" "DISK" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" "100ug" 15 15 TRUE +"EUCAST 2018" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" 64 64 TRUE "EUCAST 2018" "DISK" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "NOR" "Norfloxacin" "Enterobacteriaceae" "10ug" 22 19 FALSE "EUCAST 2018" "MIC" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "NOR" "Norfloxacin" "Enterobacteriaceae" 0.5 1 FALSE "EUCAST 2018" "DISK" "B_AERCC" "Aerococcus" 3 "NOR" "Norfloxacin" "Aerococcus" "10ug" 17 17 FALSE @@ -4389,7 +4389,7 @@ "EUCAST 2018" "MIC" "UTI" "B_ENTRC" "Enterococcus" 3 "TMP" "Trimethoprim" "Enterococcus" 0.032 1 TRUE "EUCAST 2018" "DISK" "UTI" "B_STPHY" "Staphylococcus" 3 "TMP" "Trimethoprim" "Staphs" "5ug" 17 14 TRUE "EUCAST 2018" "MIC" "UTI" "B_STPHY" "Staphylococcus" 3 "TMP" "Trimethoprim" "Staphs" 2 4 TRUE -"EUCAST 2018" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "TMP" "Trimethoprim" "Strep A, B, C, G" 2 2 TRUE +"EUCAST 2018" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "TMP" "Trimethoprim" "Strep A, B, C, G" 2 2 TRUE "EUCAST 2018" "DISK" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "TOB" "Tobramycin" "Enterobacteriaceae" "10ug" 17 14 FALSE "EUCAST 2018" "MIC" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "TOB" "Tobramycin" "Enterobacteriaceae" 2 4 FALSE "EUCAST 2018" "DISK" "B_ACNTB" "Acinetobacter" 3 "TOB" "Tobramycin" "Acinetobacter spp." "10ug" 17 17 FALSE @@ -4931,8 +4931,8 @@ "EUCAST 2017" "MIC" "UTI" "B_ENTRC_FCLS" "Enterococcus faecalis" 2 "NIT" "Nitrofurantoin" "Enterococcus" 64 64 TRUE "EUCAST 2017" "MIC" "UTI" "B_STPHY" "Staphylococcus" 3 "NIT" "Nitrofurantoin" "Staphs" 64 64 TRUE "EUCAST 2017" "DISK" "UTI" "B_STPHY_SPRP_SPRP" "Staphylococcus saprophyticus saprophyticus" 1 "NIT" "Nitrofurantoin" "Staphs" "100ug" 13 13 TRUE -"EUCAST 2017" "DISK" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" "100ug" 15 15 TRUE -"EUCAST 2017" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" 64 64 TRUE +"EUCAST 2017" "DISK" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" "100ug" 15 15 TRUE +"EUCAST 2017" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" 64 64 TRUE "EUCAST 2017" "DISK" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "NOR" "Norfloxacin" "Enterobacteriaceae" "10ug" 22 19 FALSE "EUCAST 2017" "MIC" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "NOR" "Norfloxacin" "Enterobacteriaceae" 0.5 1 FALSE "EUCAST 2017" "DISK" "B_AERCC" "Aerococcus" 3 "NOR" "Norfloxacin" "Aerococcus" "10ug" 17 17 FALSE @@ -5136,7 +5136,7 @@ "EUCAST 2017" "MIC" "UTI" "B_ENTRC" "Enterococcus" 3 "TMP" "Trimethoprim" "Enterococcus" 0.032 1 TRUE "EUCAST 2017" "DISK" "UTI" "B_STPHY" "Staphylococcus" 3 "TMP" "Trimethoprim" "Staphs" "5ug" 17 14 TRUE "EUCAST 2017" "MIC" "UTI" "B_STPHY" "Staphylococcus" 3 "TMP" "Trimethoprim" "Staphs" 2 4 TRUE -"EUCAST 2017" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "TMP" "Trimethoprim" "Strep A, B, C, G" 2 2 TRUE +"EUCAST 2017" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "TMP" "Trimethoprim" "Strep A, B, C, G" 2 2 TRUE "EUCAST 2017" "DISK" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "TOB" "Tobramycin" "Enterobacteriaceae" "10ug" 17 14 FALSE "EUCAST 2017" "MIC" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "TOB" "Tobramycin" "Enterobacteriaceae" 2 4 FALSE "EUCAST 2017" "DISK" "B_ACNTB" "Acinetobacter" 3 "TOB" "Tobramycin" "Acinetobacter spp." "10ug" 17 17 FALSE @@ -5637,8 +5637,8 @@ "EUCAST 2016" "MIC" "UTI" "B_ENTRC_FCLS" "Enterococcus faecalis" 2 "NIT" "Nitrofurantoin" "Enterococcus" 64 64 TRUE "EUCAST 2016" "DISK" "UTI" "B_STPHY" "Staphylococcus" 3 "NIT" "Nitrofurantoin" "Staphs" "100ug" 13 13 TRUE "EUCAST 2016" "MIC" "UTI" "B_STPHY" "Staphylococcus" 3 "NIT" "Nitrofurantoin" "Staphs" 64 64 TRUE -"EUCAST 2016" "DISK" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" "100ug" 15 15 TRUE -"EUCAST 2016" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" 64 64 TRUE +"EUCAST 2016" "DISK" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" "100ug" 15 15 TRUE +"EUCAST 2016" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" 64 64 TRUE "EUCAST 2016" "DISK" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "NOR" "Norfloxacin" "Enterobacteriaceae" "10ug" 22 19 FALSE "EUCAST 2016" "MIC" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "NOR" "Norfloxacin" "Enterobacteriaceae" 0.5 1 FALSE "EUCAST 2016" "DISK" "Screen" "B_ENTRC" "Enterococcus" 3 "NOR" "Norfloxacin" "Enterococcus" "10ug" 12 12 FALSE @@ -5822,7 +5822,7 @@ "EUCAST 2016" "MIC" "UTI" "B_ENTRC" "Enterococcus" 3 "TMP" "Trimethoprim" "Enterococcus" 0.032 1 TRUE "EUCAST 2016" "DISK" "UTI" "B_STPHY" "Staphylococcus" 3 "TMP" "Trimethoprim" "Staphs" "5ug" 17 14 TRUE "EUCAST 2016" "MIC" "UTI" "B_STPHY" "Staphylococcus" 3 "TMP" "Trimethoprim" "Staphs" 2 4 TRUE -"EUCAST 2016" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "TMP" "Trimethoprim" "Strep A, B, C, G" 2 2 TRUE +"EUCAST 2016" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "TMP" "Trimethoprim" "Strep A, B, C, G" 2 2 TRUE "EUCAST 2016" "DISK" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "TOB" "Tobramycin" "Enterobacteriaceae" "10ug" 17 14 FALSE "EUCAST 2016" "MIC" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "TOB" "Tobramycin" "Enterobacteriaceae" 2 4 FALSE "EUCAST 2016" "DISK" "B_ACNTB" "Acinetobacter" 3 "TOB" "Tobramycin" "Acinetobacter spp." "10ug" 17 17 FALSE @@ -6306,8 +6306,8 @@ "EUCAST 2015" "MIC" "UTI" "B_ENTRC_FCLS" "Enterococcus faecalis" 2 "NIT" "Nitrofurantoin" "Enterococcus" 64 64 TRUE "EUCAST 2015" "DISK" "UTI" "B_STPHY" "Staphylococcus" 3 "NIT" "Nitrofurantoin" "Staphs" "100ug" 13 13 TRUE "EUCAST 2015" "MIC" "UTI" "B_STPHY" "Staphylococcus" 3 "NIT" "Nitrofurantoin" "Staphs" 64 64 TRUE -"EUCAST 2015" "DISK" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" "100ug" 15 15 TRUE -"EUCAST 2015" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" 64 64 TRUE +"EUCAST 2015" "DISK" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" "100ug" 15 15 TRUE +"EUCAST 2015" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" 64 64 TRUE "EUCAST 2015" "DISK" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "NOR" "Norfloxacin" "Enterobacteriaceae" "10ug" 22 19 FALSE "EUCAST 2015" "MIC" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "NOR" "Norfloxacin" "Enterobacteriaceae" 0.5 1 FALSE "EUCAST 2015" "DISK" "Screen" "B_ENTRC" "Enterococcus" 3 "NOR" "Norfloxacin" "Enterococcus" "10ug" 12 12 FALSE @@ -6484,7 +6484,7 @@ "EUCAST 2015" "MIC" "UTI" "B_ENTRC" "Enterococcus" 3 "TMP" "Trimethoprim" "Enterococcus" 0.032 1 TRUE "EUCAST 2015" "DISK" "UTI" "B_STPHY" "Staphylococcus" 3 "TMP" "Trimethoprim" "Staphs" "5ug" 17 14 TRUE "EUCAST 2015" "MIC" "UTI" "B_STPHY" "Staphylococcus" 3 "TMP" "Trimethoprim" "Staphs" 2 4 TRUE -"EUCAST 2015" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "TMP" "Trimethoprim" "Strep A, B, C, G" 2 2 TRUE +"EUCAST 2015" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "TMP" "Trimethoprim" "Strep A, B, C, G" 2 2 TRUE "EUCAST 2015" "DISK" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "TOB" "Tobramycin" "Enterobacteriaceae" "10ug" 17 14 FALSE "EUCAST 2015" "MIC" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "TOB" "Tobramycin" "Enterobacteriaceae" 2 4 FALSE "EUCAST 2015" "DISK" "B_ACNTB" "Acinetobacter" 3 "TOB" "Tobramycin" "Acinetobacter spp." "10ug" 17 17 FALSE @@ -6961,8 +6961,8 @@ "EUCAST 2014" "MIC" "UTI" "B_ENTRC_FCLS" "Enterococcus faecalis" 2 "NIT" "Nitrofurantoin" "Enterococcus" 64 64 TRUE "EUCAST 2014" "DISK" "UTI" "B_STPHY" "Staphylococcus" 3 "NIT" "Nitrofurantoin" "Staphs" "100ug" 13 13 TRUE "EUCAST 2014" "MIC" "UTI" "B_STPHY" "Staphylococcus" 3 "NIT" "Nitrofurantoin" "Staphs" 64 64 TRUE -"EUCAST 2014" "DISK" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" "100ug" 15 15 TRUE -"EUCAST 2014" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" 64 64 TRUE +"EUCAST 2014" "DISK" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" "100ug" 15 15 TRUE +"EUCAST 2014" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "NIT" "Nitrofurantoin" "Strep A, B, C, G" 64 64 TRUE "EUCAST 2014" "DISK" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "NOR" "Norfloxacin" "Enterobacteriaceae" "10ug" 22 19 FALSE "EUCAST 2014" "MIC" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "NOR" "Norfloxacin" "Enterobacteriaceae" 0.5 1 FALSE "EUCAST 2014" "DISK" "Screen" "B_ENTRC" "Enterococcus" 3 "NOR" "Norfloxacin" "Enterococcus" "10ug" 12 12 FALSE @@ -7139,7 +7139,7 @@ "EUCAST 2014" "MIC" "UTI" "B_ENTRC" "Enterococcus" 3 "TMP" "Trimethoprim" "Enterococcus" 0.032 1 TRUE "EUCAST 2014" "DISK" "UTI" "B_STPHY" "Staphylococcus" 3 "TMP" "Trimethoprim" "Staphs" "5ug" 17 14 TRUE "EUCAST 2014" "MIC" "UTI" "B_STPHY" "Staphylococcus" 3 "TMP" "Trimethoprim" "Staphs" 2 4 TRUE -"EUCAST 2014" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "TMP" "Trimethoprim" "Strep A, B, C, G" 2 2 TRUE +"EUCAST 2014" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "TMP" "Trimethoprim" "Strep A, B, C, G" 2 2 TRUE "EUCAST 2014" "DISK" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "TOB" "Tobramycin" "Enterobacteriaceae" "10ug" 17 14 FALSE "EUCAST 2014" "MIC" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "TOB" "Tobramycin" "Enterobacteriaceae" 2 4 FALSE "EUCAST 2014" "DISK" "B_ACNTB" "Acinetobacter" 3 "TOB" "Tobramycin" "Acinetobacter spp." "10ug" 17 17 FALSE @@ -7607,8 +7607,8 @@ "EUCAST 2013" "MIC" "UTI" "B_ENTRC_FCLS" "Enterococcus faecalis" 2 "NIT" "Nitrofurantoin" "Enterococcus" 64 64 TRUE "EUCAST 2013" "DISK" "UTI" "B_STPHY_SPRP_SPRP" "Staphylococcus saprophyticus saprophyticus" 1 "NIT" "Nitrofurantoin" "Staphs" "100ug" 13 13 TRUE "EUCAST 2013" "MIC" "UTI" "B_STPHY_SPRP_SPRP" "Staphylococcus saprophyticus saprophyticus" 1 "NIT" "Nitrofurantoin" "Staphs" 64 64 TRUE -"EUCAST 2013" "DISK" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "NIT" "Nitrofurantoin" "Strept A,B,C,G" "100ug" 15 15 TRUE -"EUCAST 2013" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "NIT" "Nitrofurantoin" "Strept A,B,C,G" 64 64 TRUE +"EUCAST 2013" "DISK" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "NIT" "Nitrofurantoin" "Strept A,B,C,G" "100ug" 15 15 TRUE +"EUCAST 2013" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "NIT" "Nitrofurantoin" "Strept A,B,C,G" 64 64 TRUE "EUCAST 2013" "DISK" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "NOR" "Norfloxacin" "Enterobacteriaceae" "10ug" 22 19 FALSE "EUCAST 2013" "MIC" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "NOR" "Norfloxacin" "Enterobacteriaceae" 0.5 1 FALSE "EUCAST 2013" "DISK" "B_STPHY" "Staphylococcus" 3 "NOR" "Norfloxacin" "Staphs" "10ug" 17 17 FALSE @@ -7780,7 +7780,7 @@ "EUCAST 2013" "MIC" "UTI" "B_ENTRC" "Enterococcus" 3 "TMP" "Trimethoprim" "Enterococcus" 0.032 1 TRUE "EUCAST 2013" "DISK" "UTI" "B_STPHY" "Staphylococcus" 3 "TMP" "Trimethoprim" "Staphs" "5ug" 17 14 TRUE "EUCAST 2013" "MIC" "UTI" "B_STPHY" "Staphylococcus" 3 "TMP" "Trimethoprim" "Staphs" 2 4 TRUE -"EUCAST 2013" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus group B" 2 "TMP" "Trimethoprim" "Strept A,B,C,G" 2 2 TRUE +"EUCAST 2013" "MIC" "UTI" "B_STRPT_GRPB" "Streptococcus Group B" 2 "TMP" "Trimethoprim" "Strept A,B,C,G" 2 2 TRUE "EUCAST 2013" "DISK" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "TOB" "Tobramycin" "Enterobacteriaceae" "10ug" 17 14 FALSE "EUCAST 2013" "MIC" "B_[ORD]_ENTRBCTR" "Enterobacterales" 5 "TOB" "Tobramycin" "Enterobacteriaceae" 2 4 FALSE "EUCAST 2013" "DISK" "B_ACNTB" "Acinetobacter" 3 "TOB" "Tobramycin" "Acinetob" "10ug" 17 17 FALSE diff --git a/data-raw/rsi_translation.xlsx b/data-raw/rsi_translation.xlsx index a5673840..68c519bc 100644 Binary files a/data-raw/rsi_translation.xlsx and b/data-raw/rsi_translation.xlsx differ diff --git a/data-raw/salmonellae.R b/data-raw/salmonellae.R index 79310641..e8664fc3 100644 --- a/data-raw/salmonellae.R +++ b/data-raw/salmonellae.R @@ -1564,6 +1564,10 @@ salmonellae <- tibble( gbif_parent = 9701185 ) +salmonellae <- salmonellae %>% + # remove e.g. Salmonella Enteritidis if Salmonella enteritidis already existed + filter(!tolower(fullname) %in% tolower(AMR::microorganisms$fullname)) + groups <- c("Paratyphi A", "Paratyphi B", "Paratyphi C", diff --git a/data-raw/translations.tsv b/data-raw/translations.tsv index 3039c88c..acd97101 100644 --- a/data-raw/translations.tsv +++ b/data-raw/translations.tsv @@ -19,6 +19,7 @@ unknown species TRUE TRUE FALSE TRUE 未知种 ukendt art onbekende soort espèc unknown subspecies TRUE TRUE FALSE TRUE 未知亚种 ukendt underart onbekende ondersoort sous-espèce inconnue unbekannte Unterart άγνωστο υποείδος sottospecie sconosciute 亜種不明 nieznany podgatunek subespécies desconhecida неизвестный подвид subespecie desconocida okänd underart bilinmeyen alt türler невідомий підвид unknown rank TRUE TRUE FALSE TRUE 未知等级 ukendt rang onbekende rang rang inconnu unbekannter Rang άγνωστη τάξη grado sconosciuto 未知ランク nieznany stopień classificação desconhecido неизвестный ранг rango desconocido okänd rang bilinmeyen rütbe невідомий ранг group TRUE TRUE FALSE TRUE 组 gruppe groep groupe Gruppe ομάδα gruppo グループ grupa grupo группа grupo grupp Grup група + Group TRUE TRUE FALSE TRUE 组 Gruppe groep groupe Gruppe Ομάδα Gruppo グループ Grupa Grupo Группа Grupo Grupp Grup Група CoNS FALSE TRUE FALSE TRUE KNS CNS KNS CoNS グラム陰性 CoNS КОС SCN KNS KNS КНС CoPS FALSE TRUE FALSE TRUE KPS CPS KPS CoPS グラム陽性 CoPS КПС SCP KPS KPS КПС Gram-negative TRUE TRUE FALSE FALSE 革兰氏阴性 Gram-negativ Gram-negatief Gram négatif Gramnegativ Αρνητικό κατά Gram Gram negativo ^細菌$ Gram-ujemne Gram negativo Грамотрицательные Gram negativo Gram-negativ Gram-negatif Грамнегативні diff --git a/data/microorganisms.rda b/data/microorganisms.rda index fa7a578c..e7e3b844 100644 Binary files a/data/microorganisms.rda and b/data/microorganisms.rda differ diff --git a/inst/tinytest/test-mo.R b/inst/tinytest/test-mo.R index 8cd2e83f..0b0266ab 100644 --- a/inst/tinytest/test-mo.R +++ b/inst/tinytest/test-mo.R @@ -127,8 +127,8 @@ expect_identical(as.character(as.mo(" ")), NA_character_) expect_warning(as.mo("ab")) expect_equal( - suppressWarnings(as.character(as.mo(c("Qq species", "", "CRSM", "K. pneu rhino", "esco")))), - c("UNKNOWN", NA_character_, "B_STNTR_MLTP", "B_KLBSL_PNMN_RHNS", "B_ESCHR_COLI") + suppressWarnings(as.character(as.mo(c("Qq species", "", "MRSA", "K. pneu rhino", "esco")))), + c("UNKNOWN", NA_character_, "B_STPHY_AURS", "B_KLBSL_PNMN_RHNS", "B_ESCHR_COLI") ) # check for Becker classification diff --git a/inst/tinytest/test-mo_property.R b/inst/tinytest/test-mo_property.R index 4d9d36b8..fda8f3f9 100644 --- a/inst/tinytest/test-mo_property.R +++ b/inst/tinytest/test-mo_property.R @@ -68,6 +68,7 @@ current_grampos_classes <- c( "Erysipelotrichia", "Ktedonobacteria", "Limnochordia", + "Limnocylindria", "Mollicutes", "Negativicutes", "Nitriliruptoria", @@ -122,9 +123,9 @@ for (l in AMR:::LANGUAGES_SUPPORTED[-1]) { # test languages expect_error(mo_gramstain("Escherichia coli", language = "UNKNOWN")) -dutch <- suppressWarnings(mo_name(microorganisms$fullname[which(microorganisms$fullname %unlike% "unknown|coagulase|Fungi|[(]class[)]")], language = "nl", keep_synonyms = TRUE)) # should be transformable to English again +dutch <- suppressWarnings(mo_name(microorganisms$fullname[which(microorganisms$fullname %unlike% "unknown|coagulase|Fungi|[(]class[)]|[{]")], language = "nl", keep_synonyms = TRUE)) # should be transformable to English again expect_identical(suppressWarnings(mo_name(dutch, language = NULL, keep_synonyms = TRUE)), - microorganisms$fullname[which(microorganisms$fullname %unlike% "unknown|coagulase|Fungi|[(]class[)]")]) # gigantic test - will run ALL names + microorganisms$fullname[which(microorganisms$fullname %unlike% "unknown|coagulase|Fungi|[(]class[)]|[{]")]) # gigantic test - will run ALL names # manual property function expect_error(mo_property("Escherichia coli", property = c("genus", "fullname"))) diff --git a/man/microorganisms.Rd b/man/microorganisms.Rd index dc8e859f..913cda90 100755 --- a/man/microorganisms.Rd +++ b/man/microorganisms.Rd @@ -3,9 +3,9 @@ \docType{data} \name{microorganisms} \alias{microorganisms} -\title{Data Set with 52,144 Microorganisms} +\title{Data Set with 52,140 Microorganisms} \format{ -A \link[tibble:tibble]{tibble} with 52,144 observations and 22 variables: +A \link[tibble:tibble]{tibble} with 52,140 observations and 22 variables: \itemize{ \item \code{mo}\cr ID of microorganism as used by this package \item \code{fullname}\cr Full name, like \code{"Escherichia coli"}. For the taxonomic ranks genus, species and subspecies, this is the 'pasted' text of genus, species, and subspecies. For all taxonomic ranks higher than genus, this is the name of the taxon.