X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=test%2Fgenerate_test_data%2FgenerateRunSaveTest_EMGLLF.R;h=8fe1f33bb07def6a41d538ecd1c392c540cddc31;hp=bf68ab34a96e43ae43e8bdc3dd7ef13ed4b1fc65;hb=321e13a991a5a0e6c97225fdca436870e5e805d1;hpb=2e813ad23c796bbed3d5ba685b8fa002bdc6689d

diff --git a/test/generate_test_data/generateRunSaveTest_EMGLLF.R b/test/generate_test_data/generateRunSaveTest_EMGLLF.R
index bf68ab3..8fe1f33 100644
--- a/test/generate_test_data/generateRunSaveTest_EMGLLF.R
+++ b/test/generate_test_data/generateRunSaveTest_EMGLLF.R
@@ -8,8 +8,8 @@ generateRunSaveTest_EMGLLF = function(n=200, p=15, m=10, k=3, mini=5, maxi=10,
 	dir.create(testFolder, showWarnings=FALSE, mode="0755")
 
 	require(valse)
-	params = valse:::basicInitParameters(n, p, m, k)
-	xy = valse:::generateXYdefault(n, p, m, k)
+	params = basicInitParameters(n, p, m, k)
+	xy = generateXYdefault(n, p, m, k)
 
 	#save inputs
 	write.table(as.double(params$phiInit), paste(testFolder,"phiInit",sep=""),
@@ -44,7 +44,7 @@ generateRunSaveTest_EMGLLF = function(n=200, p=15, m=10, k=3, mini=5, maxi=10,
 	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$LLF), paste(testFolder,"LLF",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)
 }