Browse Source

(v1.7.1.9032) dplyr grouping fix on windows?

new-mo-algorithm
parent
commit
6ca6a3f6df
  1. 2
      DESCRIPTION
  2. 2
      NEWS.md
  3. 8
      R/aa_helper_functions.R
  4. BIN
      data-raw/AMR_latest.tar.gz
  5. 2
      docs/articles/datasets.html
  6. 8
      docs/news/index.html

2
DESCRIPTION

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
Package: AMR
Version: 1.7.1.9031
Version: 1.7.1.9032
Date: 2021-08-30
Title: Antimicrobial Resistance Data Analysis
Description: Functions to simplify and standardise antimicrobial resistance (AMR)

2
NEWS.md

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
# `AMR` 1.7.1.9031
# `AMR` 1.7.1.9032
## <small>Last updated: 30 August 2021</small>
### Breaking changes

8
R/aa_helper_functions.R

@ -736,7 +736,7 @@ get_current_data <- function(arg_name, call) { @@ -736,7 +736,7 @@ get_current_data <- function(arg_name, call) {
if (!is.null(cur_data_all)) {
out <- tryCatch(cur_data_all(), error = function(e) NULL)
if (is.data.frame(out)) {
messsage("==> RETURNING cur_data_all()")
message("==> RETURNING cur_data_all()")
return(structure(out, type = "dplyr_cur_data_all"))
}
}
@ -749,17 +749,17 @@ get_current_data <- function(arg_name, call) { @@ -749,17 +749,17 @@ get_current_data <- function(arg_name, call) {
if (!is.null(env$`.data`) && is.data.frame(env$`.data`)) {
# an element `.data` will be in the environment when using `dplyr::select()`
# (but not when using `dplyr::filter()`, `dplyr::mutate()` or `dplyr::summarise()`)
messsage("==> RETURNING dplyr_selector")
message("==> RETURNING dplyr_selector")
return(structure(env$`.data`, type = "dplyr_selector"))
} else if (!is.null(env$xx) && is.data.frame(env$xx)) {
# an element `xx` will be in the environment for rows + cols, e.g. `example_isolates[c(1:3), carbapenems()]`
messsage("==> RETURNING base_R 1")
message("==> RETURNING base_R 1")
return(structure(env$xx, type = "base_R"))
} else if (!is.null(env$x) && is.data.frame(env$x)) {
# an element `x` will be in the environment for only cols, e.g. `example_isolates[, carbapenems()]`
messsage("==> RETURNING base_R 2")
message("==> RETURNING base_R 2")
return(structure(env$x, type = "base_R"))
}
}

BIN
data-raw/AMR_latest.tar.gz

Binary file not shown.

2
docs/articles/datasets.html

@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">AMR (for R)</a>
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">1.7.1.9031</span>
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">1.7.1.9032</span>
</span>
</div>

8
docs/news/index.html

@ -92,7 +92,7 @@ @@ -92,7 +92,7 @@
</button>
<span class="navbar-brand">
<a class="navbar-link" href="../index.html">AMR (for R)</a>
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">1.7.1.9031</span>
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">1.7.1.9032</span>
</span>
</div>
@ -240,9 +240,9 @@ @@ -240,9 +240,9 @@
<small>Source: <a href='https://github.com/msberends/AMR/blob/master/NEWS.md'><code>NEWS.md</code></a></small>
</div>
<div id="amr-1719031" class="section level1">
<h1 class="page-header" data-toc-text="1.7.1.9031">
<a href="#amr-1719031" class="anchor" aria-hidden="true"></a><small> Unreleased </small><code>AMR</code> 1.7.1.9031</h1>
<div id="amr-1719032" class="section level1">
<h1 class="page-header" data-toc-text="1.7.1.9032">
<a href="#amr-1719032" class="anchor" aria-hidden="true"></a><small> Unreleased </small><code>AMR</code> 1.7.1.9032</h1>
<div id="last-updated-30-august-2021" class="section level2">
<h2 class="hasAnchor">
<a href="#last-updated-30-august-2021" class="anchor" aria-hidden="true"></a><small>Last updated: 30 August 2021</small>

Loading…
Cancel
Save