OOB training is now reproducible if done in parallel

topepo · Jan 19, 2016 · ee15ecb · ee15ecb
1 parent aa665b9
commit ee15ecb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/pkg/caret/R/train.default.R b/pkg/caret/R/train.default.R
@@ -329,7 +329,7 @@ train.default <- function(x, y,
     } else trainInfo <- list(loop = tuneGrid)
 
 
-    num_rs <- length(trControl$index)
+    num_rs <- if(trControl$method != "oob") length(trControl$index) else 1L
     if(trControl$method == "boot632") num_rs <- num_rs + 1L
     ## Set or check the seeds when needed
     if(is.null(trControl$seeds) || all(is.na(trControl$seeds)))  {

diff --git a/pkg/caret/R/workflows.R b/pkg/caret/R/workflows.R
@@ -526,6 +526,8 @@ oobTrainWorkflow <- function(x, y, wts, info, method, ppOpts, ctrl, lev, testing
   loadNamespace("caret")
   if(ctrl$verboseIter) progress(printed[parm,,drop = FALSE], "", 1, TRUE)
 
+  if(!(length(ctrl$seeds) == 1 && is.na(ctrl$seeds))) set.seed(ctrl$seeds[[1L]][parm])
+
   mod <- createModel(x = x,
                      y = y,
                      wts = wts,