X-Git-Url: https://git.auder.net/?a=blobdiff_plain;ds=sidebyside;f=pkg%2FR%2FcomputeGridLambda.R;h=9d06aed09139fee73571700e8c8e70136f65d0f4;hb=4d9db27f0d1749e5577038dedbc5f4d0826f2772;hp=a051441201ef7793d337dea0811be4d9a913c888;hpb=0eb161e3f3d018bce7d98fc85622d14910f89d43;p=valse.git

diff --git a/pkg/R/computeGridLambda.R b/pkg/R/computeGridLambda.R
index a051441..9d06aed 100644
--- a/pkg/R/computeGridLambda.R
+++ b/pkg/R/computeGridLambda.R
@@ -17,16 +17,15 @@
 #'
 #' @export
 computeGridLambda = function(phiInit, rhoInit, piInit, gamInit, X, Y,
-	gamma, mini, maxi, tau)
+	gamma, mini, maxi, tau, fast=TRUE)
 {
 	n = nrow(X)
 	p = dim(phiInit)[1]
 	m = dim(phiInit)[2]
 	k = dim(phiInit)[3]
 
-	# TODO: explain why gamma=1 instad of just 'gamma'?
-  list_EMG = EMGLLF(phiInit, rhoInit, piInit, gamInit, mini, maxi,
-		gamma=1, lamba=0, X, Y, tau)
+	list_EMG = EMGLLF(phiInit, rhoInit, piInit, gamInit, mini, maxi,
+		gamma, lambda=0, X, Y, tau, fast)
 	grid = array(0, dim=c(p,m,k))
 	for (i in 1:p)
 	{
@@ -34,6 +33,5 @@ computeGridLambda = function(phiInit, rhoInit, piInit, gamInit, X, Y,
 			grid[i,j,] = abs(list_EMG$S[i,j,]) / (n*list_EMG$pi^gamma)
 	}
 	grid = unique(grid)
-	grid = grid[grid <= 1]
-	grid
+	sort(grid)
 }