diff --git a/R/frequency.R b/R/frequency.R index 378a6967..1d552cc8 100644 --- a/R/frequency.R +++ b/R/frequency.R @@ -87,7 +87,7 @@ get_frequencies.NULL <- function(period, data, ..., #' @rdname freq_tools #' @export get_frequencies.character <- function(period, data, ...){ - require_package("lubridate") + check_installed("lubridate") m <- lubridate::as.period(period) if(is.na(m)) abort(paste("Unknown period:", period)) get_frequencies(m, data, ...) @@ -96,7 +96,7 @@ get_frequencies.character <- function(period, data, ...){ #' @rdname freq_tools #' @export get_frequencies.Period <- function(period, data, ...){ - require_package("lubridate") + check_installed("lubridate") interval <- tsibble::interval(data) @@ -107,4 +107,4 @@ get_frequencies.Period <- function(period, data, ...){ lubridate::microseconds(microsecond) + lubridate::nanoseconds(nanosecond)) suppressMessages(period / interval) -} \ No newline at end of file +} diff --git a/R/model.R b/R/model.R index a29b63a4..d6bd60f8 100644 --- a/R/model.R +++ b/R/model.R @@ -98,7 +98,7 @@ Check that specified model(s) are model definitions.", nm[which(!is_mdl)[1]])) } if(is_attached("package:future")){ - require_package("future.apply") + check_installed("future.apply") eval_models <- function(models, lst_data){ out <- future.apply::future_mapply( rep(lst_data, length(models)), @@ -183,4 +183,4 @@ model_rhs <- function(model){ else{ expr(NULL) } -} \ No newline at end of file +} diff --git a/R/model_decomposition.R b/R/model_decomposition.R index 0508a5f4..5b3c8e21 100644 --- a/R/model_decomposition.R +++ b/R/model_decomposition.R @@ -51,7 +51,7 @@ Please specify an appropriate model for these components", } mdls_default <- if(!is_empty(miss_vars)){ - require_package("fable") + check_installed("fable") lag <- NULL structure[miss_vars] %>% diff --git a/R/reconciliation.R b/R/reconciliation.R index e43c0c16..dda8361c 100644 --- a/R/reconciliation.R +++ b/R/reconciliation.R @@ -63,7 +63,7 @@ forecast.lst_mint_mdl <- function(object, key_data, method <- object%@%"method" sparse <- object%@%"sparse" if(sparse){ - require_package("Matrix") + check_installed("Matrix") as.matrix <- Matrix::as.matrix t <- Matrix::t diag <- function(x) if(is.vector(x)) Matrix::Diagonal(x = x) else Matrix::diag(x) @@ -467,7 +467,7 @@ reconcile_fbl_list <- function(fc, S, P, W, point_forecast, SP = NULL) { } if(!inherits(S, "matrix")) { # Use sparse functions - require_package("Matrix") + check_installed("Matrix") as.matrix <- Matrix::as.matrix t <- Matrix::t diag <- function(x) if(is.vector(x)) Matrix::Diagonal(x = x) else Matrix::diag(x) diff --git a/R/utils.R b/R/utils.R index e9231edb..0ad75644 100644 --- a/R/utils.R +++ b/R/utils.R @@ -116,14 +116,6 @@ big_mark <- function (x, ...) { ret } -require_package <- function(pkg){ - if(!requireNamespace(pkg, quietly = TRUE)){ - abort( - sprintf('The `%s` package must be installed to use this functionality. It can be installed with install.packages("%s")', pkg, pkg) - ) - } -} - calc <- function(f, ...){ f(...) } @@ -262,7 +254,7 @@ mapply_maybe_parallel <- function (.f, ..., MoreArgs = list(), SIMPLIFY = FALSE) .f(...) } if(is_attached("package:future")){ - require_package("future.apply") + check_installed("future.apply") future.apply::future_mapply( FUN = .fp, ...,