X-Git-Url: https://git.auder.net/?p=valse.git;a=blobdiff_plain;f=pkg%2FR%2Fvalse.R;h=445ea263641256863777258e682c356de2f43a8e;hp=f84c2c5de991bfcb973a316d8858bed79ad3264e;hb=f33f35efc9a01f93bb61959522d90ee6a76b892e;hpb=1c45d8e4f6fd4209d26709f17a58920218ee828d diff --git a/pkg/R/valse.R b/pkg/R/valse.R index f84c2c5..445ea26 100644 --- a/pkg/R/valse.R +++ b/pkg/R/valse.R @@ -47,8 +47,7 @@ valse = function(X,Y,procedure,selecMod,gamma = 1,mini = 10, #from the grid: A1 corresponding to selected variables, and #A2 corresponding to unselected variables. params = selectiontotale(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,gridLambda,X,Y,1e-8,eps) - A1 <<- params$A1 - A2 <<- params$A2 + selected <<- params$selected Rho <<- params$Rho Pi <<- params$Pi @@ -58,7 +57,7 @@ valse = function(X,Y,procedure,selecMod,gamma = 1,mini = 10, #Estimator, restricted on selected variables. model = constructionModelesLassoMLE( phiInit, rhoInit,piInit,tauInit,mini,maxi, - gamma,gridLambda,X,Y,thresh,eps,A1,A2) + gamma,gridLambda,X,Y,thresh,eps,selected) ################################################ ### Regarder la SUITE r1 = runProcedure1()