X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=src%2Ftest%2Fgenerate_test_data%2FgenerateRunSaveTest_constructionModelesLassoRank.R;h=559bd9ec538ef13b968da8d299ddcb8bd006ad24;hp=1a6076ce002b0a14f69d7f88bf0c2893c89d906e;hb=31ef8a5c9bbaefcf40d2c2bad43b27d469c28c34;hpb=c3bc47052f3ccb659659c59a82e9a99ea842398d

diff --git a/src/test/generate_test_data/generateRunSaveTest_constructionModelesLassoRank.R b/src/test/generate_test_data/generateRunSaveTest_constructionModelesLassoRank.R
index 1a6076c..559bd9e 100644
--- a/src/test/generate_test_data/generateRunSaveTest_constructionModelesLassoRank.R
+++ b/src/test/generate_test_data/generateRunSaveTest_constructionModelesLassoRank.R
@@ -1,39 +1,34 @@
-generateRunSaveTest_constructionModelesLassoRank = function(n=200, p=15, m=10, L=12, mini=5,
+source("helpers/constructionModelesLassoRank.R")
+
+generateRunSaveTest_constructionModelesLassoRank = function(n=200, p=15, m=10, k=3, L=12, mini=5,
 	maxi=10, gamma=1.0, rangmin=3, rangmax=6)
 {
-  testFolder = "data/"
-  dir.create(testFolder, showWarnings=FALSE, mode="0755")
-
   tau = 1e-6
-  pi = matrix(0, k,L)
-  for(i in 1:L){
-    pi[,i] = rep(1.0/k, k)
-  }
-  rho = array(0, dim=c(m,m,k,L))
-  for(l in 1:L){
-    for(r in 1:k){
+  pi = matrix(1./k, nrow=k, ncol=L)
+  rho = array(dim=c(m,m,k,L))
+  for (l in 1:L)
+	{
+    for (r in 1:k)
       rho[,,r,l] = diag(1,m)
-    }
   }
+  A1 = matrix(seq_len(p), nrow=p, ncol=L)
 	require(valse)
-  io = valse:::generateIOdefault(n, p, m, k)
-  A1 = matrix(0,p,L)
-  for(i in 1:L){
-    A1[,i] = seq(1,p)
-  }
+  xy = valse:::generateXYdefault(n, p, m, k)
 
+  testFolder = "../data/"
+  dir.create(testFolder, showWarnings=FALSE, mode="0755")
   #save inputs
-  write.table(as.double(rho),paste(testFolder,"rho",sep=""),
-		row.names=F, col.names=F)
   write.table(as.double(pi), paste(testFolder,"pi",sep=""),
 		row.names=F, col.names=F)
+  write.table(as.double(rho),paste(testFolder,"rho",sep=""),
+		row.names=F, col.names=F)
   write.table(as.integer(mini), paste(testFolder,"mini",sep=""),
 		row.names=F, col.names=F)
   write.table(as.integer(maxi), paste(testFolder,"maxi",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)
@@ -43,10 +38,10 @@ generateRunSaveTest_constructionModelesLassoRank = function(n=200, p=15, m=10, L
 		row.names=F, col.names=F)
   write.table(as.integer(rangmax),paste(testFolder,"rangmax",sep=""),
 		row.names=F, col.names=F)
-  write.table(as.integer(c(n,p,m,k)),paste(testFolder,"dimensions",sep=""),
+  write.table(as.integer(c(n,p,m,k,L)),paste(testFolder,"dimensions",sep=""),
 		row.names=F, col.names=F)
 
-  res = constructionModelesLassoRank(pi,rho,mini,maxi,X,Y,tau,A1,rangmin,rangmax)
+  res = constructionModelesLassoRank(pi,rho,mini,maxi,xy$X,xy$Y,tau,A1,rangmin,rangmax)
 
   #save output
   write.table(as.double(res$phi), paste(testFolder,"phi",sep=""), row.names=F, col.names=F)