X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=test%2FgenerateRunSaveTest_EMGLLF.R;h=c46b77bbc1995d204e061bd159a9e50541f1f1cd;hp=8a61c1bf87282b19cfeec3414e44faa83b09a446;hb=f32535f2bc8d50470aa87204bbd7971805dbc9ef;hpb=aa480ac1fef50618978307a4df2cf9da1e285abc

diff --git a/test/generateRunSaveTest_EMGLLF.R b/test/generateRunSaveTest_EMGLLF.R
index 8a61c1b..c46b77b 100644
--- a/test/generateRunSaveTest_EMGLLF.R
+++ b/test/generateRunSaveTest_EMGLLF.R
@@ -1,12 +1,11 @@
 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)
+generateRunSaveTest_EMGLLF = function(n=200, p=15, m=10, k=3, mini=5, maxi=10, gamma=1., lambda=0.5, eps=1e-6)
 {
-	testFolder = "../data/"
+	testFolder = "./data/"
 	dir.create(testFolder, showWarnings=FALSE, mode="0755")
 
-	require(valse)
 	params = basicInitParameters(n, p, m, k)
 	xy = generateXYdefault(n, p, m, k)
 
@@ -31,19 +30,19 @@ 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 = EMGLLF_R(params$phiInit,params$rhoInit,params$piInit,params$gamInit,mini,maxi,
-		gamma,lambda,xy$X,xy$Y,tau)
+	res = valse::EMGLLF(params$phiInit,params$rhoInit,params$piInit,params$gamInit,mini,
+		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)
-	write.table(as.double(res$rho), paste(testFolder,"rho",sep=""), row.names=F, col.names=F)
-	write.table(as.double(res$pi), paste(testFolder,"pi",sep=""), row.names=F, col.names=F)
-	write.table(as.double(res$llh), paste(testFolder,"llh",sep=""), row.names=F, col.names=F)
-	write.table(as.double(res$S), paste(testFolder,"S",sep=""), row.names=F, col.names=F)
-	write.table(as.integer(res$affec), paste(testFolder,"affec",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$rho),paste(testFolder,"rho",sep=""),row.names=F,col.names=F)
+	write.table(as.double(res$pi),paste(testFolder,"pi",sep=""),row.names=F,col.names=F)
+	write.table(as.double(res$llh),paste(testFolder,"llh",sep=""),row.names=F,col.names=F)
+	write.table(as.double(res$S),paste(testFolder,"S",sep=""),row.names=F,col.names=F)
+	write.table(as.integer(res$affec),paste(testFolder,"affec",sep=""),row.names=F,col.names=F)
 }