X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=pkg%2FR%2Fmain.R;h=c74d7fbeb8fd32406365acfbd2f47e6a1388225a;hp=8649342b8d727ce79bdd00fe94c3753c6412485a;hb=3921ba9b5ea85bcc190245ac7da9ee9da1658b9f;hpb=f32535f2bc8d50470aa87204bbd7971805dbc9ef

diff --git a/pkg/R/main.R b/pkg/R/main.R
index 8649342..c74d7fb 100644
--- a/pkg/R/main.R
+++ b/pkg/R/main.R
@@ -1,4 +1,4 @@
-#' valse
+#' runValse
 #'
 #' Main function
 #'
@@ -21,13 +21,15 @@
 #' @param size_coll_mod (Maximum) size of a collection of models
 #' @param fast TRUE to use compiled C code, FALSE for R code only
 #' @param verbose TRUE to show some execution traces
+#' @param plot TRUE to plot the selected models after run
 #'
 #' @return a list with estimators of parameters
 #'
 #' @examples
 #' #TODO: a few examples
+#'
 #' @export
-valse <- function(X, Y, procedure = "LassoMLE", selecMod = "DDSE", gamma = 1, mini = 10,
+runValse <- function(X, Y, procedure = "LassoMLE", selecMod = "DDSE", gamma = 1, mini = 10,
   maxi = 50, eps = 1e-04, kmin = 2, kmax = 3, rank.min = 1, rank.max = 5, ncores_outer = 1,
   ncores_inner = 1, thresh = 1e-08, grid_lambda = numeric(0), size_coll_mod = 10,
   fast = TRUE, verbose = FALSE, plot = TRUE)
@@ -146,7 +148,7 @@ valse <- function(X, Y, procedure = "LassoMLE", selecMod = "DDSE", gamma = 1, mi
   modelSel$tableau <- tableauRecap
 
   if (plot)
-    print(plot_valse(X, Y, modelSel, n))
+    print(plot_valse(X, Y, modelSel))
 
   return(modelSel)
 }