imports changes from R-devel changes

topepo · Jul 15, 2015 · aed5b84 · aed5b84
1 parent a84a55f
commit aed5b84
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/pkg/caret/DESCRIPTION b/pkg/caret/DESCRIPTION
@@ -23,7 +23,11 @@ Imports:
     methods,
     plyr,
     nlme,
-    BradleyTerry2
+    BradleyTerry2,
+    stats,
+    stats4,
+    utils,
+    grDevices
 Suggests:
     e1071,
     earth (>= 2.2-3),

diff --git a/pkg/caret/NAMESPACE b/pkg/caret/NAMESPACE
@@ -1,8 +1,20 @@
 useDynLib(caret)
 import(foreach, methods, plyr, reshape2, ggplot2, lattice, nlme, BradleyTerry2)
 importFrom(car, powerTransform, yjPower)
-importFrom(stats, prcomp, hclust)
-
+importFrom(grDevices, extendrange)
+importFrom(stats, .checkMFClasses, .getXlevels, aggregate, anova, 
+           approx, as.formula, binom.test, complete.cases, contrasts, 
+           cor, cov, delete.response, dist, 
+           fitted.values, loess, mahalanobis, 
+           mcnemar.test, median, model.frame, model.matrix, 
+           model.response, model.weights, na.fail, na.pass, optim, 
+           predict, qnorm, quantile, rbinom, reshape, resid, 
+           residuals, rnorm, runif, sd, t.test, terms, 
+           toeplitz, var, na.omit, p.adjust, fitted, prcomp, hclust,
+           lm, model.extract,  pt, update) 
+importFrom(stats4, coef) 
+importFrom(utils, capture.output, getFromNamespace, head, 
+           install.packages, installed.packages, object.size, flush.console, menu, stack) 
 
 export(anovaScores,
        as.data.frame.resamples,
@@ -447,6 +459,9 @@ S3method(negPredValue,    matrix)
 
 S3method(as.table,  confusionMatrix)
 S3method(as.matrix, confusionMatrix)
+S3method(as.matrix, resamples)
+
+S3method(as.data.frame, resamples)
 
 S3method(summary, resamples)
 S3method(summary, bag)