mirror of
https://github.com/msberends/AMR.git
synced 2024-12-25 20:06:12 +01:00
fix rounding MICs on R-devel
This commit is contained in:
parent
a2cbbf470e
commit
7dc96794be
10
.github/prehooks/pre-commit
vendored
10
.github/prehooks/pre-commit
vendored
@ -69,16 +69,10 @@ if [ "$currenttag" = "" ]; then
|
||||
else
|
||||
# there is a tag, so base version number on that
|
||||
currentcommit=$(git rev-list --count ${currenttagfull}..${defaultbranch})
|
||||
if (( "$currentcommit" == 0 )); then
|
||||
# tag is new, so this must become the version number
|
||||
currentversion="$currenttag"
|
||||
fi
|
||||
echo "- latest tag is '${currenttagfull}', with ${currentcommit} previous commits in '${defaultbranch}'"
|
||||
fi
|
||||
if [ "$currentversion" = "" ]; then
|
||||
# combine tag (e.g. 1.2.3) and commit number (like 5) increased by 9000 to indicate beta version
|
||||
currentversion="$currenttag.$((currentcommit + 9001))" # results in e.g. 1.2.3.9005
|
||||
fi
|
||||
# combine tag (e.g. 1.2.3) and commit number (like 5) increased by 9000 to indicate beta version
|
||||
currentversion="$currenttag.$((currentcommit + 9001))" # results in e.g. 1.2.3.9005
|
||||
echo "- ${currentpkg} pkg version set to ${currentversion}"
|
||||
|
||||
# set version number and date to DESCRIPTION file
|
||||
|
@ -1,6 +1,6 @@
|
||||
Package: AMR
|
||||
Version: 2.1.0
|
||||
Date: 2023-07-16
|
||||
Version: 2.1.0.9001
|
||||
Date: 2023-07-20
|
||||
Title: Antimicrobial Resistance Data Analysis
|
||||
Description: Functions to simplify and standardise antimicrobial resistance (AMR)
|
||||
data analysis and to work with microbial and antimicrobial properties by
|
||||
|
5
NEWS.md
5
NEWS.md
@ -1,3 +1,8 @@
|
||||
# AMR 2.1.0.9001
|
||||
|
||||
* Fix rounding MICs on latest R beta ('R-devel')
|
||||
|
||||
|
||||
# AMR 2.1.0
|
||||
|
||||
## New
|
||||
|
4
R/mic.R
4
R/mic.R
@ -503,8 +503,8 @@ trunc.mic <- function(x, ...) {
|
||||
#' @method round mic
|
||||
#' @export
|
||||
#' @noRd
|
||||
round.mic <- function(x, digits = 0) {
|
||||
round(as.double(x), digits = digits)
|
||||
round.mic <- function(x, digits = 0, ...) {
|
||||
round(as.double(x), digits = digits, ...)
|
||||
}
|
||||
#' @method signif mic
|
||||
#' @export
|
||||
|
@ -2,6 +2,6 @@ The email address of the maintainer has changed - not the person.
|
||||
|
||||
As with all previous >20 releases, some CHECKs might return a NOTE for *just* hitting the installation size limit, though its size has been brought down to a minimum in collaboration with CRAN maintainers previously.
|
||||
|
||||
We consider this a high-impact package: it was published in the Journal of Statistical Software (2022), is including in a CRAN Task View (Epidemiology), and is according to download stats used in almost all countries in the world. If there is anything to note, please let us know up-front without directly archiving the current version. That said, we continually unit test our package extensively and have no reason to assume that anything is wrong.
|
||||
We consider this a high-impact package: it was published in the Journal of Statistical Software (2022), is included in a CRAN Task View (Epidemiology), and is according to download stats used in almost all countries in the world. If there is anything to note, please let us know up-front without directly archiving the current version. That said, we continually unit test our package extensively and have no reason to assume that anything is wrong.
|
||||
|
||||
Thanks for maintaining and hosting CRAN! It's empowering R and its use enormously!
|
||||
|
Loading…
Reference in New Issue
Block a user