diff --git a/DESCRIPTION b/DESCRIPTION index 5b9a5db4..4656d732 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 1.2.0.9020 +Version: 1.2.0.9021 Date: 2020-07-01 Title: Antimicrobial Resistance Analysis Authors@R: c( diff --git a/NEWS.md b/NEWS.md index fe6f206e..09485fce 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 1.2.0.9020 +# AMR 1.2.0.9021 ## Last updated: 01-Jul-2020 ### New diff --git a/R/aa_helper_functions.R b/R/aa_helper_functions.R index 3e0c9417..043f6a7e 100755 --- a/R/aa_helper_functions.R +++ b/R/aa_helper_functions.R @@ -411,7 +411,7 @@ font_stripstyle <- function(x) { } progress_estimated <- function(n = 1, n_min = 0, ...) { - if (n >= n_min) { + if (n >= n_min & interactive()) { pb <- utils::txtProgressBar(max = n, style = 3) pb$tick <- function() { pb$up(pb$getVal() + 1) diff --git a/R/ab_from_text.R b/R/ab_from_text.R index 361d2dc1..13123319 100644 --- a/R/ab_from_text.R +++ b/R/ab_from_text.R @@ -124,7 +124,7 @@ ab_from_text <- function(text, as.ab(NA) } else { if (!isFALSE(translate_ab)) { - out <- ab_property(out, property = translate_ab, initial = FALSE) + out <- ab_property(out, property = translate_ab, initial_search = FALSE) } out } diff --git a/R/key_antibiotics.R b/R/key_antibiotics.R index bd474d3c..2c04fd44 100755 --- a/R/key_antibiotics.R +++ b/R/key_antibiotics.R @@ -327,7 +327,7 @@ key_antibiotics_equal <- function(y, } } if (info_needed == TRUE) { - cat("\n") + close(p) } result } diff --git a/docs/404.html b/docs/404.html index 7c1a9d9c..9a286d3e 100644 --- a/docs/404.html +++ b/docs/404.html @@ -81,7 +81,7 @@ AMR (for R) - 1.2.0.9020 + 1.2.0.9021 diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index 728d1fdb..aaf38e4a 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -81,7 +81,7 @@ AMR (for R) - 1.2.0.9020 + 1.2.0.9021 diff --git a/docs/articles/index.html b/docs/articles/index.html index 2c322f41..f8c582bf 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.2.0.9020 + 1.2.0.9021 diff --git a/docs/authors.html b/docs/authors.html index bbce3c5a..535b6b78 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -81,7 +81,7 @@ AMR (for R) - 1.2.0.9020 + 1.2.0.9021 diff --git a/docs/index.html b/docs/index.html index f5cc0d82..5e6b092c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -43,7 +43,7 @@ AMR (for R) - 1.2.0.9020 + 1.2.0.9021 diff --git a/docs/news/index.html b/docs/news/index.html index 64691736..b630c113 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.2.0.9020 + 1.2.0.9021 @@ -229,9 +229,9 @@ Source: NEWS.md -
-

-AMR 1.2.0.9020 Unreleased +
+

+AMR 1.2.0.9021 Unreleased

diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index b1ea80a2..0e0ca883 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -10,7 +10,7 @@ articles: WHONET: WHONET.html benchmarks: benchmarks.html resistance_predict: resistance_predict.html -last_built: 2020-07-01T09:22Z +last_built: 2020-07-01T09:51Z urls: reference: https://msberends.gitlab.io/AMR/reference article: https://msberends.gitlab.io/AMR/articles diff --git a/docs/reference/index.html b/docs/reference/index.html index f9258253..e33a0bd7 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.2.0.9020 + 1.2.0.9021