basic test OK, but problem with 'fast' EMGLLF output in last EMilie test

diff --git a/pkg/R/EMGLLF.R b/pkg/R/EMGLLF.R
index 0d8607c..08ff203 100644 (file)
--- a/pkg/R/EMGLLF.R
+++ b/pkg/R/EMGLLF.R
@@ -42,7 +42,6 @@ EMGLLF <- function(phiInit, rhoInit, piInit, gamInit, mini, maxi, gamma, lambda,
     X, Y, eps, phi = double(p * m * k), rho = double(m * m * k), pi = double(k), 
     LLF = double(maxi), S = double(p * m * k), affec = integer(n), n, p, m, k, 
     PACKAGE = "valse")
-       list(phi = phi, rho = rho, pi = pi, llh = llh, S = S, affec=affec)
 }
 
 # R version - slow but easy to read

diff --git a/pkg/R/main.R b/pkg/R/main.R
index bb1e3fe..d29fe69 100644 (file)
--- a/pkg/R/main.R
+++ b/pkg/R/main.R
@@ -51,7 +51,7 @@ valse <- function(X, Y, procedure = "LassoMLE", selecMod = "DDSE", gamma = 1, mi
   computeModels <- function(k)
   {
     if (ncores_outer > 1) 
-      require("valse")  #nodes start with an empty environment
+      require("valse") #nodes start with an empty environment
 
     if (verbose) 
       print(paste("Parameters initialization for k =", k))

diff --git a/test/script_data.R b/test/script_data.R
index 102961c..da319da 100644 (file)
--- a/test/script_data.R
+++ b/test/script_data.R
@@ -11,5 +11,5 @@ Beta[1:4,1:4,2] = -2*diag(4)
 
 Data = generateXY(200, 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=3, size_coll_mod = 50, selecMod = "DDSE", mini = 50, maxi=100)
+Res = valse(Data$X,Data$Y, fast=TRUE, plot=FALSE, verbose = TRUE, kmax=3, size_coll_mod = 50, selecMod = "DDSE", mini = 50, maxi=100)
 plot(Res$tableau[,3], -Res$tableau[,4])