From bb173a7e01e3d7b3d492e88609593521c6b962c9 Mon Sep 17 00:00:00 2001 From: gisler Date: Thu, 2 Jan 2025 10:52:58 +0100 Subject: [PATCH] refactor: rm `call. = FALSE` arguments --- R/aaa.R | 2 +- R/gettersSetters.R | 2 +- R/input.R | 11 +++-------- R/interface.R | 3 +-- R/utils.R | 3 +-- 5 files changed, 7 insertions(+), 14 deletions(-) diff --git a/R/aaa.R b/R/aaa.R index f2fc8b6..293408f 100644 --- a/R/aaa.R +++ b/R/aaa.R @@ -380,7 +380,7 @@ setMethod( arguments <- readParameters(arguments) argumentNames <- names(arguments) } else if (.Object@ls_ini) { - stop('"parameters.yaml" file does not exist.', call. = FALSE) + stop('"parameters.yaml" file does not exist.') } arguments <- arguments[setdiff( argumentNames, diff --git a/R/gettersSetters.R b/R/gettersSetters.R index 9245e95..d4c2858 100644 --- a/R/gettersSetters.R +++ b/R/gettersSetters.R @@ -66,7 +66,7 @@ setMethod( } } - stop(sprintf("Layer %s was not found.", deparse(i)), call. = FALSE) + stop(sprintf("Layer %s was not found.", deparse(i))) } ) #' @rdname getLayer-RPhosFate-method diff --git a/R/input.R b/R/input.R index 3e97d40..54d93a3 100644 --- a/R/input.R +++ b/R/input.R @@ -29,10 +29,7 @@ demoProject <- function(cs_dir = tempdir(TRUE)) { demoRoot <- file.path(cs_dir, "demoProject") if (dir.exists(demoRoot)) { - warning( - 'A folder called "demoProject" already exists and is left as is.', - call. = FALSE - ) + warning('A folder called "demoProject" already exists and is left as is.') } else { dir.create(demoRoot) testRoot <- system.file("tinytest", "testProject", package = "RPhosFate") @@ -168,15 +165,13 @@ DEMrelatedInput <- function( packageVersion("whitebox") < package_version("2.0.0")) { stop( 'Package "whitebox" (v2.0.0 or higher) must be installed for this ', - "functionality.", - call. = FALSE + "functionality." ) } if (!whitebox::check_whitebox_binary()) { stop( 'The "WhiteboxTools" binary must be installed for this functionality. ', - 'Consider calling "whitebox::install_whitebox()" first.', - call. = FALSE + 'Consider calling "whitebox::install_whitebox()" first.' ) } qassert(cv_dir, "S+") diff --git a/R/interface.R b/R/interface.R index af500a2..045eb5f 100644 --- a/R/interface.R +++ b/R/interface.R @@ -659,8 +659,7 @@ setMethod( if (any(abs(interval - value[[1L]]) <= tol)) { warning( "Parameter approximately within tolerance of interval end-point. ", - "Optimum may not have been found.", - call. = FALSE + "Optimum may not have been found." ) } diff --git a/R/utils.R b/R/utils.R index a3ce207..19401b7 100644 --- a/R/utils.R +++ b/R/utils.R @@ -136,8 +136,7 @@ readParameters <- function(arguments) { warning( 'Omitted parameter "iv_fDo", as it is no longer required. ', - "It will definitely be lost upon saving the project's state.", - call. = FALSE + "It will definitely be lost upon saving the project's state." ) }