X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=test%2FgenerateRunSaveTest_EMGLLF.R;h=674a72606b681da05f492fc08a47a306c9932fb6;hp=bf37b5f43ff02c3320d598e29ee6212c07bffe2a;hb=6279ba8656582370e7242ff9e77d22c23fe8ca04;hpb=a3105972158da4773b33d41e1ead65a942c15f80

diff --git a/test/generateRunSaveTest_EMGLLF.R b/test/generateRunSaveTest_EMGLLF.R
index bf37b5f..674a726 100644
--- a/test/generateRunSaveTest_EMGLLF.R
+++ b/test/generateRunSaveTest_EMGLLF.R
@@ -2,9 +2,9 @@ source("helper.R")
 library(valse)
 
 generateRunSaveTest_EMGLLF = function(n=200, p=15, m=10, k=3, mini=5, maxi=10,
-	gamma=1., lambda=0.5, tau=1e-6)
+	gamma=1., lambda=0.5, eps=1e-6)
 {
-	testFolder = "../data/"
+	testFolder = "data/"
 	dir.create(testFolder, showWarnings=FALSE, mode="0755")
 
 	params = basicInitParameters(n, p, m, k)
@@ -31,13 +31,13 @@ generateRunSaveTest_EMGLLF = 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(c(n,p,m,k)), paste(testFolder,"dimensions",sep=""),
 		row.names=F, col.names=F)
 
 	res = valse::EMGLLF(params$phiInit,params$rhoInit,params$piInit,params$gamInit,mini,
-		maxi,gamma,lambda,xy$X,xy$Y,tau,fast=FALSE)
+		maxi,gamma,lambda,xy$X,xy$Y,eps,fast=FALSE)
 
 	#save outputs
 	write.table(as.double(res$phi),paste(testFolder,"phi",sep=""),row.names=F,col.names=F)