several modifs - pkg looks better (but untested)

[valse.git] / pkg / R / computeGridLambda.R

diff --git a/pkg/R/computeGridLambda.R b/pkg/R/computeGridLambda.R
index f89b2a3..a051441 100644 (file)
--- a/pkg/R/computeGridLambda.R
+++ b/pkg/R/computeGridLambda.R
@@ -16,14 +16,17 @@
 #' @return the grid of regularization parameters
 #'
 #' @export
-computeGridLambda = function(phiInit, rhoInit, piInit, gamInit, X, Y, gamma, mini, maxi, tau)
+computeGridLambda = function(phiInit, rhoInit, piInit, gamInit, X, Y,
+       gamma, mini, maxi, tau)
 {
        n = nrow(X)
        p = dim(phiInit)[1]
        m = dim(phiInit)[2]
        k = dim(phiInit)[3]
 
-  list_EMG = EMGLLF(phiInit,rhoInit,piInit,gamInit,mini,maxi,1,0,X,Y,tau)
+       # 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)
        grid = array(0, dim=c(p,m,k))
        for (i in 1:p)
        {
@@ -31,6 +34,6 @@ computeGridLambda = function(phiInit, rhoInit, piInit, gamInit, X, Y, gamma, min
                        grid[i,j,] = abs(list_EMG$S[i,j,]) / (n*list_EMG$pi^gamma)
        }
        grid = unique(grid)
-       grid = grid[grid <=1]
+       grid = grid[grid <= 1]
        grid
 }