Merge branch 'pr/m-muecke/171'

Author: mitchelloharawild

R/features.R

@@ -137,7 +137,7 @@ feat_stl <- function(x, .period, s.window = 11, ...){
 #' @rdname unitroot
 #' @export
 unitroot_kpss <- function(x, type = c("mu", "tau"), lags = c("short", "long", "nil"), ...) {
-  require_package("urca")
+  check_installed("urca")
   result <- urca::ur.kpss(x, type = type, lags = lags, ...)
   pval <- stats::approx(result@cval[1,], as.numeric(sub("pct", "", colnames(result@cval)))/100, xout=result@teststat[1], rule=2)$y
   c(kpss_stat = result@teststat, kpss_pvalue = pval)
@@ -151,7 +151,7 @@ unitroot_kpss <- function(x, type = c("mu", "tau"), lags = c("short", "long", "n
 #' @export
 unitroot_pp <- function(x, type = c("Z-tau", "Z-alpha"), model = c("constant", "trend"),
                         lags = c("short", "long"), ...) {
-  require_package("urca")
+  check_installed("urca")
   result <- urca::ur.pp(x, type = match.arg(type), model = match.arg(model),
                         lags = match.arg(lags), ...)
   pval <- stats::approx(result@cval[1,], as.numeric(sub("pct", "", colnames(result@cval)))/100, xout=result@teststat[1], rule=2)$y
@@ -247,7 +247,7 @@ unitroot_nsdiffs <- function(x, alpha = 0.05, unitroot_fn = ~ feat_stl(.,.period
 #'
 #' @export
 cointegration_johansen <- function(x, ...) {
-  require_package("urca")
+  check_installed("urca")
   result <- urca::ca.jo(x, ...)
 
   pct <- as.numeric(sub("pct", "", colnames(result@cval)))/100
@@ -328,7 +328,7 @@ cointegration_johansen <- function(x, ...) {
 #'
 #' @export
 cointegration_phillips_ouliaris <- function(x, ...) {
-  require_package("urca")
+  check_installed("urca")
   result <- urca::ca.po(x, ...)
   pval <- stats::approx(result@cval[1,], as.numeric(sub("pct", "", colnames(result@cval)))/100, xout=result@teststat[1], rule=2)$y
   c(phillips_ouliaris_stat = result@teststat, phillips_ouliaris_pvalue = pval)
@@ -370,7 +370,7 @@ n_flat_spots <- function(x) {
 #'
 #' @export
 coef_hurst <- function(x) {
-  require_package("fracdiff")
+  check_installed("fracdiff")
   # Hurst=d+0.5 where d is fractional difference.
   return(c(coef_hurst = suppressWarnings(fracdiff::fracdiff(na.contiguous(x), 0, 0)[["d"]] + 0.5)))
 }

R/seats.R

@@ -17,7 +17,7 @@ specials_seats <- fabletools::new_specials(
 )
 
 train_seats <- function(.data, formula, specials, x11, x11.mode, ...){
-  require_package("seasonal")
+  check_installed("seasonal")
   stopifnot(is_tsibble(.data))
 
   if(!missing(x11) || !missing(x11.mode)){

R/utils.R

@@ -6,14 +6,6 @@ add_class <- function(x, new_class){
   if (is.null(x)) y else x
 }
 
-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)
-    )
-  }
-}
-
 `%empty%` <- function(x, y) {
   if (length(x) == 0) y else x
 }

R/x11.R

@@ -17,7 +17,7 @@ specials_X11 <- fabletools::new_specials(
 )
 
 train_X11 <- function(.data, formula, specials, type, ...){
-  require_package("seasonal")
+  check_installed("seasonal")
   stopifnot(is_tsibble(.data))
 
   if(length(specials$season) != 1){

R/x13arimaseats.R

@@ -32,7 +32,7 @@ specials_x13arimaseats <- fabletools::new_specials(
 
 train_x13arimaseats <- function(.data, formula, specials, ...,
                                 defaults, na.action = seasonal::na.x13){
-  require_package("seasonal")
+  check_installed("seasonal")
   stopifnot(is_tsibble(.data))
   series_name <- measured_vars(.data)