X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=pkg%2FR%2Fmain.R;h=701a2c93e78262950eec17d3013ee97f2a86ac3d;hp=6ff15b3585c7c7c41d6bca1cdd8e145f3da6d571;hb=0e0fb59a6ea0a975d1a9059153aa27f54458bf95;hpb=71a323e6bf09ec67567504c8cad25bfee5b5edce

diff --git a/pkg/R/main.R b/pkg/R/main.R
index 6ff15b3..701a2c9 100644
--- a/pkg/R/main.R
+++ b/pkg/R/main.R
@@ -27,7 +27,7 @@
 #' @export
 valse = function(X, Y, procedure='LassoMLE', selecMod='DDSE', gamma=1, mini=10, maxi=50,
 	eps=1e-4, kmin=2, kmax=4, rang.min=1, rang.max=10, ncores_outer=1, ncores_inner=1,
-	size_coll_mod=50, fast=TRUE, verbose=FALSE)
+	size_coll_mod=50, fast=TRUE, verbose=FALSE, plot = TRUE)
 {
   p = dim(X)[2]
   m = dim(Y)[2]
@@ -123,7 +123,7 @@ valse = function(X, Y, procedure='LassoMLE', selecMod='DDSE', gamma=1, mini=10,
 		data.frame(model=paste(i,".",seq_along(models),sep=""),
 			pen=sumPen/n, complexity=sumPen, contrast=LLH)
 	} ) )
-print(tableauRecap)
+
   modSel = capushe::capushe(tableauRecap, n)
   indModSel <-
 		if (selecMod == 'DDSE')
@@ -137,6 +137,9 @@ print(tableauRecap)
 
   mod = as.character(tableauRecap[indModSel,1])
   listMod = as.integer(unlist(strsplit(mod, "[.]")))
+  if (plot){
+    print(plot_valse())
+  }
   models_list[[listMod[1]]][[listMod[2]]]
-  models_list
+  
 }