From 2f17e457d10a5e9c8397f9688e4be6b6a067527f Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 17 Sep 2024 11:38:24 +0200 Subject: [PATCH] fix --- R/equivalence_test.R | 2 +- R/p_significance.R | 21 ++++++++++++++++++++- R/rope.R | 2 +- tests/testthat/test-rope.R | 14 ++++++++++++++ 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/R/equivalence_test.R b/R/equivalence_test.R index fa089ed75..daec8dc79 100644 --- a/R/equivalence_test.R +++ b/R/equivalence_test.R @@ -168,7 +168,7 @@ equivalence_test.data.frame <- function(x, range = "default", ci = 0.95, rvar_co # multiple ranges for the parameters - iterate over parameters and range if (is.list(range)) { # check if list of values contains only valid values - .check_list_range(range, x) + range <- .check_list_range(range, x) # apply thresholds to each column l <- insight::compact_list(mapply( function(p, r) { diff --git a/R/p_significance.R b/R/p_significance.R index af075cef7..f2f9a34e2 100644 --- a/R/p_significance.R +++ b/R/p_significance.R @@ -138,7 +138,7 @@ p_significance.data.frame <- function(x, threshold = "default", rvar_col = NULL, ps <- .p_significance(x[, 1], threshold = threshold, ...) } else if (is.list(threshold)) { # check if list of values contains only valid values - .check_list_range(threshold, x, larger_two = TRUE) + threshold <- .check_list_range(threshold, x, larger_two = TRUE) # apply thresholds to each column ps <- mapply( function(p, thres) { @@ -417,6 +417,24 @@ as.double.p_significance <- as.numeric.p_significance } .check_list_range <- function(range, params, larger_two = FALSE) { + # if we have named elements, complete list + named_range <- names(range) + if (!is.null(named_range)) { + # find out which name belongs to which parameter + pos <- match(named_range, colnames(params)) + # if not all element names were found, error + if (anyNA(pos)) { + insight::format_error(paste( + "Not all elements of `range` were found in the parameters. Please check following names:", + toString(names_range[is.na]) + )) + } + # now "fill" non-specified elements with "default" + out <- rep("default", ncol(params)) + out[pos] <- range + # overwrite former range + range <- out + } if (length(range) != ncol(params)) { insight::format_error("Length of `range` (i.e. number of ROPE limits) should match the number of parameters.") } @@ -431,4 +449,5 @@ as.double.p_significance <- as.numeric.p_significance if (!all(checks)) { insight::format_error("`range` should be 'default' or a vector of 2 numeric values (e.g., c(-0.1, 0.1)).") } + range } diff --git a/R/rope.R b/R/rope.R index 8158e6091..61eec4d32 100644 --- a/R/rope.R +++ b/R/rope.R @@ -613,7 +613,7 @@ rope.sim <- function(x, range = "default", ci = 0.95, ci_method = "ETI", paramet .prepare_rope_df <- function(parms, range, ci, ci_method, verbose) { if (is.list(range)) { # check if list of values contains only valid values - .check_list_range(range, parms) + range <- .check_list_range(range, parms) # apply thresholds to each column tmp <- mapply( function(p, r) { diff --git a/tests/testthat/test-rope.R b/tests/testthat/test-rope.R index 1c9012da7..48e71e7aa 100644 --- a/tests/testthat/test-rope.R +++ b/tests/testthat/test-rope.R @@ -50,6 +50,20 @@ test_that("rope", { tolerance = 1e-3 ) + # list range + expect_equal( + rope(m, range = list(c(-1, 0.1), "default", "default", c(-1, 1), c(-1.5, -1)))$ROPE_Percentage, + c(0.15823, 1, 0, 0.3903, 0.38186) + tolerance = 1e-3 + ) + + # named elements, chooses "default" for unnamed + expect_equal( + rope(m, range = list(c(-1, 0.1), "default", "default", c(-1, 1), c(-1.5, -1)))$ROPE_Percentage, + rope(m, range = list("(Intercept)" = c(-1, 0.1), period4 = c(-1.5, -1), period3 = c(-1, 1)))$ROPE_Percentage, + tolerance = 1e-3 + ) + expect_error( rope(m, range = list(c(-0.1, 0.1), c(2, 2))), regex = "Length of"