diff --git a/DESCRIPTION b/DESCRIPTION index 4286641f..8d0fed2d 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 0.9.0.9021 +Version: 0.9.0.9022 Date: 2020-02-10 Title: Antimicrobial Resistance Analysis Authors@R: c( diff --git a/NEWS.md b/NEWS.md index 7875dfcc..0d0e12f3 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 0.9.0.9021 +# AMR 0.9.0.9022 ## Last updated: 10-Feb-2020 ### New diff --git a/R/disk.R b/R/disk.R index db6dfd5d..d27cda64 100644 --- a/R/disk.R +++ b/R/disk.R @@ -81,7 +81,7 @@ as.disk <- function(x, na.rm = FALSE) { #' @export #' @importFrom dplyr %>% is.disk <- function(x) { - inherits(x, c("disk", "integer")) + inherits(x, "disk") } #' @exportMethod print.disk diff --git a/R/mic.R b/R/mic.R index f2aacc82..78a33853 100755 --- a/R/mic.R +++ b/R/mic.R @@ -130,7 +130,7 @@ as.mic <- function(x, na.rm = FALSE) { #' @export #' @importFrom dplyr %>% is.mic <- function(x) { - inherits(x, c("mic", "factor")) + inherits(x, "mic") } #' @exportMethod as.double.mic diff --git a/R/rsi.R b/R/rsi.R index d3b377c7..99ecfc0c 100755 --- a/R/rsi.R +++ b/R/rsi.R @@ -346,7 +346,7 @@ as.rsi.data.frame <- function(x, col_mo = NULL, guideline = "EUCAST", ...) { #' @rdname as.rsi #' @export is.rsi <- function(x) { - inherits(x, c("rsi", "factor")) + inherits(x, "rsi") } #' @rdname as.rsi diff --git a/data-raw/v_10.0_Breakpoint_Tables.xlsx b/data-raw/v_10.0_Breakpoint_Tables.xlsx new file mode 100644 index 00000000..3a2ae35e Binary files /dev/null and b/data-raw/v_10.0_Breakpoint_Tables.xlsx differ diff --git a/docs/404.html b/docs/404.html index 6d127bbc..226fc5ab 100644 --- a/docs/404.html +++ b/docs/404.html @@ -84,7 +84,7 @@ AMR (for R) - 0.9.0.9021 + 0.9.0.9022 diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index 27b2720b..5142d53b 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -84,7 +84,7 @@ AMR (for R) - 0.9.0.9021 + 0.9.0.9022 diff --git a/docs/articles/index.html b/docs/articles/index.html index 326df2ec..01581cb3 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -84,7 +84,7 @@ AMR (for R) - 0.9.0.9021 + 0.9.0.9022 diff --git a/docs/authors.html b/docs/authors.html index 91c14c70..a51e5b1f 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -84,7 +84,7 @@ AMR (for R) - 0.9.0.9021 + 0.9.0.9022 diff --git a/docs/index.html b/docs/index.html index bbf424f8..07524c09 100644 --- a/docs/index.html +++ b/docs/index.html @@ -45,7 +45,7 @@ AMR (for R) - 0.9.0.9021 + 0.9.0.9022 diff --git a/docs/news/index.html b/docs/news/index.html index dc9f9400..ffc0f023 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -84,7 +84,7 @@ AMR (for R) - 0.9.0.9021 + 0.9.0.9022 @@ -231,9 +231,9 @@ -
+

-AMR 0.9.0.9021 Unreleased +AMR 0.9.0.9022 Unreleased

@@ -1467,7 +1467,7 @@ Using as.mo(..., allow_uncertain = 3)

Contents

    -
  • 0.9.0.9021
    • +
  • 0.9.0.9022
  • 0.9.0
  • 0.8.0
  • 0.7.1
    • diff --git a/docs/reference/index.html b/docs/reference/index.html index ec8b6192..b9aa66b4 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -84,7 +84,7 @@ AMR (for R) - 0.9.0.9021 + 0.9.0.9022