diff --git a/DESCRIPTION b/DESCRIPTION index 45df61b..3fe40cc 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -35,6 +35,7 @@ Imports: magrittr, methods, purrr, + rlang, tidyr, robcor LinkingTo: Rcpp, RcppArmadillo diff --git a/NAMESPACE b/NAMESPACE index 5632fcc..3618110 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -118,7 +118,7 @@ export(update_obj) export(value) importFrom(Rcpp,evalCpp) importFrom(broom,glance) -importFrom(dplyr,filter_) +importFrom(dplyr,filter) importFrom(dplyr,group_by) importFrom(dplyr,mutate) importFrom(grDevices,col2rgb) @@ -145,6 +145,7 @@ importFrom(methods,is) importFrom(purrr,map) importFrom(purrr,map_dbl) importFrom(purrr,map_df) +importFrom(rlang,.data) importFrom(robcor,robacf) importFrom(scales,math_format) importFrom(scales,trans_breaks) diff --git a/R/model_selection.R b/R/model_selection.R index 2f25358..4753e5e 100644 --- a/R/model_selection.R +++ b/R/model_selection.R @@ -183,19 +183,18 @@ select_ma = function(xt, q.min = 0L, q.max = 3L, #' q.min = 1L, q.max = 3L) #' best_model(x, ic = "hq") #' -#' @importFrom dplyr filter_ +#' @importFrom dplyr filter +#' @importFrom rlang .data best_model = function(x, ic = "aic"){ - + criterion = switch(tolower(ic), "aic" = "AIC", "bic" = "BIC", "hq" = "HQ", stop("`criterion` not supported!")) - - crt = paste0("ic == '", criterion,"' & (minval == TRUE)") - + x %>% - filter_(crt) -> o + filter(.data[["ic"]] == criterion & .data[["minval"]] == TRUE) -> o o$models[[1]]$call$order = eval(parse(text=paste0("c(",o$p,",",o$d,",",o$q,")")))