Fixed bug related to preprocessing discussion at the end of issue #575

topepo · Jan 23, 2017 · 7c3ae59 · 7c3ae59
1 parent c393552
commit 7c3ae59
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/caret/DESCRIPTION b/pkg/caret/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: caret
-Version: 6.0-73
-Date: 2016-11-08
+Version: 6.0-75
+Date: 2017-01-23
 Title: Classification and Regression Training
 Author: Max Kuhn. Contributions from Jed Wing, Steve Weston, Andre
     Williams, Chris Keefer, Allan Engelhardt, Tony Cooper, Zachary Mayer,

diff --git a/pkg/caret/R/train.default.R b/pkg/caret/R/train.default.R
@@ -295,7 +295,7 @@ train.default <- function(x, y,
     warning("Models using Weka will not work with parallel processing with multicore/doMC")
   flush.console()
 
-  if(!is.null(preProcess) && !(all(preProcess %in% ppMethods)))
+  if(!is.null(preProcess) && !(all(names(preProcess) %in% ppMethods)))
     stop(paste('pre-processing methods are limited to:', paste(ppMethods, collapse = ", ")))
   if(modelType == "Classification") {
     ## We should get and save the class labels to ensure that predictions are coerced