X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=src%2Ftest%2Fgenerate_test_data%2FgenerateRunSaveTest_EMGLLF.R;h=fe8f847f66589b07a7b0de324ce90e768cd113b7;hp=f6059e5444b0e5123f7ca3d455f8f66e6f98a0a3;hb=31463ab809c0195273ff2760606ea65361d721ab;hpb=e8bb47649b9f4e625ef050aae096d23cfc058163

diff --git a/src/test/generate_test_data/generateRunSaveTest_EMGLLF.R b/src/test/generate_test_data/generateRunSaveTest_EMGLLF.R
index f6059e5..fe8f847 100644
--- a/src/test/generate_test_data/generateRunSaveTest_EMGLLF.R
+++ b/src/test/generate_test_data/generateRunSaveTest_EMGLLF.R
@@ -1,14 +1,16 @@
+source("EMGLLF.R")
+
 generateRunSaveTest_EMGLLF = function(n=200, p=15, m=10, k=3, mini=5, maxi=10,
 	gamma=1., lambda=0.5, tau=1e-6)
 {
-	testFolder = "data/"
+	testFolder = "../data/"
 	dir.create(testFolder, showWarnings=FALSE, mode="0755")
-	delimiter = " "
 
-	#save inputs
 	require(valse)
-	params = valse:::basic_Init_Parameters(n, p, m, k)
-	io = generateIOdefault(n, p, m, k)
+	params = valse:::basicInitParameters(n, p, m, k)
+	xy = valse:::generateXYdefault(n, p, m, k)
+
+	#save inputs
 	write.table(as.double(params$phiInit), paste(testFolder,"phiInit",sep=""),
 		row.names=F, col.names=F)
 	write.table(as.double(params$rhoInit), paste(testFolder,"rhoInit",sep=""),
@@ -25,9 +27,9 @@ 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(lambda), paste(testFolder,"lambda",sep=""),
 		row.names=F, col.names=F)
-	write.table(as.double(io$X), paste(testFolder,"X",sep=""),
+	write.table(as.double(xy$X), paste(testFolder,"X",sep=""),
 		row.names=F, col.names=F)
-	write.table(as.double(io$Y), paste(testFolder,"Y",sep=""),
+	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)
@@ -35,7 +37,7 @@ generateRunSaveTest_EMGLLF = function(n=200, p=15, m=10, k=3, mini=5, maxi=10,
 		row.names=F, col.names=F)
 
 	res = EMGLLF(params$phiInit,params$rhoInit,params$piInit,params$gamInit,mini,maxi,
-		gamma,lambda,io$X,io$Y,tau)
+		gamma,lambda,xy$X,xy$Y,tau)
 
 	#save outputs
 	write.table(as.double(res$phi), paste(testFolder,"phi",sep=""), row.names=F, col.names=F)