Skip to content
Snippets Groups Projects
Commit 4d5ead3f authored by Francesco Sabatini's avatar Francesco Sabatini
Browse files

Fixed bug in 01b cluster

parent bcea35ca
Branches
No related tags found
No related merge requests found
...@@ -55,7 +55,7 @@ get.best <- function(x, N){ ...@@ -55,7 +55,7 @@ get.best <- function(x, N){
Mesobromion <- function(species.path, traits.path, output, myfunction="get.corXY.bootstrap", Mesobromion <- function(species.path, traits.path, output, myfunction="get.corXY.bootstrap",
combinations=c("all", "sequential"), max.inter.t, chunkn, chunk.i, nperm=199, ncores=1){ combinations=c("all", "sequential"), max.inter.t, chunkn, chunk.i, nperm=199, ncores){
if(ncores>1){ if(ncores>1){
require(parallel) require(parallel)
...@@ -151,7 +151,7 @@ Mesobromion <- function(species.path, traits.path, output, myfunction="get.corXY ...@@ -151,7 +151,7 @@ Mesobromion <- function(species.path, traits.path, output, myfunction="get.corXY
## start main foreach loop ## start main foreach loop
print(paste("Start main loop - round", nround)) print(paste("Start main loop - round", nround))
corXY.output <- foreach(ch=1:length(allcomb.t, .combine=rbind) %myinfix% { corXY.output <- foreach(ch=1:length(allcomb.t), .combine=rbind) %myinfix% {
allcomb.i <- allcomb.t[ch] allcomb.i <- allcomb.t[ch]
print(paste("Running on", length(allcomb.i),"out of", nall, "combinations")) print(paste("Running on", length(allcomb.i),"out of", nall, "combinations"))
......
...@@ -88,8 +88,5 @@ ncores <- cli$options$ncores ...@@ -88,8 +88,5 @@ ncores <- cli$options$ncores
source("01b_MesobromionCluster.R") source("01b_MesobromionCluster.R")
Mesobromion(species.path, traits.path, output, myfunction, combinations, max.inter.t,
chunkn, chunk.i, nperm)
Mesobromion(species.path, traits.path, output, myfunction, combinations, max.inter.t, Mesobromion(species.path, traits.path, output, myfunction, combinations, max.inter.t,
chunkn, chunk.i, nperm, ncores) chunkn, chunk.i, nperm, ncores)
...@@ -24,6 +24,7 @@ Rscript \ ...@@ -24,6 +24,7 @@ Rscript \
--chunk.i NA \ --chunk.i NA \
--chunkn 32 \ --chunkn 32 \
--nperm 99 \ --nperm 99 \
--ncores ${NSLOTS:-1} \
/data/splot/HIDDEN/species.out.10perc.txt \ /data/splot/HIDDEN/species.out.10perc.txt \
/data/splot/HIDDEN/traits.out.10perc.txt \ /data/splot/HIDDEN/traits.out.10perc.txt \
"$output" \ "$output" \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment