Skip to content

Commit

Permalink
removing confusion between snow and parrallel
Browse files Browse the repository at this point in the history
  • Loading branch information
sylvainschmitt committed Oct 19, 2023
1 parent c17d8a8 commit 14ffc6b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
5 changes: 2 additions & 3 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ exportMethods(stacking)
exportMethods(sum)
exportMethods(update)
import(methods)
import(snow)
importFrom(dismo,evaluate)
importFrom(dismo,maxent)
importFrom(dismo,threshold)
Expand Down Expand Up @@ -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<-")
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 4 additions & 2 deletions R/ensemble_modelling.R
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions R/stack_modelling.R
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 14ffc6b

Please sign in to comment.