From 2b01d0472d043ce2a8f78ee8e5d0290d0d2a2975 Mon Sep 17 00:00:00 2001 From: topepo Date: Sat, 6 Oct 2018 14:04:21 -0400 Subject: [PATCH] made fit_xy generic --- NAMESPACE | 1 + R/fit.R | 7 ------- R/redirects.R | 3 --- R/reexports.R | 7 +++++++ man/fit.Rd | 3 --- man/reexports.Rd | 7 ++++--- 6 files changed, 12 insertions(+), 16 deletions(-) delete mode 100644 R/redirects.R diff --git a/NAMESPACE b/NAMESPACE index d85c7a7dc..f8b57d3f8 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -104,6 +104,7 @@ importFrom(dplyr,summarise) importFrom(dplyr,tally) importFrom(dplyr,vars) importFrom(generics,fit) +importFrom(generics,fit_xy) importFrom(glue,glue_collapse) importFrom(magrittr,"%>%") importFrom(purrr,as_vector) diff --git a/R/fit.R b/R/fit.R index a13c84d6c..6a4efb921 100644 --- a/R/fit.R +++ b/R/fit.R @@ -169,13 +169,6 @@ fit.model_spec <- # ------------------------------------------------------------------------------ -#' @rdname fit -#' @export -#' @inheritParams fit.model_spec -#' -fit_xy <- function(object, ...) - UseMethod("fit_xy") - #' @rdname fit #' @export #' @export fit_xy.model_spec diff --git a/R/redirects.R b/R/redirects.R deleted file mode 100644 index 31cdce4e7..000000000 --- a/R/redirects.R +++ /dev/null @@ -1,3 +0,0 @@ -#' @importFrom generics fit -#' @export -generics::fit \ No newline at end of file diff --git a/R/reexports.R b/R/reexports.R index 0abea2aa0..01176ce56 100644 --- a/R/reexports.R +++ b/R/reexports.R @@ -3,3 +3,10 @@ #' @export magrittr::`%>%` +#' @importFrom generics fit +#' @export +generics::fit + +#' @importFrom generics fit_xy +#' @export +generics::fit_xy diff --git a/man/fit.Rd b/man/fit.Rd index 28604317d..1a003b45d 100644 --- a/man/fit.Rd +++ b/man/fit.Rd @@ -2,15 +2,12 @@ % Please edit documentation in R/fit.R \name{fit.model_spec} \alias{fit.model_spec} -\alias{fit_xy} \alias{fit_xy.model_spec} \title{Fit a Model Specification to a Dataset} \usage{ \method{fit}{model_spec}(object, formula = NULL, data = NULL, engine = object$engine, control = fit_control(), ...) -fit_xy(object, ...) - \method{fit_xy}{model_spec}(object, x = NULL, y = NULL, engine = object$engine, control = fit_control(), ...) } diff --git a/man/reexports.Rd b/man/reexports.Rd index eec08fe92..19e6ab766 100644 --- a/man/reexports.Rd +++ b/man/reexports.Rd @@ -1,10 +1,11 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/redirects.R, R/reexports.R +% Please edit documentation in R/reexports.R \docType{import} \name{reexports} \alias{reexports} -\alias{fit} \alias{\%>\%} +\alias{fit} +\alias{fit_xy} \title{Objects exported from other packages} \keyword{internal} \description{ @@ -12,7 +13,7 @@ These objects are imported from other packages. Follow the links below to see their documentation. \describe{ - \item{generics}{\code{\link[generics]{fit}}} + \item{generics}{\code{\link[generics]{fit}}, \code{\link[generics]{fit_xy}}} \item{magrittr}{\code{\link[magrittr]{\%>\%}}} }}