diff --git a/DESCRIPTION b/DESCRIPTION index 5fda4634..b3807d9e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: AMR -Version: 1.7.1.9024 -Date: 2021-08-17 +Version: 1.7.1.9025 +Date: 2021-08-18 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/NAMESPACE b/NAMESPACE index a49fd157..96757b27 100755 --- a/NAMESPACE +++ b/NAMESPACE @@ -290,7 +290,6 @@ export(mo_year) export(mrgn) export(n_rsi) export(oxazolidinones) -export(p_symbol) export(pca) export(penicillins) export(polymyxins) diff --git a/NEWS.md b/NEWS.md index 2e9c3d44..91aef881 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,8 +1,8 @@ -# `AMR` 1.7.1.9024 -## Last updated: 17 August 2021 +# `AMR` 1.7.1.9025 +## Last updated: 18 August 2021 ### Breaking changes -* Removed all `filter_*()` functions (except for `filter_first_isolate()`), which were all deprecated in a previous package version +* 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. @@ -18,10 +18,10 @@ * They now also work in R-3.0 and R-3.1, supporting every version of R since 2013 * 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 - ``` + ```r + example_isolates[, penicillins() & administrable_per_os()] # base R + example_isolates %>% select(penicillins() & administrable_per_os()) # dplyr + ``` * Fix for using selectors multiple times in one call (e.g., using them in `dplyr::filter()` and immediately after in `dplyr::select()`) * 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) * Fixed the Gram stain (`mo_gramstain()`) determination of the 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*. diff --git a/R/deprecated.R b/R/deprecated.R index b0df06fb..279e58c9 100755 --- a/R/deprecated.R +++ b/R/deprecated.R @@ -26,23 +26,9 @@ #' Deprecated Functions #' #' These functions are so-called '[Deprecated]'. **They will be removed in a future release.** Using the functions will give a warning with the name of the function it has been replaced by (if there is one). -#' @details All antibiotic class selectors (such as [carbapenems()], [aminoglycosides()]) can now be used for filtering as well, making all their accompanying `filter_*()` functions redundant (such as [filter_carbapenems()], [filter_aminoglycosides()]). #' @inheritSection lifecycle Retired Lifecycle #' @inheritSection AMR Read more on Our Website! #' @keywords internal #' @name AMR-deprecated -#' @export -p_symbol <- function(p, emptychar = " ") { - .Deprecated(package = "AMR", new = "cleaner::p_symbol") - - p <- as.double(p) - s <- rep(NA_character_, length(p)) - - s[p <= 1] <- emptychar - s[p <= 0.100] <- "." - s[p <= 0.050] <- "*" - s[p <= 0.010] <- "**" - s[p <= 0.001] <- "***" - - s -} +# @export +NULL diff --git a/_pkgdown.yml b/_pkgdown.yml index 50635b60..f02e7e91 100644 --- a/_pkgdown.yml +++ b/_pkgdown.yml @@ -89,32 +89,11 @@ navbar: - text: "Source Code" icon: "fab fa-github" href: "https://github.com/msberends/AMR" - - text: "Survey" - icon: "fa-clipboard-list" - href: "survey.html" + # - text: "Survey" + # icon: "fa-clipboard-list" + # href: "survey.html" reference: - - title: "Background information on included data" - desc: > - Some pages about our package and its external sources. Be sure to read our [How To's](./../articles/index.html) - for more information about how to work with functions in this package. - contents: - - "`AMR`" - - "`example_isolates`" - - "`microorganisms`" - - "`microorganisms.codes`" - - "`microorganisms.old`" - - "`antibiotics`" - - "`intrinsic_resistant`" - - "`dosage`" - - "`catalogue_of_life`" - - "`catalogue_of_life_version`" - - "`WHOCC`" - - "`lifecycle`" - - "`example_isolates_unclean`" - - "`rsi_translation`" - - "`WHONET`" - - title: "Preparing data: microorganisms" desc: > These functions are meant to get taxonomically valid properties of microorganisms from any input. @@ -165,6 +144,27 @@ reference: - "`antibiotic_class_selectors`" - "`resistance_predict`" - "`guess_ab_col`" + + - title: "Background information on included data" + desc: > + Some pages about our package and its external sources. Be sure to read our [How To's](./../articles/index.html) + for more information about how to work with functions in this package. + contents: + - "`AMR`" + - "`example_isolates`" + - "`microorganisms`" + - "`microorganisms.codes`" + - "`microorganisms.old`" + - "`antibiotics`" + - "`intrinsic_resistant`" + - "`dosage`" + - "`catalogue_of_life`" + - "`catalogue_of_life_version`" + - "`WHOCC`" + - "`lifecycle`" + - "`example_isolates_unclean`" + - "`rsi_translation`" + - "`WHONET`" - title: "Other: miscellaneous functions" desc: > @@ -215,6 +215,7 @@ authors: href: https://www.rug.nl/staff/c.glasner/ template: + bootstrap: 3 opengraph: twitter: creator: "@msberends" diff --git a/data-raw/AMR_latest.tar.gz b/data-raw/AMR_latest.tar.gz index 1e0d794f..c94a8662 100644 Binary files a/data-raw/AMR_latest.tar.gz and b/data-raw/AMR_latest.tar.gz differ diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index 0b1f76a0..1140365c 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -92,7 +92,7 @@ AMR (for R) - 1.7.1.9024 + 1.7.1.9025 @@ -222,13 +222,6 @@ Source Code - -
  • - - - - Survey -
  • diff --git a/docs/articles/datasets.html b/docs/articles/datasets.html index 26ed53e4..8105c37c 100644 --- a/docs/articles/datasets.html +++ b/docs/articles/datasets.html @@ -44,7 +44,7 @@ AMR (for R) - 1.7.1.9024 + 1.7.1.9025 @@ -174,13 +174,6 @@ Source Code - -
  • - - - - Survey -
  • @@ -197,7 +190,7 @@ @@ -222,13 +222,6 @@ Source Code - -
  • - - - - Survey -
  • diff --git a/docs/index.html b/docs/index.html index a7bef7c5..e6c741ea 100644 --- a/docs/index.html +++ b/docs/index.html @@ -47,7 +47,7 @@ AMR (for R) - 1.7.1.9024 + 1.7.1.9025 @@ -177,13 +177,6 @@ Source Code - -
  • - - - - Survey -
  • diff --git a/docs/news/index.html b/docs/news/index.html index 778526fd..87d47a47 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -92,7 +92,7 @@ AMR (for R) - 1.7.1.9024 + 1.7.1.9025 @@ -222,13 +222,6 @@ Source Code - -
  • - - - - Survey -
  • @@ -247,17 +240,17 @@ Source: NEWS.md -
    -

    - Unreleased AMR 1.7.1.9024

    -
    +
    +

    + Unreleased AMR 1.7.1.9025

    +

    -Last updated: 17 August 2021 +Last updated: 18 August 2021

    Breaking changes

    -
    • Removed all filter_*() functions (except for filter_first_isolate()), which were all deprecated in a previous package version
    • +
      • 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 <mic>, <disk>, <rsi> and <resistance_predict> as they did not follow the ggplot2 logic. They were replaced with ggplot2::autoplot() generics.
      • @@ -278,16 +271,17 @@ ab_atc() does not always return a character vector with length 1, and returns a list if the input is larger than length 1
    • Antibiotic selectors -
      +
      • They now also work in R-3.0 and R-3.1, supporting every version of R since 2013

      • +
      • 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):

        +
         
         example_isolates[, penicillins() & administrable_per_os()]          # base R
         example_isolates %>% select(penicillins() & administrable_per_os()) # dplyr
        -
        • Fix for using selectors multiple times in one call (e.g., using them in dplyr::filter() and immediately after in dplyr::select())
        • -
        • 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())

        • +
        • 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)

      • Fixed the Gram stain (mo_gramstain()) determination of the 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.
      • Fix for duplicate ATC codes in the antibiotics data set
      • @@ -355,7 +349,7 @@
      • The documentation of the first_isolate() and key_antimicrobials() functions has been completely rewritten.
    • Function betalactams() as additional antbiotic column selector and function filter_betalactams() as additional antbiotic column filter. The group of betalactams consists of all carbapenems, cephalosporins and penicillins.
    • -
    • A ggplot() method for resistance_predict() +
    • A ggplot() method for resistance_predict()
    @@ -442,7 +436,7 @@ #> Filtering on oxazolidinones: value in column `LNZ` (linezolid) is either "R", "S" or "I"
  • Support for custom MDRO guidelines, using the new custom_mdro_guideline() function, please see mdro() for additional info

  • -
  • ggplot() generics for classes <mic> and <disk>

  • +
  • ggplot() generics for classes <mic> and <disk>

  • Function mo_is_yeast(), which determines whether a microorganism is a member of the taxonomic class Saccharomycetes or the taxonomic order Saccharomycetales:

    @@ -494,7 +488,7 @@
     
    • Plotting of MIC and disk diffusion values now support interpretation colouring if you supply the microorganism and antimicrobial agent
    • All colours were updated to colour-blind friendly versions for values R, S and I for all plot methods (also applies to tibble printing)
    • Interpretation of MIC and disk diffusion values to R/SI will now be translated if the system language is German, Dutch or Spanish (see translate)
    • -
    • Plotting is now possible with base R using plot() and with ggplot2 using ggplot() on any vector of MIC and disk diffusion values
    • +
    • Plotting is now possible with base R using plot() and with ggplot2 using ggplot() on any vector of MIC and disk diffusion values
  • Updated SNOMED codes to US Edition of SNOMED CT from 1 September 2020 and added the source to the help page of the microorganisms data set
  • @@ -510,7 +504,7 @@ is.rsi.eligible() now detects if the column name resembles an antibiotic name or code and now returns TRUE immediately if the input contains any of the values “R”, “S” or “I”. This drastically improves speed, also for a lot of other functions that rely on automatic determination of antibiotic columns.
  • Functions get_episode() and is_new_episode() now support less than a day as value for argument episode_days (e.g., to include one patient/test per hour)
  • Argument ampc_cephalosporin_resistance in eucast_rules() now also applies to value “I” (not only “S”)
  • -
  • Functions print() and summary() on a Principal Components Analysis object (pca()) now print additional group info if the original data was grouped using dplyr::group_by() +
  • Functions print() and summary() on a Principal Components Analysis object (pca()) now print additional group info if the original data was grouped using dplyr::group_by()
  • Improved speed and reliability of guess_ab_col(). As this also internally improves the reliability of first_isolate() and mdro(), this might have a slight impact on the results of those functions.
  • Fix for mo_name() when used in other languages than English
  • @@ -606,7 +600,7 @@
  • For all function arguments in the code, it is now defined what the exact type of user input should be (inspired by the typed package). If the user input for a certain function does not meet the requirements for a specific argument (such as the class or length), an informative error will be thrown. This makes the package more robust and the use of it more reproducible and reliable. In total, more than 420 arguments were defined.

  • Fix for set_mo_source(), that previously would not remember the file location of the original file

  • -
  • Deprecated function p_symbol() that not really fits the scope of this package. It will be removed in a future version. See here for the source code to preserve it.

  • +
  • Deprecated function p_symbol() that not really fits the scope of this package. It will be removed in a future version. See here for the source code to preserve it.

  • Updated coagulase-negative staphylococci determination with Becker et al. 2020 (PMID 32056452), meaning that the species S. argensis, S. caeli, S. debuckii, S. edaphicus and S. pseudoxylosus are now all considered CoNS

  • Fix for using argument reference_df in as.mo() and mo_*() functions that contain old microbial codes (from previous package versions)

  • Fixed a bug where mo_uncertainties() would not return the results based on the MO matching score

  • @@ -804,7 +798,7 @@

    Removed code dependency on all other R packages, making this package fully independent of the development process of others. This is a major code change, but will probably not be noticeable by most users.

    Making this package independent of especially the tidyverse (e.g. packages dplyr and tidyr) tremendously increases sustainability on the long term, since tidyverse functions change quite often. Good for users, but hard for package maintainers. Most of our functions are replaced with versions that only rely on base R, which keeps this package fully functional for many years to come, without requiring a lot of maintenance to keep up with other packages anymore. Another upside it that this package can now be used with all versions of R since R-3.0.0 (April 2013). Our package is being used in settings where the resources are very limited. Fewer dependencies on newer software is helpful for such settings.

    Negative effects of this change are:

    -
    • Function freq() that was borrowed from the cleaner package was removed. Use cleaner::freq(), or run library("cleaner") before you use freq().
    • +
      • Function freq() that was borrowed from the cleaner package was removed. Use cleaner::freq(), or run library("cleaner") before you use freq().
      • Printing values of class mo or rsi in a tibble will no longer be in colour and printing rsi in a tibble will show the class <ord>, not <rsi> anymore. This is purely a visual effect.
      • All functions from the mo_* family (like mo_name() and mo_gramstain()) are noticeably slower when running on hundreds of thousands of rows.
      • For developers: classes mo and ab now both also inherit class character, to support any data transformation. This change invalidates code that checks for class length == 1.
      • @@ -839,7 +833,7 @@ This works for all drug combinations, such as ampicillin/sulbactam, ceftazidime/

        Other

        -
        • Removed previously deprecated function p.symbol() - it was replaced with p_symbol() +
          • Removed previously deprecated function p.symbol() - it was replaced with p_symbol()
          • Removed function read.4d(), that was only useful for reading data from an old test database.
        @@ -1086,7 +1080,7 @@ This works for all drug combinations, such as ampicillin/sulbactam, ceftazidime/ #> invalid microorganism code, NA generated

    This is important, because a value like "testvalue" could never be understood by e.g. mo_name(), although the class would suggest a valid microbial code.

    -
  • Function freq() has moved to a new package, clean (CRAN link), since creating frequency tables actually does not fit the scope of this package. The freq() function still works, since it is re-exported from the clean package (which will be installed automatically upon updating this AMR package).

  • +
  • Function freq() has moved to a new package, clean (CRAN link), since creating frequency tables actually does not fit the scope of this package. The freq() function still works, since it is re-exported from the clean package (which will be installed automatically upon updating this AMR package).

  • Renamed data set septic_patients to example_isolates

  • @@ -1193,7 +1187,7 @@ This works for all drug combinations, such as ampicillin/sulbactam, ceftazidime/
  • Improved filter_ab_class() to be more reliable and to support 5th generation cephalosporins
  • Function availability() now uses portion_R() instead of portion_IR(), to comply with EUCAST insights
  • Functions age() and age_groups() now have a na.rm argument to remove empty values
  • -
  • Renamed function p.symbol() to p_symbol() (the former is now deprecated and will be removed in a future version)
  • +
  • Renamed function p.symbol() to p_symbol() (the former is now deprecated and will be removed in a future version)
  • Using negative values for x in age_groups() will now introduce NAs and not return an error anymore
  • Fix for determining the system’s language
  • Fix for key_antibiotics() on foreign systems
  • @@ -1325,7 +1319,7 @@ This works for all drug combinations, such as ampicillin/sulbactam, ceftazidime/
  • The age() function gained a new argument exact to determine ages with decimals
  • Removed deprecated functions guess_mo(), guess_atc(), EUCAST_rules(), interpretive_reading(), rsi()
  • -
  • Frequency tables (freq()): +
  • Frequency tables (freq()):
    • speed improvement for microbial IDs

    • fixed factor level names for R Markdown

    • when all values are unique it now shows a message instead of a warning

    • @@ -1334,12 +1328,12 @@ This works for all drug combinations, such as ampicillin/sulbactam, ceftazidime/
       
       septic_patients %>% 
      -  freq(age) %>% 
      +  freq(age) %>% 
         boxplot()
       # grouped boxplots:
       septic_patients %>% 
         group_by(hospital_id) %>% 
      -  freq(age) %>%
      +  freq(age) %>%
         boxplot()
  • @@ -1348,7 +1342,7 @@ This works for all drug combinations, such as ampicillin/sulbactam, ceftazidime/
  • Added ceftazidim intrinsic resistance to Streptococci
  • Changed default settings for age_groups(), to let groups of fives and tens end with 100+ instead of 120+
  • -
  • Fix for freq() for when all values are NA +
  • Fix for freq() for when all values are NA
  • Fix for first_isolate() for when dates are missing
  • Improved speed of guess_ab_col() @@ -1565,7 +1559,7 @@ This works for all drug combinations, such as ampicillin/sulbactam, ceftazidime/
  • Now accepts high and low resistance: "HIGH S" will return S
  • -
  • Frequency tables (freq() function): +
  • Frequency tables (freq() function):
    • Support for tidyverse quasiquotation! Now you can create frequency tables of function outcomes:

      @@ -1574,15 +1568,15 @@ This works for all drug combinations, such as ampicillin/sulbactam, ceftazidime/
       # OLD WAY
       septic_patients %>%
         mutate(genus = mo_genus(mo)) %>%
      -  freq(genus)
      +  freq(genus)
       # NEW WAY
       septic_patients %>% 
      -  freq(mo_genus(mo))
      +  freq(mo_genus(mo))
       
       # Even supports grouping variables:
       septic_patients %>%
         group_by(gender) %>% 
      -  freq(mo_genus(mo))
      + freq(mo_genus(mo))
  • Header info is now available as a list, with the header function

  • The argument header is now set to TRUE at default, even for markdown

  • @@ -1655,21 +1649,21 @@ This works for all drug combinations, such as ampicillin/sulbactam, ceftazidime/
  • Using portion_* functions now throws a warning when total available isolate is below argument minimum

  • Functions as.mo, as.rsi, as.mic, as.atc and freq will not set package name as attribute anymore

  • -

    Frequency tables - freq():

    +

    Frequency tables - freq():

    • Support for grouping variables, test with:

       
       septic_patients %>% 
         group_by(hospital_id) %>% 
      -  freq(gender)
      + freq(gender)
  • Support for (un)selecting columns:

     
     septic_patients %>% 
    -  freq(hospital_id) %>% 
    +  freq(hospital_id) %>% 
       select(-count, -cum_count) # only get item, percent, cum_percent
  • Check for hms::is.hms

  • @@ -1686,7 +1680,7 @@ This works for all drug combinations, such as ampicillin/sulbactam, ceftazidime/
  • Removed diacritics from all authors (columns microorganisms$ref and microorganisms.old$ref) to comply with CRAN policy to only allow ASCII characters

  • Fix for mo_property not working properly

  • Fix for eucast_rules where some Streptococci would become ceftazidime R in EUCAST rule 4.5

  • -
  • Support for named vectors of class mo, useful for top_freq()

  • +
  • Support for named vectors of class mo, useful for top_freq()

  • ggplot_rsi and scale_y_percent have breaks argument

  • AI improvements for as.mo:

    @@ -1839,13 +1833,13 @@ This works for all drug combinations, such as ampicillin/sulbactam, ceftazidime/
     
     my_matrix = with(septic_patients, matrix(c(age, gender), ncol = 2))
    -freq(my_matrix)
    +freq(my_matrix)
  • For lists, subsetting is possible:

     
     my_list = list(age = septic_patients$age, gender = septic_patients$gender)
    -my_list %>% freq(age)
    -my_list %>% freq(gender)
    +my_list %>% freq(age) +my_list %>% freq(gender)
    @@ -1901,13 +1895,13 @@ This works for all drug combinations, such as ampicillin/sulbactam, ceftazidime/
  • New for frequency tables (function freq):
    • A vignette to explain its usage
    • Support for rsi (antimicrobial resistance) to use as input
    • -
    • Support for table to use as input: freq(table(x, y)) +
    • Support for table to use as input: freq(table(x, y))
    • Support for existing functions hist and plot to use a frequency table as input: hist(freq(df$age))
    • Support for as.vector, as.data.frame, as_tibble and format
    • -
    • Support for quasiquotation: freq(mydata, mycolumn) is the same as mydata %>% freq(mycolumn) +
    • Support for quasiquotation: freq(mydata, mycolumn) is the same as mydata %>% freq(mycolumn)
    • Function top_freq function to return the top/below n items as vector
    • Header of frequency tables now also show Mean Absolute Deviaton (MAD) and Interquartile Range (IQR)
    • diff --git a/docs/reference/AMR-deprecated.html b/docs/reference/AMR-deprecated.html index 15946113..550ae707 100644 --- a/docs/reference/AMR-deprecated.html +++ b/docs/reference/AMR-deprecated.html @@ -93,7 +93,7 @@ AMR (for R) - 1.7.1.9024 + 1.7.1.9025
  • @@ -223,13 +223,6 @@ Source Code - -
  • - - - - Survey -
  • @@ -253,12 +246,8 @@

    These functions are so-called 'Deprecated'. They will be removed in a future release. Using the functions will give a warning with the name of the function it has been replaced by (if there is one).

    -
    p_symbol(p, emptychar = " ")
    -

    Details

    - -

    All antibiotic class selectors (such as carbapenems(), aminoglycosides()) can now be used for filtering as well, making all their accompanying filter_*() functions redundant (such as filter_carbapenems(), filter_aminoglycosides()).

    Retired Lifecycle

    diff --git a/docs/reference/index.html b/docs/reference/index.html index 3b7c5f68..4795b729 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -92,7 +92,7 @@ AMR (for R) - 1.7.1.9024 + 1.7.1.9025 @@ -222,13 +222,6 @@ Source Code - -
  • - - - - Survey -
  • @@ -255,109 +248,6 @@ - - -

    Background information on included data

    -

    Some pages about our package and its external sources. Be sure to read our How To’s for more information about how to work with functions in this package.

    - - - - - - - - - - -

    AMR

    - -

    The AMR Package

    - - - -

    example_isolates

    - -

    Data Set with 2,000 Example Isolates

    - - - -

    microorganisms

    - -

    Data Set with 70,026 Microorganisms

    - - - -

    microorganisms.codes

    - -

    Data Set with 5,605 Common Microorganism Codes

    - - - -

    microorganisms.old

    - -

    Data Set with Previously Accepted Taxonomic Names

    - - - -

    antibiotics antivirals

    - -

    Data Sets with 558 Antimicrobials

    - - - -

    intrinsic_resistant

    - -

    Data Set with Bacterial Intrinsic Resistance

    - - - -

    dosage

    - -

    Data Set with Treatment Dosages as Defined by EUCAST

    - - - -

    catalogue_of_life

    - -

    The Catalogue of Life

    - - - -

    catalogue_of_life_version()

    - -

    Version info of included Catalogue of Life

    - - - -

    WHOCC

    - -

    WHOCC: WHO Collaborating Centre for Drug Statistics Methodology

    - - - -

    lifecycle

    - -

    Lifecycles of Functions in the AMR Package

    - - - -

    example_isolates_unclean

    - -

    Data Set with Unclean Data

    - - - -

    rsi_translation

    - -

    Data Set for R/SI Interpretation

    - - - -

    WHONET

    - -

    Data Set with 500 Isolates - WHONET Example

    - -

    Preparing data: microorganisms

    @@ -553,6 +443,109 @@

    Guess Antibiotic Column

    + + + +

    Background information on included data

    +

    Some pages about our package and its external sources. Be sure to read our How To’s for more information about how to work with functions in this package.

    + + + + + + + + + + +

    AMR

    + +

    The AMR Package

    + + + +

    example_isolates

    + +

    Data Set with 2,000 Example Isolates

    + + + +

    microorganisms

    + +

    Data Set with 70,026 Microorganisms

    + + + +

    microorganisms.codes

    + +

    Data Set with 5,605 Common Microorganism Codes

    + + + +

    microorganisms.old

    + +

    Data Set with Previously Accepted Taxonomic Names

    + + + +

    antibiotics antivirals

    + +

    Data Sets with 558 Antimicrobials

    + + + +

    intrinsic_resistant

    + +

    Data Set with Bacterial Intrinsic Resistance

    + + + +

    dosage

    + +

    Data Set with Treatment Dosages as Defined by EUCAST

    + + + +

    catalogue_of_life

    + +

    The Catalogue of Life

    + + + +

    catalogue_of_life_version()

    + +

    Version info of included Catalogue of Life

    + + + +

    WHOCC

    + +

    WHOCC: WHO Collaborating Centre for Drug Statistics Methodology

    + + + +

    lifecycle

    + +

    Lifecycles of Functions in the AMR Package

    + + + +

    example_isolates_unclean

    + +

    Data Set with Unclean Data

    + + + +

    rsi_translation

    + +

    Data Set for R/SI Interpretation

    + + + +

    WHONET

    + +

    Data Set with 500 Isolates - WHONET Example

    + @@ -678,7 +671,7 @@ -

    p_symbol()

    +

    AMR-deprecated

    Deprecated Functions

    diff --git a/docs/survey.html b/docs/survey.html index dce08d23..8949a79a 100644 --- a/docs/survey.html +++ b/docs/survey.html @@ -92,7 +92,7 @@ AMR (for R) - 1.7.1.9024 + 1.7.1.9025 @@ -222,13 +222,6 @@ Source Code - -
  • - - - - Survey -
  • diff --git a/git_premaster.sh b/git_premaster.sh index 0a808dbe..48b645a7 100755 --- a/git_premaster.sh +++ b/git_premaster.sh @@ -138,7 +138,7 @@ echo echo "•••••••••••••••••" echo "• Building site •" echo "•••••••••••••••••" -if $lazy == "FALSE"; then +if [ $lazy == "FALSE" ]; then Rscript -e "devtools::install(quiet = TRUE, dependencies = FALSE)" Rscript -e "suppressMessages(pkgdown::build_site(lazy = FALSE, examples = FALSE, install = FALSE))" else @@ -152,7 +152,7 @@ else fi if ! git diff --quiet NEWS.md; then # news has changed - Rscript -e "pkgdown::build_home()" + Rscript -e "pkgdown::build_news()" fi if ! git diff --quiet pkgdown; then # something has changed in pkgdown files diff --git a/inst/tinytest/test-_deprecated.R b/inst/tinytest/test-_deprecated.R index 32cc734f..7b1e3c65 100644 --- a/inst/tinytest/test-_deprecated.R +++ b/inst/tinytest/test-_deprecated.R @@ -23,34 +23,3 @@ # how to conduct AMR data analysis: https://msberends.github.io/AMR/ # # ==================================================================== # -expect_identical(suppressWarnings(p_symbol(c(0.001, 0.01, 0.05, 0.1, 1, NA, 3))), - c("***", "**", "*", ".", " ", NA, NA)) - -expect_warning(key_antibiotics(example_isolates)) -expect_identical(suppressWarnings(key_antibiotics(example_isolates)), - key_antimicrobials(example_isolates, antifungal = NULL)) - -expect_warning(key_antibiotics_equal("S", "S")) -expect_identical(suppressWarnings(key_antibiotics_equal("S", "S")), - antimicrobials_equal("S", "S", type = "keyantimicrobials")) - -expect_warning(filter_first_weighted_isolate(example_isolates)) -expect_identical(suppressWarnings(filter_first_weighted_isolate(example_isolates)), - filter_first_isolate(example_isolates)) - -expect_warning(filter_ab_class(example_isolates, "mycobact")) -expect_warning(filter_aminoglycosides(example_isolates)) -expect_warning(filter_betalactams(example_isolates)) -expect_warning(filter_carbapenems(example_isolates)) -expect_warning(filter_cephalosporins(example_isolates)) -expect_warning(filter_1st_cephalosporins(example_isolates)) -expect_warning(filter_2nd_cephalosporins(example_isolates)) -expect_warning(filter_3rd_cephalosporins(example_isolates)) -expect_warning(filter_4th_cephalosporins(example_isolates)) -expect_warning(filter_5th_cephalosporins(example_isolates)) -expect_warning(filter_fluoroquinolones(example_isolates)) -expect_warning(filter_glycopeptides(example_isolates)) -expect_warning(filter_macrolides(example_isolates)) -expect_warning(filter_oxazolidinones(example_isolates)) -expect_warning(filter_penicillins(example_isolates)) -expect_warning(filter_tetracyclines(example_isolates)) diff --git a/man/AMR-deprecated.Rd b/man/AMR-deprecated.Rd index 219592c0..bf88277f 100644 --- a/man/AMR-deprecated.Rd +++ b/man/AMR-deprecated.Rd @@ -2,17 +2,10 @@ % Please edit documentation in R/deprecated.R \name{AMR-deprecated} \alias{AMR-deprecated} -\alias{p_symbol} \title{Deprecated Functions} -\usage{ -p_symbol(p, emptychar = " ") -} \description{ These functions are so-called '\link{Deprecated}'. \strong{They will be removed in a future release.} Using the functions will give a warning with the name of the function it has been replaced by (if there is one). } -\details{ -All antibiotic class selectors (such as \code{\link[=carbapenems]{carbapenems()}}, \code{\link[=aminoglycosides]{aminoglycosides()}}) can now be used for filtering as well, making all their accompanying \verb{filter_*()} functions redundant (such as \code{\link[=filter_carbapenems]{filter_carbapenems()}}, \code{\link[=filter_aminoglycosides]{filter_aminoglycosides()}}). -} \section{Retired Lifecycle}{ \if{html}{\figure{lifecycle_retired.svg}{options: style=margin-bottom:5px} \cr}