Add 'fast' argument to select C code or R code

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

diff --git a/pkg/R/selectVariables.R b/pkg/R/selectVariables.R
index 4e9b374..b23eac2 100644 (file)
--- a/pkg/R/selectVariables.R
+++ b/pkg/R/selectVariables.R
@@ -23,7 +23,7 @@
 #' @export
 #'
 selectVariables = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,glambda,
 #' @export
 #'
 selectVariables = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,glambda,

-       X,Y,thresh,tau, ncores=3)
+       X,Y,thresh,tau, ncores=3, fast=TRUE)

 {
        if (ncores > 1)
        {
 {
        if (ncores > 1)
        {


@@ -36,7 +36,7 @@ selectVariables = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,glambd
        # Calcul pour un lambda
        computeCoefs <- function(lambda)
        {
        # Calcul pour un lambda
        computeCoefs <- function(lambda)
        {

-               params = EMGLLF(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,tau)
+               params = EMGLLF(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,tau,fast)

 
                p = dim(phiInit)[1]
                m = dim(phiInit)[2]
 
                p = dim(phiInit)[1]
                m = dim(phiInit)[2]