diff --git a/NEWS.md b/NEWS.md index e8b904ae..36545b9d 100755 --- a/NEWS.md +++ b/NEWS.md @@ -47,6 +47,7 @@ * Fix for warning *hybrid evaluation forced for row_number* ([`924b62`](https://github.com/tidyverse/dplyr/commit/924b62)) from the `dplyr` package v0.7.5 and above * Support for empty values and for 1 or 2 columns as input for `guess_bactid` (now called `as.bactid`) * So `yourdata %>% select(genus, species) %>% as.bactid()` now also works +* Other small fixes #### Other * Unit testing for R 3.0 and the latest available release: https://travis-ci.org/msberends/AMR diff --git a/R/classes.R b/R/classes.R index e75ee0e3..57a9187b 100755 --- a/R/classes.R +++ b/R/classes.R @@ -247,6 +247,7 @@ as.mic <- function(x, na.rm = FALSE) { "<0.006", "<=0.006", "0.006", ">=0.006", ">0.006", "<0.008", "<=0.008", "0.008", ">=0.008", ">0.008", "<0.012", "<=0.012", "0.012", ">=0.012", ">0.012", + "<0.0125", "<=0.0125", "0.0125", ">=0.0125", ">0.0125", "<0.016", "<=0.016", "0.016", ">=0.016", ">0.016", "<0.023", "<=0.023", "0.023", ">=0.023", ">0.023", "<0.025", "<=0.025", "0.025", ">=0.025", ">0.025", @@ -254,6 +255,7 @@ as.mic <- function(x, na.rm = FALSE) { "<0.032", "<=0.032", "0.032", ">=0.032", ">0.032", "<0.047", "<=0.047", "0.047", ">=0.047", ">0.047", "<0.05", "<=0.05", "0.05", ">=0.05", ">0.05", + "<0.054", "<=0.054", "0.054", ">=0.054", ">0.054", "<0.06", "<=0.06", "0.06", ">=0.06", ">0.06", "<0.0625", "<=0.0625", "0.0625", ">=0.0625", ">0.0625", "<0.063", "<=0.063", "0.063", ">=0.063", ">0.063", @@ -265,9 +267,13 @@ as.mic <- function(x, na.rm = FALSE) { "<0.128", "<=0.128", "0.128", ">=0.128", ">0.128", "<0.16", "<=0.16", "0.16", ">=0.16", ">0.16", "<0.19", "<=0.19", "0.19", ">=0.19", ">0.19", + "<0.23", "<=0.23", "0.23", ">=0.23", ">0.23", "<0.25", "<=0.25", "0.25", ">=0.25", ">0.25", "<0.256", "<=0.256", "0.256", ">=0.256", ">0.256", + "<0.28", "<=0.28", "0.28", ">=0.28", ">0.28", + "<0.30", "<=0.30", "0.30", ">=0.30", ">0.30", "<0.32", "<=0.32", "0.32", ">=0.32", ">0.32", + "<0.36", "<=0.36", "0.36", ">=0.36", ">0.36", "<0.38", "<=0.38", "0.38", ">=0.38", ">0.38", "<0.5", "<=0.5", "0.5", ">=0.5", ">0.5", "<0.512", "<=0.512", "0.512", ">=0.512", ">0.512", @@ -278,7 +284,9 @@ as.mic <- function(x, na.rm = FALSE) { "<2", "<=2", "2", ">=2", ">2", "<3", "<=3", "3", ">=3", ">3", "<4", "<=4", "4", ">=4", ">4", + "<5", "<=5", "5", ">=5", ">5", "<6", "<=6", "6", ">=6", ">6", + "<7", "<=7", "7", ">=7", ">7", "<8", "<=8", "8", ">=8", ">8", "<10", "<=10", "10", ">=10", ">10", "<12", "<=12", "12", ">=12", ">12",