From 0023abafa1e82ea9424fd7932229318a3390ce18 Mon Sep 17 00:00:00 2001 From: jamesmbaazam Date: Thu, 4 May 2023 16:39:55 +0100 Subject: [PATCH 1/2] updated gitignore --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7f855a336..31cb7c5c2 100644 --- a/.gitignore +++ b/.gitignore @@ -31,4 +31,6 @@ CRAN-RELEASE # C++ object files inst/include/*.o # avoid rstantools generated files -src \ No newline at end of file +src + +.DS_Store From 6d1ecccc9dbc48feadecc11e3f1a5aa58806add9 Mon Sep 17 00:00:00 2001 From: jamesmbaazam Date: Thu, 4 May 2023 16:40:30 +0100 Subject: [PATCH 2/2] replaced ifelse with fcase in map_prob_change() --- R/utilities.R | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/R/utilities.R b/R/utilities.R index 102fb97cb..932093bd7 100644 --- a/R/utilities.R +++ b/R/utilities.R @@ -77,6 +77,7 @@ make_conf <- function(value, CrI = 90, reverse = FALSE) { #' "Likely decreasing" (< 0.95), "Decreasing" (<= 1) #' @param var Numeric variable to be categorised #' +#' @importFrom data.table fcase #' @return A character variable. #' @export #' @examples @@ -85,17 +86,15 @@ make_conf <- function(value, CrI = 90, reverse = FALSE) { #' #' map_prob_change(var) map_prob_change <- function(var) { - # nolint start - var <- ifelse(var < 0.05, "Increasing", - ifelse(var < 0.4, "Likely increasing", - ifelse(var < 0.6, "Stable", - ifelse(var < 0.95, "Likely decreasing", - "Decreasing" - ) - ) - ) - ) - # nolint end + + var <- data.table::fcase( + var < 0.05, "Increasing", + var >= 0.05 & var < 0.4, "Likely increasing", + var >= 0.4 & var < 0.6, "Stable", + var >= 0.6 & var < 0.95, "Likely decreasing", + var >= 0.95 & var <= 1, "Decreasing" + ) + var <- factor(var, levels = c( "Increasing", "Likely increasing", "Stable", "Likely decreasing", "Decreasing"