essaiPlot almost ok : add a color per cluster? For now, it is a script

[valse.git] / pkg / R / valse.R

diff --git a/pkg/R/valse.R b/pkg/R/valse.R
index 779f61a..396a9a1 100644 (file)
--- a/pkg/R/valse.R
+++ b/pkg/R/valse.R
@@ -16,7 +16,7 @@
 #' @export
 #-----------------------------------------------------------------------
 valse = function(X,Y,procedure = 'LassoMLE',selecMod = 'DDSE',gamma = 1,mini = 10,
-                 maxi = 100,eps = 1e-4,kmin = 2,kmax = 3,
+                 maxi = 50,eps = 1e-4,kmin = 2,kmax = 3,
                  rang.min = 1,rang.max = 10) {
   ##################################
   #core workflow: compute all models
@@ -45,6 +45,9 @@ valse = function(X,Y,procedure = 'LassoMLE',selecMod = 'DDSE',gamma = 1,mini = 1
     source('~/valse/pkg/R/gridLambda.R')
     grid_lambda <<- gridLambda(phiInit, rhoInit, piInit, gamInit, X, Y, gamma, mini, maxi, eps)
     
+    if (length(grid_lambda)>50){
+      grid_lambda = grid_lambda[seq(1, length(grid_lambda), length.out = 50)]
+    }
     print("Compute relevant parameters")
     #select variables according to each regularization parameter
     #from the grid: A1 corresponding to selected variables, and