Merge pull request #12 from topepo/namespace_usage

Namespace usage in model function call + others

Author: topepo

DESCRIPTION

@@ -14,6 +14,7 @@ VignetteBuilder: knitr
 Depends:
     R (>= 2.10)
 Imports: 
+    dplyr,
     rlang (>= 0.1.6.9003),
     purrr,
     recipes,

NAMESPACE

@@ -1,32 +1,34 @@
 # Generated by roxygen2: do not edit by hand
 
 S3method(fit,model_spec)
+S3method(print,linear_reg)
 S3method(print,logistic_reg)
 S3method(print,rand_forest)
 S3method(translate,default)
-S3method(translate,logistic_reg)
 S3method(translate,rand_forest)
+S3method(update,linear_reg)
 S3method(update,logistic_reg)
 S3method(update,rand_forest)
 export(fit)
 export(fit_control)
+export(linear_reg)
 export(logistic_reg)
 export(rand_forest)
 export(translate)
 export(varying)
 import(rlang)
+importFrom(dplyr,bind_cols)
 importFrom(purrr,list_modify)
 importFrom(purrr,map_lgl)
 importFrom(recipes,all_outcomes)
 importFrom(recipes,all_predictors)
 importFrom(recipes,juice)
 importFrom(recipes,prep)
 importFrom(stats,as.formula)
-importFrom(stats,binomial)
 importFrom(stats,model.frame)
+importFrom(stats,model.matrix)
 importFrom(stats,model.response)
 importFrom(stats,terms)
 importFrom(utils,capture.output)
 importFrom(utils,getFromNamespace)
-importFrom(utils,globalVariables)
 importFrom(utils,installed.packages)

R/arguments.R

@@ -41,10 +41,9 @@ varying <- function()
 
 deharmonize <- function(args, key, engine) {
   nms <- names(args)
-  for(i in seq_along(args)) {
-    names(args)[i] <- key[ nms[i] , engine ]
-  }
-  args
+  orig_names <- key[nms, engine]
+  names(args) <- orig_names
+  args[!is.na(orig_names)]
 }
 
 parse_engine_options <- function(x) {
@@ -83,35 +82,16 @@ prune_arg_list <- function(x, whitelist = NULL, modified = character(0)) {
   x
 }
 
-check_others <- function(args, x) {
-
+check_others <- function(args, obj) {
   # Make sure that we are not trying to modify an argument that
   # is explicitly protected in the method metadata
-  common_args <- intersect(x$protect, names(args))
+  common_args <- intersect(obj$protect, names(args))
   if (length(common_args) > 0) {
     args <- args[!(names(args) %in% common_args)]
     common_args <- paste0(common_args, collapse = ", ")
     warning("The following arguments cannot be manually modified ",
             "and were removed: ",
             common_args, call. = FALSE)
   }
-
-  # If there are not ellipses in function, make sure that the
-  # args exist in the fit call
-  if (length(args) > 0 & !x$has_dots) {
-    o_names <- names(args)
-    missing_args <- o_names[!(o_names %in% names(x$fit))]
-    if (length(missing_args) > 0) {
-      args[o_names %in% missing_args] <- NULL
-      warning(
-        "Some argument(s) do not correspond to this function: ",
-        paste0("`", o_names, "`", collapse = ", "),
-        call. = FALSE
-      )
-    }
-  }
   args
 }
-
-
-

R/engines.R

@@ -1,14 +1,26 @@
 
 get_model_objects <-  function (x, engine)  {
-  if (x$mode == "unknown") 
-    stop("Please specify a mode for the model (e.g. regression, classification, etc.) ", 
+  if (x$mode == "unknown")
+    stop("Please specify a mode for the model (e.g. regression, classification, etc.) ",
          "so that the model code can be finalized", call. = FALSE)
   cls <- specifc_model(x)
   nm <- paste(cls, engine, "constr", sep = "_")
   res <- try(get(nm), silent = TRUE)
-  if (inherits(res, "try-error")) 
+  if (inherits(res, "try-error"))
     stop("Can't find model object ", nm)
-  res()
+  res
+}
+
+get_model_fit_info <-  function (x, engine)  {
+  if (x$mode == "unknown")
+    stop("Please specify a mode for the model (e.g. regression, classification, etc.) ",
+         "so that the model code can be finalized", call. = FALSE)
+  cls <- specifc_model(x)
+  nm <- paste(cls, engine, "fit", sep = "_")
+  res <- try(get(nm), silent = TRUE)
+  if (inherits(res, "try-error"))
+    stop("Can't find model object ", nm)
+  res
 }
 
 specifc_model <- function(x) {