add mapply to parallelCheck

SantanderMetGroup · Feb 1, 2018 · 23531ca · 23531ca
1 parent 72b2b0a
commit 23531ca
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/R/helpers.R b/R/helpers.R
@@ -382,8 +382,8 @@ getRefDates <- function(obj, which = "start") {
 #' @export
 #' @author J. Bedia
 
-selectPar.pplyFun <- function(parallel.pars, .pplyFUN = c("apply", "lapply", "sapply")) {
-      .pplyFUN <- match.arg(.pplyFUN, choices = c("apply", "lapply", "sapply"))
+selectPar.pplyFun <- function(parallel.pars, .pplyFUN = c("apply", "lapply", "sapply", "mapply")) {
+      .pplyFUN <- match.arg(.pplyFUN, choices = c("apply", "lapply", "sapply", "mapply"))
       if (parallel.pars$hasparallel) {
             if (.pplyFUN == "apply") {
                   fun <- function(...) {
@@ -397,12 +397,17 @@ selectPar.pplyFun <- function(parallel.pars, .pplyFUN = c("apply", "lapply", "sa
                   fun <- function(...) {
                         parallel::parSapply(cl = parallel.pars$cl, ...)
                   }
+            } else if (.pplyFUN == "mapply") {
+                  fun <- function(...) {
+                        parallel::clusterMap(cl = parallel.pars$cl, ..., SIMPLIFY = TRUE)
+                  }
             }
       } else {
             fun <- switch(.pplyFUN,
                           "apply" = apply,
                           "lapply" = lapply,
-                          "sapply" = sapply)
+                          "sapply" = sapply,
+                          "mapply" = mapply)
       }
       return(fun)
 }

diff --git a/man/convert2bin.Rd b/man/convert2bin.Rd
diff --git a/man/dataSplit.Rd b/man/dataSplit.Rd
diff --git a/man/filterNA.Rd b/man/filterNA.Rd
diff --git a/man/makeMultiGrid.Rd b/man/makeMultiGrid.Rd
diff --git a/man/selectPar.pplyFun.Rd b/man/selectPar.pplyFun.Rd