X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=pkg%2FR%2Fmain.R;h=6b683a59a7c0a921e7b867b7ac4cef5ad16ccec6;hb=430a98439a49281c4b17801c95da3e6d9ef88488;hp=634c27396507901537f72d3238c075c187677157;hpb=43d76c49d2f98490abc782c7e8a8b94baee40247;p=valse.git diff --git a/pkg/R/main.R b/pkg/R/main.R index 634c273..6b683a5 100644 --- a/pkg/R/main.R +++ b/pkg/R/main.R @@ -123,6 +123,7 @@ valse = function(X, Y, procedure='LassoMLE', selecMod='DDSE', gamma=1, mini=10, print(tableauRecap) tableauRecap = tableauRecap[which(tableauRecap[,4]!= Inf),] + modSel = capushe::capushe(tableauRecap, n) indModSel <- if (selecMod == 'DDSE') @@ -133,11 +134,11 @@ valse = function(X, Y, procedure='LassoMLE', selecMod='DDSE', gamma=1, mini=10, modSel@BIC_capushe$model else if (selecMod == 'AIC') modSel@AIC_capushe$model - + mod = as.character(tableauRecap[indModSel,1]) listMod = as.integer(unlist(strsplit(mod, "[.]"))) modelSel = models_list[[listMod[1]]][[listMod[2]]] - + ##Affectations Gam = matrix(0, ncol = length(modelSel$pi), nrow = n) for (i in 1:n){ @@ -149,10 +150,10 @@ valse = function(X, Y, procedure='LassoMLE', selecMod='DDSE', gamma=1, mini=10, Gam = Gam/rowSums(Gam) modelSel$affec = apply(Gam, 1,which.max) modelSel$proba = Gam - + if (plot){ print(plot_valse(X,Y,modelSel,n)) } - + return(modelSel) }