prepare EMGLLF / EMGrank wrappers, simplify folder generateTestData

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

diff --git a/src/test/generate_test_data/generateRunSaveTest_EMGLLF.R b/src/test/generate_test_data/generateRunSaveTest_EMGLLF.R
index 49e2258..fe8f847 100644 (file)
--- a/src/test/generate_test_data/generateRunSaveTest_EMGLLF.R
+++ b/src/test/generate_test_data/generateRunSaveTest_EMGLLF.R
@@ -1,7 +1,9 @@
+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")
 
        require(valse)
@@ -31,7 +33,7 @@ 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(tau), paste(testFolder,"tau",sep=""),
                row.names=F, col.names=F)
-       write.table(as.integer(c(n,p,m,k)), paste(testFolder,"dimensxyns",sep=""),
+       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,