X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=test%2FgenerateRunSaveTest_EMGrank.R;h=9969620153576a4b650bb795f12c54cb059b65d1;hp=becf62ab692244d320e02d683fbe4bd133347d14;hb=6279ba8656582370e7242ff9e77d22c23fe8ca04;hpb=aa480ac1fef50618978307a4df2cf9da1e285abc

diff --git a/test/generateRunSaveTest_EMGrank.R b/test/generateRunSaveTest_EMGrank.R
index becf62a..9969620 100644
--- a/test/generateRunSaveTest_EMGrank.R
+++ b/test/generateRunSaveTest_EMGrank.R
@@ -1,14 +1,14 @@
 source("helper.R")
+library(valse)
 
 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
+  eps = 1e-6
   pi = rep(1.0/k, k)
   rho = array(dim=c(m,m,k))
   for(i in 1:k)
     rho[,,i] = diag(1,m)
-	require(valse)
   xy = generateXYdefault(n, p, m, k)
 
   testFolder = "../data/"
@@ -26,16 +26,16 @@ generateRunSaveTest_EMGrank = function(n=200, p=15, m=10, k=3, mini=5, maxi=10,
 		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=""),
+  write.table(as.double(eps), paste(testFolder,"eps",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_R(pi,rho,mini,maxi,xy$X,xy$Y,tau,rank)
+  res = valse::EMGrank(pi,rho,mini,maxi,xy$X,xy$Y,eps,rank,fast=FALSE)
 
   #save output
-  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)
+  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)
 }