From: emilie <emilie@devijver.org>
Date: Fri, 21 Apr 2017 14:24:06 +0000 (+0200)
Subject: ...
X-Git-Url: https://git.auder.net/?p=valse.git;a=commitdiff_plain;h=43f9cdc196c73bf1074924d4921445d63e89a2f4;hp=c3bf2821bce67c75504e303fae23dd41c00f06c8

...
---

diff --git a/pkg/R/constructionModelesLassoMLE.R b/pkg/R/constructionModelesLassoMLE.R
index 78e11ad..16f58b6 100644
--- a/pkg/R/constructionModelesLassoMLE.R
+++ b/pkg/R/constructionModelesLassoMLE.R
@@ -80,7 +80,7 @@ constructionModelesLassoMLE <- function(phiInit, rhoInit, piInit, gamInit, mini,
       norm_fact <- sum(gam)
       sumLogLLH <- sumLogLLH + log(norm_fact) - log((2 * base::pi)^(m/2))
     }
-    llhLambda <- c(sumLogLLH/n, (dimension + m + 1) * k - 1)
+    llhLambda <- c(-sumLogLLH/n, (dimension + m + 1) * k - 1)
     list(phi = phiLambda, rho = rhoLambda, pi = piLambda, llh = llhLambda)
   }
 
diff --git a/pkg/data/script_data.R b/pkg/data/script_data.R
index 9a95115..6b90712 100644
--- a/pkg/data/script_data.R
+++ b/pkg/data/script_data.R
@@ -10,6 +10,6 @@ Beta[1:4,1:4,1] = 3*diag(4)
 Beta[1:4,1:4,2] = -2*diag(4)
 
 #Data = generateXY(100, c(0.5,0.5), rep(0,p), Beta, diag(p), covY)
-#
+
 #Res = valse(Data$X,Data$Y, fast=FALSE, plot=FALSE, verbose = TRUE, kmax=2, compute_grid_lambda = FALSE, 
 #            grid_lambda = seq(0.2,2,length = 50), size_coll_mod = 50)