mirror of
https://github.com/msberends/AMR.git
synced 2024-12-26 18:46:13 +01:00
(v1.0.0.9005) info printing only in interactive mode
This commit is contained in:
parent
47fe8b7820
commit
ea32e9916a
@ -1,5 +1,5 @@
|
|||||||
Package: AMR
|
Package: AMR
|
||||||
Version: 1.0.0.9004
|
Version: 1.0.0.9005
|
||||||
Date: 2020-02-21
|
Date: 2020-02-21
|
||||||
Title: Antimicrobial Resistance Analysis
|
Title: Antimicrobial Resistance Analysis
|
||||||
Authors@R: c(
|
Authors@R: c(
|
||||||
|
3
NEWS.md
3
NEWS.md
@ -1,4 +1,4 @@
|
|||||||
# AMR 1.0.0.9004
|
# AMR 1.0.0.9005
|
||||||
## <small>Last updated: 21-Feb-2020</small>
|
## <small>Last updated: 21-Feb-2020</small>
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
@ -13,6 +13,7 @@
|
|||||||
```
|
```
|
||||||
* Added antibiotic abbreviations for a laboratory manufacturer (GLIMS) for cefuroxime, cefotaxime, ceftazidime, cefepime, cefoxitin and trimethoprim/sulfamethoxazole
|
* Added antibiotic abbreviations for a laboratory manufacturer (GLIMS) for cefuroxime, cefotaxime, ceftazidime, cefepime, cefoxitin and trimethoprim/sulfamethoxazole
|
||||||
* Added `uti` (as abbreviation of urinary tract infections) as parameter to `as.rsi()`, so interpretation of MIC values and disk zones can be made dependent on isolates specifically from UTIs
|
* Added `uti` (as abbreviation of urinary tract infections) as parameter to `as.rsi()`, so interpretation of MIC values and disk zones can be made dependent on isolates specifically from UTIs
|
||||||
|
* Info printing in functions `eucast_rules()`, `first_isolate()`, `mdro()` and `resistance_predict()` will now at default only print when R is in an interactive mode (i.e. not in RMarkdown)
|
||||||
|
|
||||||
# AMR 1.0.0
|
# AMR 1.0.0
|
||||||
|
|
||||||
|
@ -197,7 +197,7 @@ EUCAST_VERSION_EXPERT_RULES <- "3.1, 2016"
|
|||||||
#' }
|
#' }
|
||||||
eucast_rules <- function(x,
|
eucast_rules <- function(x,
|
||||||
col_mo = NULL,
|
col_mo = NULL,
|
||||||
info = TRUE,
|
info = interactive(),
|
||||||
rules = c("breakpoints", "expert", "other", "all"),
|
rules = c("breakpoints", "expert", "other", "all"),
|
||||||
verbose = FALSE,
|
verbose = FALSE,
|
||||||
...) {
|
...) {
|
||||||
|
@ -148,7 +148,7 @@ first_isolate <- function(x,
|
|||||||
type = "keyantibiotics",
|
type = "keyantibiotics",
|
||||||
ignore_I = TRUE,
|
ignore_I = TRUE,
|
||||||
points_threshold = 2,
|
points_threshold = 2,
|
||||||
info = TRUE,
|
info = interactive(),
|
||||||
include_unknown = FALSE,
|
include_unknown = FALSE,
|
||||||
...) {
|
...) {
|
||||||
|
|
||||||
|
2
R/mdro.R
2
R/mdro.R
@ -84,7 +84,7 @@
|
|||||||
mdro <- function(x,
|
mdro <- function(x,
|
||||||
guideline = "CMI2012",
|
guideline = "CMI2012",
|
||||||
col_mo = NULL,
|
col_mo = NULL,
|
||||||
info = TRUE,
|
info = interactive(),
|
||||||
pct_required_classes = 0.5,
|
pct_required_classes = 0.5,
|
||||||
combine_SI = TRUE,
|
combine_SI = TRUE,
|
||||||
verbose = FALSE,
|
verbose = FALSE,
|
||||||
|
1
R/misc.R
1
R/misc.R
@ -125,6 +125,7 @@ search_type_in_df <- function(x, type) {
|
|||||||
found <- colnames(x)[colnames(x) %like% "(urine|urinary)"][1]
|
found <- colnames(x)[colnames(x) %like% "(urine|urinary)"][1]
|
||||||
}
|
}
|
||||||
if (!is.null(found)) {
|
if (!is.null(found)) {
|
||||||
|
# this column should contain logicals
|
||||||
if (!is.logical(x[, found, drop = TRUE])) {
|
if (!is.logical(x[, found, drop = TRUE])) {
|
||||||
message(red(paste0("NOTE: Column `", bold(found), "` found as input for `col_", type,
|
message(red(paste0("NOTE: Column `", bold(found), "` found as input for `col_", type,
|
||||||
"`, but this column does not contain 'logical' values (TRUE/FALSE) and was ignored.")))
|
"`, but this column does not contain 'logical' values (TRUE/FALSE) and was ignored.")))
|
||||||
|
@ -121,7 +121,7 @@ resistance_predict <- function(x,
|
|||||||
model = NULL,
|
model = NULL,
|
||||||
I_as_S = TRUE,
|
I_as_S = TRUE,
|
||||||
preserve_measurements = TRUE,
|
preserve_measurements = TRUE,
|
||||||
info = TRUE,
|
info = interactive(),
|
||||||
...) {
|
...) {
|
||||||
|
|
||||||
if (nrow(x) == 0) {
|
if (nrow(x) == 0) {
|
||||||
|
@ -135,6 +135,7 @@ reference:
|
|||||||
- "`antibiotics`"
|
- "`antibiotics`"
|
||||||
- "`antivirals`"
|
- "`antivirals`"
|
||||||
- "`example_isolates`"
|
- "`example_isolates`"
|
||||||
|
- "`example_isolates_unclean`"
|
||||||
- "`microorganisms.codes`"
|
- "`microorganisms.codes`"
|
||||||
- "`microorganisms.old`"
|
- "`microorganisms.old`"
|
||||||
- "`microorganisms`"
|
- "`microorganisms`"
|
||||||
|
@ -78,7 +78,7 @@
|
|||||||
</button>
|
</button>
|
||||||
<span class="navbar-brand">
|
<span class="navbar-brand">
|
||||||
<a class="navbar-link" href="https://msberends.gitlab.io/AMR/index.html">AMR (for R)</a>
|
<a class="navbar-link" href="https://msberends.gitlab.io/AMR/index.html">AMR (for R)</a>
|
||||||
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">1.0.0.9004</span>
|
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">1.0.0.9005</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -78,7 +78,7 @@
|
|||||||
</button>
|
</button>
|
||||||
<span class="navbar-brand">
|
<span class="navbar-brand">
|
||||||
<a class="navbar-link" href="index.html">AMR (for R)</a>
|
<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.0.0.9004</span>
|
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">1.0.0.9005</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -78,7 +78,7 @@
|
|||||||
</button>
|
</button>
|
||||||
<span class="navbar-brand">
|
<span class="navbar-brand">
|
||||||
<a class="navbar-link" href="../index.html">AMR (for R)</a>
|
<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.0.0.9004</span>
|
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">1.0.0.9005</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -78,7 +78,7 @@
|
|||||||
</button>
|
</button>
|
||||||
<span class="navbar-brand">
|
<span class="navbar-brand">
|
||||||
<a class="navbar-link" href="index.html">AMR (for R)</a>
|
<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.0.0.9004</span>
|
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">1.0.0.9005</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
</button>
|
</button>
|
||||||
<span class="navbar-brand">
|
<span class="navbar-brand">
|
||||||
<a class="navbar-link" href="index.html">AMR (for R)</a>
|
<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.0.0.9004</span>
|
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">1.0.0.9005</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -78,7 +78,7 @@
|
|||||||
</button>
|
</button>
|
||||||
<span class="navbar-brand">
|
<span class="navbar-brand">
|
||||||
<a class="navbar-link" href="../index.html">AMR (for R)</a>
|
<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.0.0.9004</span>
|
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">1.0.0.9005</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -219,9 +219,9 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="amr-1009004" class="section level1">
|
<div id="amr-1009005" class="section level1">
|
||||||
<h1 class="page-header">
|
<h1 class="page-header">
|
||||||
<a href="#amr-1009004" class="anchor"></a>AMR 1.0.0.9004<small> Unreleased </small>
|
<a href="#amr-1009005" class="anchor"></a>AMR 1.0.0.9005<small> Unreleased </small>
|
||||||
</h1>
|
</h1>
|
||||||
<div id="last-updated-21-feb-2020" class="section level2">
|
<div id="last-updated-21-feb-2020" class="section level2">
|
||||||
<h2 class="hasAnchor">
|
<h2 class="hasAnchor">
|
||||||
@ -242,6 +242,7 @@
|
|||||||
</li>
|
</li>
|
||||||
<li><p>Added antibiotic abbreviations for a laboratory manufacturer (GLIMS) for cefuroxime, cefotaxime, ceftazidime, cefepime, cefoxitin and trimethoprim/sulfamethoxazole</p></li>
|
<li><p>Added antibiotic abbreviations for a laboratory manufacturer (GLIMS) for cefuroxime, cefotaxime, ceftazidime, cefepime, cefoxitin and trimethoprim/sulfamethoxazole</p></li>
|
||||||
<li><p>Added <code>uti</code> (as abbreviation of urinary tract infections) as parameter to <code><a href="../reference/as.rsi.html">as.rsi()</a></code>, so interpretation of MIC values and disk zones can be made dependent on isolates specifically from UTIs</p></li>
|
<li><p>Added <code>uti</code> (as abbreviation of urinary tract infections) as parameter to <code><a href="../reference/as.rsi.html">as.rsi()</a></code>, so interpretation of MIC values and disk zones can be made dependent on isolates specifically from UTIs</p></li>
|
||||||
|
<li><p>Info printing in functions <code><a href="../reference/eucast_rules.html">eucast_rules()</a></code>, <code><a href="../reference/first_isolate.html">first_isolate()</a></code>, <code><a href="../reference/mdro.html">mdro()</a></code> and <code><a href="../reference/resistance_predict.html">resistance_predict()</a></code> will now at default only print when R is in an interactive mode (i.e. not in RMarkdown)</p></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -1473,7 +1474,7 @@
|
|||||||
<div id="tocnav">
|
<div id="tocnav">
|
||||||
<h2>Contents</h2>
|
<h2>Contents</h2>
|
||||||
<ul class="nav nav-pills nav-stacked">
|
<ul class="nav nav-pills nav-stacked">
|
||||||
<li><a href="#amr-1009004">1.0.0.9004</a></li>
|
<li><a href="#amr-1009005">1.0.0.9005</a></li>
|
||||||
<li><a href="#amr-100">1.0.0</a></li>
|
<li><a href="#amr-100">1.0.0</a></li>
|
||||||
<li><a href="#amr-090">0.9.0</a></li>
|
<li><a href="#amr-090">0.9.0</a></li>
|
||||||
<li><a href="#amr-080">0.8.0</a></li>
|
<li><a href="#amr-080">0.8.0</a></li>
|
||||||
|
@ -79,7 +79,7 @@
|
|||||||
</button>
|
</button>
|
||||||
<span class="navbar-brand">
|
<span class="navbar-brand">
|
||||||
<a class="navbar-link" href="../index.html">AMR (for R)</a>
|
<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.0.0.9003</span>
|
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">1.0.0.9005</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -80,7 +80,7 @@ To improve the interpretation of the antibiogram before EUCAST rules are applied
|
|||||||
</button>
|
</button>
|
||||||
<span class="navbar-brand">
|
<span class="navbar-brand">
|
||||||
<a class="navbar-link" href="../index.html">AMR (for R)</a>
|
<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">0.9.0.9029</span>
|
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">1.0.0.9005</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -230,7 +230,7 @@ To improve the interpretation of the antibiogram before EUCAST rules are applied
|
|||||||
<pre class="usage"><span class='fu'>eucast_rules</span>(
|
<pre class="usage"><span class='fu'>eucast_rules</span>(
|
||||||
<span class='no'>x</span>,
|
<span class='no'>x</span>,
|
||||||
<span class='kw'>col_mo</span> <span class='kw'>=</span> <span class='kw'>NULL</span>,
|
<span class='kw'>col_mo</span> <span class='kw'>=</span> <span class='kw'>NULL</span>,
|
||||||
<span class='kw'>info</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>,
|
<span class='kw'>info</span> <span class='kw'>=</span> <span class='fu'><a href='https://rdrr.io/r/base/interactive.html'>interactive</a></span>(),
|
||||||
<span class='kw'>rules</span> <span class='kw'>=</span> <span class='fu'><a href='https://rdrr.io/r/base/c.html'>c</a></span>(<span class='st'>"breakpoints"</span>, <span class='st'>"expert"</span>, <span class='st'>"other"</span>, <span class='st'>"all"</span>),
|
<span class='kw'>rules</span> <span class='kw'>=</span> <span class='fu'><a href='https://rdrr.io/r/base/c.html'>c</a></span>(<span class='st'>"breakpoints"</span>, <span class='st'>"expert"</span>, <span class='st'>"other"</span>, <span class='st'>"all"</span>),
|
||||||
<span class='kw'>verbose</span> <span class='kw'>=</span> <span class='fl'>FALSE</span>,
|
<span class='kw'>verbose</span> <span class='kw'>=</span> <span class='fl'>FALSE</span>,
|
||||||
<span class='no'>...</span>
|
<span class='no'>...</span>
|
||||||
|
@ -79,7 +79,7 @@
|
|||||||
</button>
|
</button>
|
||||||
<span class="navbar-brand">
|
<span class="navbar-brand">
|
||||||
<a class="navbar-link" href="../index.html">AMR (for R)</a>
|
<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.0.0.9004</span>
|
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">1.0.0.9005</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -79,7 +79,7 @@
|
|||||||
</button>
|
</button>
|
||||||
<span class="navbar-brand">
|
<span class="navbar-brand">
|
||||||
<a class="navbar-link" href="../index.html">AMR (for R)</a>
|
<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">0.9.0.9029</span>
|
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">1.0.0.9005</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -241,7 +241,7 @@
|
|||||||
<span class='kw'>type</span> <span class='kw'>=</span> <span class='st'>"keyantibiotics"</span>,
|
<span class='kw'>type</span> <span class='kw'>=</span> <span class='st'>"keyantibiotics"</span>,
|
||||||
<span class='kw'>ignore_I</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>,
|
<span class='kw'>ignore_I</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>,
|
||||||
<span class='kw'>points_threshold</span> <span class='kw'>=</span> <span class='fl'>2</span>,
|
<span class='kw'>points_threshold</span> <span class='kw'>=</span> <span class='fl'>2</span>,
|
||||||
<span class='kw'>info</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>,
|
<span class='kw'>info</span> <span class='kw'>=</span> <span class='fu'><a href='https://rdrr.io/r/base/interactive.html'>interactive</a></span>(),
|
||||||
<span class='kw'>include_unknown</span> <span class='kw'>=</span> <span class='fl'>FALSE</span>,
|
<span class='kw'>include_unknown</span> <span class='kw'>=</span> <span class='fl'>FALSE</span>,
|
||||||
<span class='no'>...</span>
|
<span class='no'>...</span>
|
||||||
)
|
)
|
||||||
|
@ -78,7 +78,7 @@
|
|||||||
</button>
|
</button>
|
||||||
<span class="navbar-brand">
|
<span class="navbar-brand">
|
||||||
<a class="navbar-link" href="../index.html">AMR (for R)</a>
|
<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.0.0.9004</span>
|
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">1.0.0.9005</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -451,6 +451,12 @@
|
|||||||
<td><p>Data set with 2,000 example isolates</p></td>
|
<td><p>Data set with 2,000 example isolates</p></td>
|
||||||
</tr><tr>
|
</tr><tr>
|
||||||
|
|
||||||
|
<td>
|
||||||
|
<p><code><a href="example_isolates_unclean.html">example_isolates_unclean</a></code> </p>
|
||||||
|
</td>
|
||||||
|
<td><p>Data set with unclean data</p></td>
|
||||||
|
</tr><tr>
|
||||||
|
|
||||||
<td>
|
<td>
|
||||||
<p><code><a href="microorganisms.codes.html">microorganisms.codes</a></code> </p>
|
<p><code><a href="microorganisms.codes.html">microorganisms.codes</a></code> </p>
|
||||||
</td>
|
</td>
|
||||||
|
@ -79,7 +79,7 @@
|
|||||||
</button>
|
</button>
|
||||||
<span class="navbar-brand">
|
<span class="navbar-brand">
|
||||||
<a class="navbar-link" href="../index.html">AMR (for R)</a>
|
<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">0.9.0.9029</span>
|
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">1.0.0.9005</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -229,7 +229,7 @@
|
|||||||
<span class='no'>x</span>,
|
<span class='no'>x</span>,
|
||||||
<span class='kw'>guideline</span> <span class='kw'>=</span> <span class='st'>"CMI2012"</span>,
|
<span class='kw'>guideline</span> <span class='kw'>=</span> <span class='st'>"CMI2012"</span>,
|
||||||
<span class='kw'>col_mo</span> <span class='kw'>=</span> <span class='kw'>NULL</span>,
|
<span class='kw'>col_mo</span> <span class='kw'>=</span> <span class='kw'>NULL</span>,
|
||||||
<span class='kw'>info</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>,
|
<span class='kw'>info</span> <span class='kw'>=</span> <span class='fu'><a href='https://rdrr.io/r/base/interactive.html'>interactive</a></span>(),
|
||||||
<span class='kw'>pct_required_classes</span> <span class='kw'>=</span> <span class='fl'>0.5</span>,
|
<span class='kw'>pct_required_classes</span> <span class='kw'>=</span> <span class='fl'>0.5</span>,
|
||||||
<span class='kw'>combine_SI</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>,
|
<span class='kw'>combine_SI</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>,
|
||||||
<span class='kw'>verbose</span> <span class='kw'>=</span> <span class='fl'>FALSE</span>,
|
<span class='kw'>verbose</span> <span class='kw'>=</span> <span class='fl'>FALSE</span>,
|
||||||
|
@ -79,7 +79,7 @@
|
|||||||
</button>
|
</button>
|
||||||
<span class="navbar-brand">
|
<span class="navbar-brand">
|
||||||
<a class="navbar-link" href="../index.html">AMR (for R)</a>
|
<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">0.9.0.9029</span>
|
<span class="version label label-default" data-toggle="tooltip" data-placement="bottom" title="Latest development version">1.0.0.9005</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -236,7 +236,7 @@
|
|||||||
<span class='kw'>model</span> <span class='kw'>=</span> <span class='kw'>NULL</span>,
|
<span class='kw'>model</span> <span class='kw'>=</span> <span class='kw'>NULL</span>,
|
||||||
<span class='kw'>I_as_S</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>,
|
<span class='kw'>I_as_S</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>,
|
||||||
<span class='kw'>preserve_measurements</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>,
|
<span class='kw'>preserve_measurements</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>,
|
||||||
<span class='kw'>info</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>,
|
<span class='kw'>info</span> <span class='kw'>=</span> <span class='fu'><a href='https://rdrr.io/r/base/interactive.html'>interactive</a></span>(),
|
||||||
<span class='no'>...</span>
|
<span class='no'>...</span>
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -251,7 +251,7 @@
|
|||||||
<span class='kw'>model</span> <span class='kw'>=</span> <span class='kw'>NULL</span>,
|
<span class='kw'>model</span> <span class='kw'>=</span> <span class='kw'>NULL</span>,
|
||||||
<span class='kw'>I_as_S</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>,
|
<span class='kw'>I_as_S</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>,
|
||||||
<span class='kw'>preserve_measurements</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>,
|
<span class='kw'>preserve_measurements</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>,
|
||||||
<span class='kw'>info</span> <span class='kw'>=</span> <span class='fl'>TRUE</span>,
|
<span class='kw'>info</span> <span class='kw'>=</span> <span class='fu'><a href='https://rdrr.io/r/base/interactive.html'>interactive</a></span>(),
|
||||||
<span class='no'>...</span>
|
<span class='no'>...</span>
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@ Leclercq et al. \strong{EUCAST expert rules in antimicrobial susceptibility test
|
|||||||
eucast_rules(
|
eucast_rules(
|
||||||
x,
|
x,
|
||||||
col_mo = NULL,
|
col_mo = NULL,
|
||||||
info = TRUE,
|
info = interactive(),
|
||||||
rules = c("breakpoints", "expert", "other", "all"),
|
rules = c("breakpoints", "expert", "other", "all"),
|
||||||
verbose = FALSE,
|
verbose = FALSE,
|
||||||
...
|
...
|
||||||
|
@ -27,7 +27,7 @@ first_isolate(
|
|||||||
type = "keyantibiotics",
|
type = "keyantibiotics",
|
||||||
ignore_I = TRUE,
|
ignore_I = TRUE,
|
||||||
points_threshold = 2,
|
points_threshold = 2,
|
||||||
info = TRUE,
|
info = interactive(),
|
||||||
include_unknown = FALSE,
|
include_unknown = FALSE,
|
||||||
...
|
...
|
||||||
)
|
)
|
||||||
|
@ -22,7 +22,7 @@ mdro(
|
|||||||
x,
|
x,
|
||||||
guideline = "CMI2012",
|
guideline = "CMI2012",
|
||||||
col_mo = NULL,
|
col_mo = NULL,
|
||||||
info = TRUE,
|
info = interactive(),
|
||||||
pct_required_classes = 0.5,
|
pct_required_classes = 0.5,
|
||||||
combine_SI = TRUE,
|
combine_SI = TRUE,
|
||||||
verbose = FALSE,
|
verbose = FALSE,
|
||||||
|
@ -18,7 +18,7 @@ resistance_predict(
|
|||||||
model = NULL,
|
model = NULL,
|
||||||
I_as_S = TRUE,
|
I_as_S = TRUE,
|
||||||
preserve_measurements = TRUE,
|
preserve_measurements = TRUE,
|
||||||
info = TRUE,
|
info = interactive(),
|
||||||
...
|
...
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -33,7 +33,7 @@ rsi_predict(
|
|||||||
model = NULL,
|
model = NULL,
|
||||||
I_as_S = TRUE,
|
I_as_S = TRUE,
|
||||||
preserve_measurements = TRUE,
|
preserve_measurements = TRUE,
|
||||||
info = TRUE,
|
info = interactive(),
|
||||||
...
|
...
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -32,4 +32,8 @@ test_that("disk works", {
|
|||||||
|
|
||||||
expect_warning(as.disk("INVALID VALUE"))
|
expect_warning(as.disk("INVALID VALUE"))
|
||||||
|
|
||||||
|
expect_output(print(as.disk(12)))
|
||||||
|
library(tibble)
|
||||||
|
expect_output(print(tibble(d = as.disk(12))))
|
||||||
|
|
||||||
})
|
})
|
||||||
|
@ -110,9 +110,9 @@ test_that("EUCAST rules work", {
|
|||||||
"S")
|
"S")
|
||||||
|
|
||||||
# also test norf
|
# also test norf
|
||||||
expect_output(suppressWarnings(eucast_rules(example_isolates %>% mutate(NOR = "S", NAL = "S"))))
|
expect_output(suppressWarnings(eucast_rules(example_isolates %>% mutate(NOR = "S", NAL = "S"), info = TRUE)))
|
||||||
|
|
||||||
# check verbose output
|
# check verbose output
|
||||||
expect_output(suppressWarnings(eucast_rules(example_isolates, verbose = TRUE)))
|
expect_output(suppressWarnings(eucast_rules(example_isolates, verbose = TRUE, info = TRUE)))
|
||||||
|
|
||||||
})
|
})
|
||||||
|
@ -141,7 +141,8 @@ test_that("first isolates work", {
|
|||||||
mutate(first = first_isolate(., "date", "patient_id",
|
mutate(first = first_isolate(., "date", "patient_id",
|
||||||
col_mo = "mo",
|
col_mo = "mo",
|
||||||
col_specimen = "specimen",
|
col_specimen = "specimen",
|
||||||
filter_specimen = "something_unexisting")))
|
filter_specimen = "something_unexisting",
|
||||||
|
info = TRUE)))
|
||||||
|
|
||||||
# printing of exclusion message
|
# printing of exclusion message
|
||||||
expect_message(example_isolates %>%
|
expect_message(example_isolates %>%
|
||||||
@ -149,7 +150,8 @@ test_that("first isolates work", {
|
|||||||
col_mo = "mo",
|
col_mo = "mo",
|
||||||
col_patient_id = "patient_id",
|
col_patient_id = "patient_id",
|
||||||
col_testcode = "gender",
|
col_testcode = "gender",
|
||||||
testcodes_exclude = "M"))
|
testcodes_exclude = "M",
|
||||||
|
info = TRUE))
|
||||||
|
|
||||||
# errors
|
# errors
|
||||||
expect_error(first_isolate("date", "patient_id", col_mo = "mo"))
|
expect_error(first_isolate("date", "patient_id", col_mo = "mo"))
|
||||||
|
Loading…
Reference in New Issue
Block a user