From 04cd0d25db4bb9b80ea5cf9f35f2f356c835595e Mon Sep 17 00:00:00 2001 From: "Matthijs S. Berends" Date: Mon, 23 Sep 2019 23:09:50 +0200 Subject: [PATCH] (v0.7.1.9087) small fix --- DESCRIPTION | 2 +- NEWS.md | 2 +- R/mo_history.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/index.html | 2 +- 9 files changed, 13 insertions(+), 12 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 878c2126..6fc68885 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 0.7.1.9086 +Version: 0.7.1.9087 Date: 2019-09-23 Title: Antimicrobial Resistance Analysis Authors@R: c( diff --git a/NEWS.md b/NEWS.md index 8652c6c4..7405bd0e 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 0.7.1.9086 +# AMR 0.7.1.9087 Last updated: 23-Sep-2019 ### Breaking diff --git a/R/mo_history.R b/R/mo_history.R index 99c6ca93..57f671db 100644 --- a/R/mo_history.R +++ b/R/mo_history.R @@ -31,9 +31,10 @@ set_mo_history <- function(x, mo, uncertainty_level, force = FALSE, disable = FA mo <- mo[!x %in% microorganisms.codes$code & !x %in% microorganisms.translation$mo_old] x <- x[!x %in% microorganisms.codes$code & !x %in% microorganisms.translation$mo_old] + warning_new_write <- FALSE + if (base::interactive() | force == TRUE) { mo_hist <- read_mo_history(uncertainty_level = uncertainty_level, force = force) - warning_new_write <- FALSE df <- data.frame(x, mo, stringsAsFactors = FALSE) %>% distinct(x, .keep_all = TRUE) %>% filter(!is.na(x) & !is.na(mo)) diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index 87403e4f..483e0e81 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -78,7 +78,7 @@ AMR (for R) - 0.7.1.9086 + 0.7.1.9087 diff --git a/docs/articles/index.html b/docs/articles/index.html index eb7e2889..61274641 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -78,7 +78,7 @@ AMR (for R) - 0.7.1.9086 + 0.7.1.9087 diff --git a/docs/authors.html b/docs/authors.html index e474bd7a..7c01e2cd 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -78,7 +78,7 @@ AMR (for R) - 0.7.1.9086 + 0.7.1.9087 diff --git a/docs/index.html b/docs/index.html index 574099ae..d6d9a95c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -42,7 +42,7 @@ AMR (for R) - 0.7.1.9086 + 0.7.1.9087 diff --git a/docs/news/index.html b/docs/news/index.html index 7ea3ccc6..aa2b8e34 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -78,7 +78,7 @@ AMR (for R) - 0.7.1.9086 + 0.7.1.9087 @@ -225,9 +225,9 @@ -
+

-AMR 0.7.1.9086 Unreleased +AMR 0.7.1.9087 Unreleased

Last updated: 23-Sep-2019

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

Contents

    -
  • 0.7.1.9086
    • +
  • 0.7.1.9087
  • 0.7.1
  • 0.7.0
  • 0.6.1
    • diff --git a/docs/reference/index.html b/docs/reference/index.html index f02b0d16..8ba609c6 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -78,7 +78,7 @@ AMR (for R) - 0.7.1.9086 + 0.7.1.9087