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

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

diff --git a/test/generate_test_data/generateRunSaveTest_EMGrank.R b/test/generate_test_data/generateRunSaveTest_EMGrank.R
index 99da9bc..14c1b2a 100644 (file)
--- a/test/generate_test_data/generateRunSaveTest_EMGrank.R
+++ b/test/generate_test_data/generateRunSaveTest_EMGrank.R
@@ -1,4 +1,5 @@
 source("EMGrank.R")
+source("helper.R")
 
 generateRunSaveTest_EMGrank = function(n=200, p=15, m=10, k=3, mini=5, maxi=10, gamma=1.0,
        rank = c(1,2,4))
@@ -9,7 +10,7 @@ generateRunSaveTest_EMGrank = function(n=200, p=15, m=10, k=3, mini=5, maxi=10,
   for(i in 1:k)
     rho[,,i] = diag(1,m)
        require(valse)
-  xy = valse:::generateXYdefault(n, p, m, k)
+  xy = generateXYdefault(n, p, m, k)
 
   testFolder = "../data/"
   dir.create(testFolder, showWarnings=FALSE, mode="0755")
@@ -33,7 +34,7 @@ generateRunSaveTest_EMGrank = 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 = EMGrank(pi,rho,mini,maxi,xy$X,xy$Y,tau,rank)
+  res = EMGrank_R(pi,rho,mini,maxi,xy$X,xy$Y,tau,rank)
 
   #save output
   write.table(as.double(res$phi), paste(testFolder,"phi",sep=""), row.names=F,col.names=F)