From a8c6b8f9c4f453ad09ab31a9d56b7a64391d9100 Mon Sep 17 00:00:00 2001 From: "Matthijs S. Berends" Date: Mon, 23 Sep 2019 14:37:24 +0200 Subject: [PATCH] (v0.7.1.9082) CI fix --- DESCRIPTION | 2 +- NEWS.md | 2 +- R/bug_drug_combinations.R | 3 ++- docs/LICENSE-text.html | 2 +- docs/articles/index.html | 2 +- docs/authors.html | 2 +- docs/index.html | 2 +- docs/news/index.html | 8 ++++---- docs/reference/bug_drug_combinations.html | 4 ++-- docs/reference/index.html | 2 +- man/bug_drug_combinations.Rd | 2 +- 11 files changed, 16 insertions(+), 15 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 0d45b61e..57e2b555 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 0.7.1.9081 +Version: 0.7.1.9082 Date: 2019-09-23 Title: Antimicrobial Resistance Analysis Authors@R: c( diff --git a/NEWS.md b/NEWS.md index a6c4e532..6d3ae78d 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 0.7.1.9081 +# AMR 0.7.1.9082 Last updated: 23-Sep-2019 ### Breaking diff --git a/R/bug_drug_combinations.R b/R/bug_drug_combinations.R index b51a8aad..e2addec3 100644 --- a/R/bug_drug_combinations.R +++ b/R/bug_drug_combinations.R @@ -97,7 +97,8 @@ format.bug_drug_combinations <- function(x, combine_IR = FALSE, add_ab_group = TRUE, decimal.mark = getOption("OutDec"), - big.mark = ifelse(decimal.mark == ",", ".", ",")) { + big.mark = ifelse(decimal.mark == ",", ".", ","), + ...) { if (combine_IR == FALSE) { x$isolates <- x$R } else { diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index 99f1528c..3340a2d0 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -78,7 +78,7 @@ AMR (for R) - 0.7.1.9081 + 0.7.1.9082 diff --git a/docs/articles/index.html b/docs/articles/index.html index a6c75f94..868d380a 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -78,7 +78,7 @@ AMR (for R) - 0.7.1.9081 + 0.7.1.9082 diff --git a/docs/authors.html b/docs/authors.html index c72ae19a..367c8f97 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -78,7 +78,7 @@ AMR (for R) - 0.7.1.9081 + 0.7.1.9082 diff --git a/docs/index.html b/docs/index.html index 9c72d037..e8035c6c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -42,7 +42,7 @@ AMR (for R) - 0.7.1.9081 + 0.7.1.9082 diff --git a/docs/news/index.html b/docs/news/index.html index d5f0376f..488caf83 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -78,7 +78,7 @@ AMR (for R) - 0.7.1.9081 + 0.7.1.9082 @@ -225,9 +225,9 @@ -
+

-AMR 0.7.1.9081 Unreleased +AMR 0.7.1.9082 Unreleased

Last updated: 23-Sep-2019

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

Contents

    -
  • 0.7.1.9081
    • +
  • 0.7.1.9082
  • 0.7.1
  • 0.7.0
  • 0.6.1
    • diff --git a/docs/reference/bug_drug_combinations.html b/docs/reference/bug_drug_combinations.html index 13f99a86..76b2cb7a 100644 --- a/docs/reference/bug_drug_combinations.html +++ b/docs/reference/bug_drug_combinations.html @@ -80,7 +80,7 @@ AMR (for R) - 0.7.1.9081 + 0.7.1.9082
@@ -240,7 +240,7 @@ # S3 method for bug_drug_combinations format(x, combine_IR = FALSE, add_ab_group = TRUE, decimal.mark = getOption("OutDec"), - big.mark = ifelse(decimal.mark == ",", ".", ",")) + big.mark = ifelse(decimal.mark == ",", ".", ","), ...)

Arguments

diff --git a/docs/reference/index.html b/docs/reference/index.html index cd2a778f..e7f81832 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -78,7 +78,7 @@ AMR (for R) - 0.7.1.9081 + 0.7.1.9082 diff --git a/man/bug_drug_combinations.Rd b/man/bug_drug_combinations.Rd index 7505a94c..b4117d91 100644 --- a/man/bug_drug_combinations.Rd +++ b/man/bug_drug_combinations.Rd @@ -13,7 +13,7 @@ bug_drug_combinations(x, col_mo = NULL, minimum = 30, \method{format}{bug_drug_combinations}(x, combine_IR = FALSE, add_ab_group = TRUE, decimal.mark = getOption("OutDec"), - big.mark = ifelse(decimal.mark == ",", ".", ",")) + big.mark = ifelse(decimal.mark == ",", ".", ","), ...) } \arguments{ \item{x}{data with antibiotic columns, like e.g. \code{AMX} and \code{AMC}}