fix test; EMGLLF.c != EMGLLF.R now...

[valse.git] / test / generate_test_data / generateRunSaveTest_EMGLLF.R

diff --git a/test/generate_test_data/generateRunSaveTest_EMGLLF.R b/test/generate_test_data/generateRunSaveTest_EMGLLF.R
index fe8f847..8fe1f33 100644 (file)
--- a/test/generate_test_data/generateRunSaveTest_EMGLLF.R
+++ b/test/generate_test_data/generateRunSaveTest_EMGLLF.R
@@ -1,4 +1,5 @@
 source("EMGLLF.R")
+source("helper.R")
 
 generateRunSaveTest_EMGLLF = function(n=200, p=15, m=10, k=3, mini=5, maxi=10,
        gamma=1., lambda=0.5, tau=1e-6)
@@ -7,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=""),
@@ -36,13 +37,14 @@ generateRunSaveTest_EMGLLF = function(n=200, p=15, m=10, k=3, mini=5, maxi=10,
        write.table(as.integer(c(n,p,m,k)), paste(testFolder,"dimensions",sep=""),
                row.names=F, col.names=F)
 
-       res = EMGLLF(params$phiInit,params$rhoInit,params$piInit,params$gamInit,mini,maxi,
+       res = EMGLLF_R(params$phiInit,params$rhoInit,params$piInit,params$gamInit,mini,maxi,
                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)
        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)
 }