From: emilie Date: Fri, 21 Apr 2017 14:23:12 +0000 (+0200) Subject: ... X-Git-Url: https://git.auder.net/js/current/app_dev.php/css/doc/%3C?a=commitdiff_plain;h=57a8adeb0e558a54f9481e0256e258525aeb8cd1;p=valse.git ... --- diff --git a/pkg/R/constructionModelesLassoMLE.R b/pkg/R/constructionModelesLassoMLE.R index c55035e..0197e1a 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) # densite <- vector("double", n) # for (r in 1:k) # { 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)