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

diff --git a/src/test/generate_test_data/generateRunSaveTest_selectiontotale.R b/src/test/generate_test_data/generateRunSaveTest_selectiontotale.R
index b366ec9..0ea03bf 100644
--- a/src/test/generate_test_data/generateRunSaveTest_selectiontotale.R
+++ b/src/test/generate_test_data/generateRunSaveTest_selectiontotale.R
@@ -1,34 +1,49 @@
-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)){
+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))
+{
+	tau = 1e-6;
+	seuil = 1e-15;
+	require(valse)
+  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")
-  delimiter = " "
-  
-  #Generate phiInit,piInit,...
-  params = basicInitParameters(n, p, m, k)
-  
-  #Generate X and Y
-  generateIOdef = generateIOdefault(n, p, m, k)
-  
   #save inputs
-  write.table(paste(testFolder,"phiInit",sep=""), params$phiInit, sep=delimiter)
-  write.table(paste(testFolder,"rhoInit",sep=""), params$rhoInit, sep=delimiter)
-  write.table(paste(testFolder,"piInit",sep=""), params$piInit, sep=delimiter)
-  write.table(paste(testFolder,"gamInit",sep=""), params$gamInit, sep=delimiter)
-  write.table(paste(testFolder,"mini",sep=""), mini, sep=delimiter)
-  write.table(paste(testFolder,"maxi",sep=""), maxi, sep=delimiter)
-  write.table(paste(testFolder,"gamma",sep=""), gamma, sep=delimiter)
-  write.table(paste(testFolder,"lambda",sep=""), glambda, sep=delimiter)
-  write.table(paste(testFolder,"X",sep=""), io$X, sep=delimiter)
-  write.table(paste(testFolder,"Y",sep=""), io$Y, sep=delimiter)
-  write.table(paste(testFolder,"tau",sep=""), tau, sep=delimiter)
-  write.table(paste(testFolder,"dimensions",sep=""), c(n,p,m,k), sep=delimiter)
-  
-  
-  selec = selectiontotale(params$phiInit,params$rhoInit,params$piInit,params$gamInit,mini,maxi,gamma,glambda,generateIOdef$X,generateIOdef$Y,seuil, tau)
-  
+  write.table(as.double(params$phiInit), paste(testFolder,"phiInit",sep=""),
+		row.names=F, col.names=F)
+  write.table(as.double(params$rhoInit), paste(testFolder,"rhoInit",sep=""),
+		row.names=F, col.names=F)
+  write.table(as.double(params$piInit), paste(testFolder,"piInit",sep=""),
+		row.names=F, col.names=F)
+  write.table(as.double(params$gamInit), paste(testFolder,"gamInit",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(gamma), paste(testFolder,"gamma",sep=""),
+		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(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(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,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,xy$X,xy$Y,seuil, tau)
+
   #save output
-  write.table(paste(testFolder,"A1",sep=""), selec$A1, sep=delimiter)
-  write.table(paste(testFolder,"A2",sep=""), selec$A2, sep=delimiter)
-  write.table(paste(testFolder,"rho",sep=""), selec$rho, sep=delimiter)
-  write.table(paste(testFolder,"pi",sep=""), selec$pi, sep=delimiter)
+  write.table(as.double(res$A1), paste(testFolder,"A1",sep=""), row.names=F, col.names=F)
+  write.table(as.double(res$A2), paste(testFolder,"A2",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)
 }