X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=pkg%2FR%2FconstructionModelesLassoMLE.R;h=227dfdcfeb7c0a331b4c277eb4562435769f4931;hb=bb11d873bee8f9560b4b77a304d035be6a69f440;hp=06d552d1e87890f5b8d916bea8bdee28b95f2a75;hpb=b9b0b72a2c8f7f0d1a3216528aefcec0a92c6c99;p=valse.git

diff --git a/pkg/R/constructionModelesLassoMLE.R b/pkg/R/constructionModelesLassoMLE.R
index 06d552d..227dfdc 100644
--- a/pkg/R/constructionModelesLassoMLE.R
+++ b/pkg/R/constructionModelesLassoMLE.R
@@ -8,7 +8,7 @@
 #'
 #' export
 constructionModelesLassoMLE = function(phiInit, rhoInit, piInit, gamInit, mini, maxi,
-	gamma, X, Y, thresh, tau, S, ncores=3, artefact = 1e3, verbose=FALSE)
+	gamma, X, Y, thresh, tau, S, ncores=3, fast=TRUE, verbose=FALSE)
 {
 	if (ncores > 1)
 	{
@@ -41,7 +41,7 @@ constructionModelesLassoMLE = function(phiInit, rhoInit, piInit, gamInit, mini,
 
 		# lambda == 0 because we compute the EMV: no penalization here
 		res = EMGLLF(phiInit[col.sel,,],rhoInit,piInit,gamInit,mini,maxi,gamma,0,
-			X[,col.sel],Y,tau)
+			X[,col.sel], Y, tau, fast)
 		
 		# Eval dimension from the result + selected
 		phiLambda2 = res$phi
@@ -56,12 +56,11 @@ constructionModelesLassoMLE = function(phiInit, rhoInit, piInit, gamInit, mini,
 		densite = vector("double",n)
 		for (r in 1:k)
 		{
-			delta = (Y%*%rhoLambda[,,r] - (X[, col.sel]%*%phiLambda[col.sel,,r]))/artefact
-			print(max(delta))
+			delta = (Y%*%rhoLambda[,,r] - (X[, col.sel]%*%phiLambda[col.sel,,r]))
 			densite = densite + piLambda[r] *
-				det(rhoLambda[,,r])/(sqrt(2*base::pi))^m * exp(-tcrossprod(delta)/2.0)
+				det(rhoLambda[,,r])/(sqrt(2*base::pi))^m * exp(-diag(tcrossprod(delta))/2.0)
 		}
-		llhLambda = c( sum(artefact^2 * log(densite)), (dimension+m+1)*k-1 )
+		llhLambda = c( sum(log(densite)), (dimension+m+1)*k-1 )
 		list("phi"= phiLambda, "rho"= rhoLambda, "pi"= piLambda, "llh" = llhLambda)
 	}