X-Git-Url: https://git.auder.net/pieces/current/gitweb.js?a=blobdiff_plain;f=code%2Fstage1%2Fwrapper.R;h=524fc90cf8628ae4e71564f72795d916a926fc9f;hb=f9f51b6ab4c7280dd521da675353252d7b078984;hp=9bbb53b035e27b72f76d1dec1b30d6dda3312ba1;hpb=ebf1280e432d51f47238ce8df86750ba3a7d6d1f;p=epclust.git

diff --git a/code/stage1/wrapper.R b/code/stage1/wrapper.R
index 9bbb53b..524fc90 100644
--- a/code/stage1/wrapper.R
+++ b/code/stage1/wrapper.R
@@ -1,13 +1,20 @@
 ppam_exe = function(path=".", np=parallel::detectCores(), data=NULL, args="DontLetMeEmpty")
 {
-	command_line = paste("mpirun -np ",np," ",path,"/ppam.exe",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
 	if (!is.null(data))
 	{
-		write.csv(data, "/tmp/data_csv")
-		system(paste(path,"/ppam.exe serialize /tmp/data_csv /tmp/data_bin 0 0",sep=""))
-		command_line = paste(command_line," ","/tmp/data_bin",sep="")
+		if (!is.character(data))
+		{
+			#assuming matrix or data.frame, WITH row names (identifiers; could be line number...)
+			write.csv(data, "/tmp/data_csv", row.names=TRUE, col.names=FALSE)
+			system(paste(path,"/ppam.exe serialize /tmp/data_csv /tmp/data_bin 0 0",sep=""))
+		} else
+		{
+			system(paste(path,"/ppam.exe serialize ",data," /tmp/data_bin 0 0",sep=""))
+		}
+		command_line = paste(command_line," /tmp/data_bin",sep="")
 	}
 
 	command_line = paste(command_line," ",args,sep="")