Clean up import section

Author: stefvanbuuren

DESCRIPTION

@@ -25,6 +25,7 @@ Imports:
 Suggests:
     ggcorrplot,
     growthstandards,
+    grDevices,
     knitr,
     MASS,
     mvtnorm,

NAMESPACE

@@ -42,15 +42,19 @@ importFrom(ggplot2,xlim)
 importFrom(ggplot2,ylab)
 importFrom(ggplot2,ylim)
 importFrom(hardhat,default_xy_blueprint)
+importFrom(hardhat,forge)
 importFrom(hardhat,mold)
 importFrom(hardhat,new_model)
+importFrom(hardhat,spruce_numeric)
+importFrom(hardhat,validate_prediction_size)
 importFrom(lme4,VarCorr)
 importFrom(lme4,fixef)
 importFrom(lme4,lmer)
 importFrom(lme4,lmerControl)
 importFrom(lme4,ranef)
 importFrom(matrixsampling,rwishart)
 importFrom(rlang,.data)
+importFrom(rlang,arg_match)
 importFrom(splines,bs)
 importFrom(stats,approx)
 importFrom(stats,as.formula)
@@ -71,4 +75,5 @@ importFrom(stats,rnorm)
 importFrom(stats,setNames)
 importFrom(stats,smooth)
 importFrom(stats,var)
+importFrom(tidyr,drop_na)
 importFrom(tidyr,pivot_wider)

R/brokenstick-package.R

@@ -2,18 +2,19 @@
 #'                             mutate pull relocate select ungroup `%>%`
 #' @importFrom ggplot2         aes_string facet_wrap geom_line geom_point
 #'                             geom_step ggplot xlab xlim ylab ylim
-#' @importFrom hardhat         mold new_model default_xy_blueprint
+#' @importFrom hardhat         default_xy_blueprint forge mold new_model
+#'                             spruce_numeric validate_prediction_size
 #' @importFrom lme4            fixef lmer lmerControl ranef VarCorr
 #' @importFrom matrixsampling  rwishart
-#' @importFrom rlang           .data
+#' @importFrom rlang           .data arg_match
 #' @importFrom splines         bs
 #' @importFrom stats           approx as.formula cor cov2cor
 #'                             fitted model.frame lm
 #'                             model.matrix na.exclude na.omit
 #'                             optim
 #'                             predict quantile rgamma rnorm
 #'                             rWishart setNames smooth var
-#' @importFrom tidyr           pivot_wider
+#' @importFrom tidyr           drop_na pivot_wider
 NULL
 
 #' \pkg{brokenstick}: A package for irregular longitudinal data.

R/brokenstick-predict.R

@@ -127,8 +127,8 @@ predict.brokenstick <- function(object, new_data = NULL, type = "numeric",
     reset <- TRUE
   }
 
-  forged <- hardhat::forge(new_data, object$blueprint, outcomes = TRUE)
-  rlang::arg_match(type, valid_predict_types())
+  forged <- forge(new_data, object$blueprint, outcomes = TRUE)
+  arg_match(type, valid_predict_types())
   p <- predict_brokenstick_bridge(type, object,
                                   forged$predictors,
                                   forged$outcomes,
@@ -174,7 +174,7 @@ predict_brokenstick_bridge <- function(type, model, x, y, g) {
   predict_function <- get_predict_function(type)
   yhat <- predict_function(model, x, y, g)
 
-  hardhat::validate_prediction_size(yhat, x)
+  validate_prediction_size(yhat, x)
 
   yhat
 }
@@ -237,5 +237,5 @@ predict_brokenstick_numeric <- function(object, x, y, g) {
       filter(!.data$knot) %>%
       pull("yhat")
 
-  hardhat::spruce_numeric(pred)
+  spruce_numeric(pred)
 }