firx error in slave.c

[epclust.git] / old_C_code / wrapper.R

diff --git a/old_C_code/stage1/wrapper.R b/old_C_code/wrapper.R
similarity index 89%
rename from old_C_code/stage1/wrapper.R
rename to old_C_code/wrapper.R
index ec859dc..ee15a79 100644 (file)
--- a/old_C_code/stage1/wrapper.R
+++ b/old_C_code/wrapper.R
@@ -1,6 +1,8 @@
 ppam_exe = function(path=".", np=parallel::detectCores(), data=NULL,
-       args="DontLetMeEmptyPlease!")
+       nbSeriesPerChunk, nbClusters, randomize=1, p_dissims=2)
 {
+       args = paste(nbSeriesPerChunk," ",nbClusters," ",randomize," ",p_dissims,sep="")
+
        command_line = paste("mpirun -np ",np," ",path,"/ppam.exe cluster",sep="")
 
        #if data provided (as data.frame or matrix...): binarize it, and add it as first argument
@@ -46,8 +48,9 @@ serialize = function(path=".", csvSeries, binSeries, byCols=0, nbSeries=0)
                sep=""))
 }
 
-deserialize = function(path=".", binSeries, csvSeries, ranks="-1")
+deserialize = function(path=".", binSeries, csvSeries, ranks="-1", return=TRUE)
 {
        system(paste(path,"/ppam.exe deserialize ",binSeries," ",csvSeries," ",ranks,sep=""))
-       return ( read.table(csvSeries, sep=",") )
+       if (return)
+               return ( read.table(csvSeries, sep=",") )
 }