X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=src%2Ftest%2Fgenerate_test_data%2FgenerateRunSaveTest_selectiontotale.R;h=0ea03bf41b58ec6fbfc8c8d95700a26ef452f15c;hp=bdac898a1df256305a8df28e3adc60b53136ec3b;hb=ef67d338c7f28ba041abe40ca9a8ab69f8365a90;hpb=c3bc47052f3ccb659659c59a82e9a99ea842398d

diff --git a/src/test/generate_test_data/generateRunSaveTest_selectiontotale.R b/src/test/generate_test_data/generateRunSaveTest_selectiontotale.R
index bdac898..0ea03bf 100644
--- a/src/test/generate_test_data/generateRunSaveTest_selectiontotale.R
+++ b/src/test/generate_test_data/generateRunSaveTest_selectiontotale.R
@@ -1,13 +1,15 @@
 generateRunSaveTest_selectiontotale= function(n=200, p=15, m=10, k=3, mini=5, maxi=10, gamma=1.0,
 	glambda=list(0.0,0.01,0.02,0.03,0.05,0.1,0.2,0.3,0.5,0.7,0.85,0.99))
 {
-  testFolder = "data/"
-  dir.create(testFolder, showWarnings=FALSE, mode="0755")
-
+	tau = 1e-6;
+	seuil = 1e-15;
 	require(valse)
-  params = valse:::basic_Init_Parameters(n, p, m, k)
-  io = valse:::generateIOdefault(n, p, m, k)
+  params = valse:::basicInitParameters(n, p, m, k)
+  xy = valse:::generateXYdefault(n, p, m, k)
+	L = length(glambda)
 
+  testFolder = "data/"
+  dir.create(testFolder, showWarnings=FALSE, mode="0755")
   #save inputs
   write.table(as.double(params$phiInit), paste(testFolder,"phiInit",sep=""),
 		row.names=F, col.names=F)
@@ -25,17 +27,19 @@ generateRunSaveTest_selectiontotale= function(n=200, p=15, m=10, k=3, mini=5, ma
 		row.names=F, col.names=F)
   write.table(as.double(glambda), paste(testFolder,"lambda",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(xy$Y), paste(testFolder,"Y",sep=""),
 		row.names=F, col.names=F)
-  write.table(as.double(io$Y), paste(testFolder,"Y",sep=""),
+  write.table(as.double(seuil), paste(testFolder,"seuil",sep=""),
 		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,"dimensions",sep=""),
+  write.table(as.integer(c(n,p,m,k,L)), paste(testFolder,"dimensions",sep=""),
 		row.names=F, col.names=F)
 
   res = selectiontotale(params$phiInit,params$rhoInit,params$piInit,params$gamInit,
-		mini,maxi,gamma,glambda,io$X,io$Y,seuil, tau)
+		mini,maxi,gamma,glambda,xy$X,xy$Y,seuil, tau)
 
   #save output
   write.table(as.double(res$A1), paste(testFolder,"A1",sep=""), row.names=F, col.names=F)