X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=pkg%2FR%2Fmain.R;h=a2e56973959b6e4b0a4f454b6bc80e56c682f778;hp=2ae01e6e8c509f97b06c6ee4232d7c4b86ec7cfa;hb=a6b60f91ff8d798a3dcb7da6acbc03fba8a0459d;hpb=4c9cc558a39c034ed75d0d5531fa0ce29d8561fc diff --git a/pkg/R/main.R b/pkg/R/main.R index 2ae01e6..a2e5697 100644 --- a/pkg/R/main.R +++ b/pkg/R/main.R @@ -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') @@ -138,7 +138,7 @@ print(tableauRecap) mod = as.character(tableauRecap[indModSel,1]) listMod = as.integer(unlist(strsplit(mod, "[.]"))) if (plot){ - print(plot_valse()) + print(plot_valse(models_list[[listMod[1]]][[listMod[2]]],n)) } models_list[[listMod[1]]][[listMod[2]]]