X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=src%2Ftest%2Fgenerate_test_data%2FgenerateRunSaveTest_EMGrank.R;h=3740b58fcd77781455c1b4ddbf8c7374822416e6;hp=0f97995d5606b3634ecdc5c5929c29465fcd2bd6;hb=c3bc47052f3ccb659659c59a82e9a99ea842398d;hpb=e39bc178cf5de02489ea2dce3869ba6323e18492

diff --git a/src/test/generate_test_data/generateRunSaveTest_EMGrank.R b/src/test/generate_test_data/generateRunSaveTest_EMGrank.R
index 0f97995..3740b58 100644
--- a/src/test/generate_test_data/generateRunSaveTest_EMGrank.R
+++ b/src/test/generate_test_data/generateRunSaveTest_EMGrank.R
@@ -1,35 +1,41 @@
-generateRunSaveTest_EMGrank = function(n=200, p=15, m=10, k=3, mini=5, maxi=10, gamma=1.0, rank = c(1,2,4)){
+generateRunSaveTest_EMGrank = function(n=200, p=15, m=10, k=3, mini=5, maxi=10, gamma=1.0,
+	rank = c(1,2,4))
+{
   testFolder = "data/"
   dir.create(testFolder, showWarnings=FALSE, mode="0755")
-  delimiter = " "
-  
+
   tau = 1e-6
-  
   pi = rep(1.0/k, k)
   rho = array(0, dim=c(m,m,k))
-  
   for(i in 1:k){
     rho[,,i] = diag(1,m)
   }
-
-  #Generate X and Y
 	require(valse)
-  generateIOdef = valse:::generateIOdefault(n, p, m, k)
-  
+  io = valse:::generateIOdefault(n, p, m, k)
+
   #save inputs
-  write.table(paste(testFolder,"rho",sep=""), rho, sep=delimiter)
-  write.table(paste(testFolder,"pi",sep=""), pi, sep=delimiter)
-  write.table(paste(testFolder,"mini",sep=""), mini, sep=delimiter)
-  write.table(paste(testFolder,"maxi",sep=""), maxi, sep=delimiter)
-  write.table(paste(testFolder,"X",sep=""), generateIOdef$X sep=delimiter)
-  write.table(paste(testFolder,"Y",sep=""), generateIOdef$Y, sep=delimiter)
-  write.table(paste(testFolder,"tau",sep=""), tau, sep=delimiter)
-  write.table(paste(testFolder,"rank",sep=""), rank, sep=delimiter)
-  write.table(paste(testFolder,"dimensions",sep=""), c(n,p,m,k), sep=delimiter)
-  
-  EMG_rank = EMG(pi,rho,mini,maxi,X,Y,tau,rank)
-  
+  write.table(as.double(rho), paste(testFolder,"rho",sep=""),
+		row.names=F, col.names=F)
+	write.table(as.double(pi), paste(testFolder,"pi",sep=""),
+		row.names=F, col.names=F)
+  write.table(as.integer(mini), paste(testFolder,"mini",sep=""),
+		row.names=F, col.names=F)
+  write.table(as.integer(maxi), paste(testFolder,"maxi",sep=""),
+		row.names=F, col.names=F)
+  write.table(as.double(io$X), paste(testFolder,"X",sep=""),
+		row.names=F, col.names=F)
+  write.table(as.double(io$Y), paste(testFolder,"Y",sep=""),
+		row.names=F, col.names=F)
+  write.table(as.double(tau), paste(testFolder,"tau",sep=""),
+		row.names=F, col.names=F)
+  write.table(as.integer(rank), paste(testFolder,"rank",sep=""),
+		row.names=F, col.names=F)
+  write.table(as.integer(c(n,p,m,k)), paste(testFolder,"dimensions",sep=""),
+		row.names=F, col.names=F)
+
+  res = EMGrank(pi,rho,mini,maxi,io$X,io$Y,tau,rank)
+
   #save output
-  write.table(paste(testFolder,"phi",sep=""), EMG_rank$phi, sep=delimiter)
-  write.table(paste(testFolder,"LLF",sep=""), EMG_rank$LLF, sep=delimiter)
+  write.table(as.double(res$phi), paste(testFolder,"phi",sep=""), row.names=F,col.names=F)
+  write.table(as.double(res$LLF), paste(testFolder,"LLF",sep=""), row.names=F,col.names=F)
 }