From: Benjamin Auder <benjamin.auder@somewhere>
Date: Fri, 21 Apr 2017 15:14:10 +0000 (+0200)
Subject: Merge branch 'master' of auder.net:valse
X-Git-Url: https://git.auder.net/?p=valse.git;a=commitdiff_plain;h=c3bf2821bce67c75504e303fae23dd41c00f06c8;hp=9cb34faffaa6fcb78eb8ae3bdb70fb5147d73466

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

diff --git a/pkg/R/constructionModelesLassoMLE.R b/pkg/R/constructionModelesLassoMLE.R
index 75ae679..78e11ad 100644
--- a/pkg/R/constructionModelesLassoMLE.R
+++ b/pkg/R/constructionModelesLassoMLE.R
@@ -77,7 +77,6 @@ constructionModelesLassoMLE <- function(phiInit, rhoInit, piInit, gamInit, mini,
       
       logGam <- logGam - max(logGam) #adjust without changing proportions
       gam <- exp(logGam)
-      print(gam)
       norm_fact <- sum(gam)
       sumLogLLH <- sumLogLLH + log(norm_fact) - log((2 * base::pi)^(m/2))
     }
diff --git a/pkg/data/script_data.R b/pkg/data/script_data.R
index 1585337..9a95115 100644
--- a/pkg/data/script_data.R
+++ b/pkg/data/script_data.R
@@ -9,7 +9,7 @@ Beta = array(0, dim = c(p, m, 2))
 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)
+#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)