X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=src%2Ftest%2Fgenerate_test_data%2FgenerateRunSaveTest_EMGrank.R;h=99da9bc3a9b6161e35d320650d458b1d9c4fdda0;hp=6fc812a88321dfd3cdd0271d61a95c4be28c3508;hb=31463ab809c0195273ff2760606ea65361d721ab;hpb=f1b906da691f13c6eae25899188d1c071e79b04e

diff --git a/src/test/generate_test_data/generateRunSaveTest_EMGrank.R b/src/test/generate_test_data/generateRunSaveTest_EMGrank.R
index 6fc812a..99da9bc 100644
--- a/src/test/generate_test_data/generateRunSaveTest_EMGrank.R
+++ b/src/test/generate_test_data/generateRunSaveTest_EMGrank.R
@@ -1,34 +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)){
-  testFolder = "data/"
-  dir.create(testFolder, showWarnings=FALSE, mode="0755")
-  delimiter = " "
-  
+source("EMGrank.R")
+
+generateRunSaveTest_EMGrank = function(n=200, p=15, m=10, k=3, mini=5, maxi=10, gamma=1.0,
+	rank = c(1,2,4))
+{
   tau = 1e-6
-  
   pi = rep(1.0/k, k)
-  rho = array(0, dim=c(m,m,k))
-  
-  for(i in 1:k){
+  rho = array(dim=c(m,m,k))
+  for(i in 1:k)
     rho[,,i] = diag(1,m)
-  }
+	require(valse)
+  xy = valse:::generateXYdefault(n, p, m, k)
 
-  #Generate X and Y
-  generateIOdef = generateIOdefault(n, p, m, k)
-  
+  testFolder = "../data/"
+  dir.create(testFolder, showWarnings=FALSE, mode="0755")
   #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(xy$X), paste(testFolder,"X",sep=""),
+		row.names=F, col.names=F)
+  write.table(as.double(xy$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,xy$X,xy$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)
 }