removing confusion between snow and parrallel

sylvainschmitt · Oct 19, 2023 · 14ffc6b · 14ffc6b
1 parent c17d8a8
commit 14ffc6b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -30,7 +30,6 @@ exportMethods(stacking)
 exportMethods(sum)
 exportMethods(update)
 import(methods)
-import(snow)
 importFrom(dismo,evaluate)
 importFrom(dismo,maxent)
 importFrom(dismo,threshold)
@@ -70,8 +69,6 @@ importFrom(mgcv,gam)
 importFrom(mgcv,gam.control)
 importFrom(nnet,nnet)
 importFrom(parallel,detectCores)
-importFrom(parallel,makeCluster)
-importFrom(parallel,stopCluster)
 importFrom(poibin,dpoibin)
 importFrom(randomForest,randomForest)
 importFrom(raster,"values<-")
@@ -152,6 +149,8 @@ importFrom(shinydashboard,sidebarMenuOutput)
 importFrom(shinydashboard,tabBox)
 importFrom(shinydashboard,tabItem)
 importFrom(shinydashboard,tabItems)
+importFrom(snow,makeCluster)
+importFrom(snow,stopCluster)
 importFrom(spThin,thin)
 importFrom(stats,aggregate.data.frame)
 importFrom(stats,cor)

diff --git a/R/ensemble_modelling.R b/R/ensemble_modelling.R
@@ -4,7 +4,8 @@
 #' @importFrom foreach foreach %dopar%
 #' @importFrom doParallel registerDoParallel
 #' @importFrom iterators icount
-#' @importFrom parallel detectCores makeCluster stopCluster
+#' @importFrom parallel detectCores
+#' @importFrom snow makeCluster stopCluster
 NULL
 
 #'Build an ensemble SDM that assembles multiple algorithms
@@ -377,7 +378,8 @@ ensemble_modelling <- function(algorithms,
         if (verbose) {
           cat("Modelling :", model.name, "\n\n")
         }
-        modelrep <- foreach::foreach(iterators::icount(rep),.packages = c("raster","SSDM"),
+        modelrep <- foreach::foreach(iterators::icount(rep),
+                                     .packages = c("raster","SSDM"),
                                      .verbose=verbose) %dopar% {
           model <- try(modelling(algorithms[i], Occurrences, Env, Xcol = Xcol,
                                  Ycol = Ycol, Pcol = Pcol, name = NULL, PA = PA,

diff --git a/R/stack_modelling.R b/R/stack_modelling.R
@@ -4,8 +4,8 @@
 #' @importFrom raster stack writeRaster
 #' @importFrom foreach foreach %dopar%
 #' @importFrom doParallel registerDoParallel
-#' @importFrom parallel detectCores makeCluster stopCluster
-#' @import snow
+#' @importFrom parallel detectCores
+#' @importFrom snow makeCluster stopCluster
 NULL
 
 #'Build an SSDM that assembles multiple algorithms and species.