P281424/AMR
1
0
Fork 0
mirror of https://github.com/msberends/AMR.git synced 2024-12-24 18:46:14 +01:00
Code Releases Activity

patient ID in first isolate

Browse Source
This commit is contained in:
dr. M.S. (Matthijs) Berends 2023-03-11 17:13:19 +01:00
parent 7ad8635994
commit 9179e98e12
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DESCRIPTION
View File

@ -1,5 +1,5 @@
Package: AMR
Version: 1.8.2.9150
Version: 1.8.2.9151
Date: 2023-03-11
Title: Antimicrobial Resistance Data Analysis
Description: Functions to simplify and standardise antimicrobial resistance (AMR)

2
NEWS.md
View File

@ -1,4 +1,4 @@
# AMR 1.8.2.9150
# AMR 1.8.2.9151
*(this beta version will eventually become v2.0! We're happy to reach a new major milestone soon!)*

4
R/first_isolate.R
View File

@ -350,7 +350,7 @@ first_isolate <- function(x = NULL,
x$newvar_mo <- as.mo(x[, col_mo, drop = TRUE])
x$newvar_genus_species <- paste(mo_genus(x$newvar_mo), mo_species(x$newvar_mo))
x$newvar_date <- x[, col_date, drop = TRUE]
x$newvar_patient_id <- x[, col_patient_id, drop = TRUE]
x$newvar_patient_id <- as.character(x[, col_patient_id, drop = TRUE])
if (is.null(col_testcode)) {
testcodes_exclude <- NULL
@ -378,7 +378,7 @@ first_isolate <- function(x = NULL,
}
}
if (!is.null(col_keyantimicrobials)) {
x$newvar_key_ab <- x[, col_keyantimicrobials, drop = TRUE]
x$newvar_key_ab <- as.character(x[, col_keyantimicrobials, drop = TRUE])
}
if (is.null(testcodes_exclude)) {

7
R/proportion.R
View File

@ -303,13 +303,14 @@ sir_confidence_interval <- function(...,
}
if (isTRUE(as_percent)) {
out <- percentage(out, digits = 1)
} else {
out <- round(out, digits = 3)
}
if (!isFALSE(collapse) && length(out) > 1) {
if (is.numeric(out)) {
out <- round(out, digits = 3)
}
out <- paste(out, collapse = ifelse(isTRUE(collapse), "-", collapse))
}
if (n < minimum) {
warning_("Introducing NA: ",
ifelse(n == 0, "no", paste("only", n)),