X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=pkg%2FR%2FcomputeGridLambda.R;h=b29553505d361f0c0916b666bdcacdf017f49402;hb=9ccdd55a1f6e9d409e8ae43b878a5e89c42e20c7;hp=e2b6303b69ebbe6c140c1aa9a7daeffc28082477;hpb=19041906b8d80eb9a7dac7bffebf3992bcec6ccf;p=valse.git

diff --git a/pkg/R/computeGridLambda.R b/pkg/R/computeGridLambda.R
index e2b6303..b295535 100644
--- a/pkg/R/computeGridLambda.R
+++ b/pkg/R/computeGridLambda.R
@@ -17,7 +17,7 @@
 #'
 #' @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]
@@ -25,13 +25,12 @@ computeGridLambda = function(phiInit, rhoInit, piInit, gamInit, X, Y,
 	k = dim(phiInit)[3]
 
 	list_EMG = EMGLLF(phiInit, rhoInit, piInit, gamInit, mini, maxi,
-		gamma, lambda=0, X, Y, tau)
+		gamma, lambda=0, X, Y, tau, fast)
 	grid = array(0, dim=c(p,m,k))
 	for (i in 1:p)
 	{
 		for (j in 1:m)
 			grid[i,j,] = abs(list_EMG$S[i,j,]) / (n*list_EMG$pi^gamma)
 	}
-	grid = unique(grid)
-	grid
+	sort( unique(grid) )
 }