X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=pkg%2FR%2Fmain.R;h=387d55329652f5c13a583f4cd710a2cb7fc9c613;hp=bb1e3fe57ef343847bbd1d67e9826d077f80a1ff;hb=6279ba8656582370e7242ff9e77d22c23fe8ca04;hpb=923ed737d0fa335b858204b813c964432488abbe diff --git a/pkg/R/main.R b/pkg/R/main.R index bb1e3fe..387d553 100644 --- a/pkg/R/main.R +++ b/pkg/R/main.R @@ -51,7 +51,7 @@ valse <- function(X, Y, procedure = "LassoMLE", selecMod = "DDSE", gamma = 1, mi computeModels <- function(k) { if (ncores_outer > 1) - require("valse") #nodes start with an empty environment + require("valse") #nodes start with an empty environment if (verbose) print(paste("Parameters initialization for k =", k)) @@ -123,8 +123,7 @@ valse <- function(X, Y, procedure = "LassoMLE", selecMod = "DDSE", gamma = 1, mi complexity = sumPen, contrast = -LLH) })) tableauRecap <- tableauRecap[which(tableauRecap[, 4] != Inf), ] - - + if (verbose == TRUE) print(tableauRecap) modSel <- capushe::capushe(tableauRecap, n) @@ -141,11 +140,11 @@ valse <- function(X, Y, procedure = "LassoMLE", selecMod = "DDSE", gamma = 1, mi { modSel@AIC_capushe$model } - + listMod <- as.integer(unlist(strsplit(as.character(indModSel), "[.]"))) modelSel <- models_list[[listMod[1]]][[listMod[2]]] modelSel$tableau <- tableauRecap - + if (plot) print(plot_valse(X, Y, modelSel, n))