From: emilie <emilie@devijver.org>
Date: Thu, 16 Mar 2017 15:58:45 +0000 (+0100)
Subject: Merge branch 'master' of auder.net:valse
X-Git-Url: https://git.auder.net/?p=valse.git;a=commitdiff_plain;h=f33f35efc9a01f93bb61959522d90ee6a76b892e;hp=-c

Merge branch 'master' of auder.net:valse
---

f33f35efc9a01f93bb61959522d90ee6a76b892e
diff --combined pkg/R/valse.R
index 445ea26,f84c2c5..445ea26
--- a/pkg/R/valse.R
+++ b/pkg/R/valse.R
@@@ -47,7 -47,8 +47,7 @@@ valse = function(X,Y,procedure,selecMod
      #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
      
@@@ -57,7 -58,7 +57,7 @@@
        #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()