From: Benjamin Goehry Date: Mon, 9 Jan 2017 10:06:46 +0000 (+0100) Subject: typo emgllf X-Git-Url: https://git.auder.net/variants/current/css/doc/img/R.css?a=commitdiff_plain;h=b4476024967cdd601bf82ff4108f5c2beb855e9e;p=valse.git typo emgllf --- diff --git a/R/gridLambda.R b/R/gridLambda.R index 2c66e4c..855b4a6 100644 --- a/R/gridLambda.R +++ b/R/gridLambda.R @@ -16,7 +16,7 @@ gridLambda = function(phiInit, rhoInit, piInit, gamInit, X, Y, gamma, mini, maxi m = dim(phiInit)[2] k = dim(phiInit)[3] - list_EMG = .Call("EMGLLF",phiInit,rhoInit,piInit,gamInit,mini,maxi,1,0,X,Y,tau) + list_EMG = .Call("EMGLLF_core",phiInit,rhoInit,piInit,gamInit,mini,maxi,1,0,X,Y,tau) grid = array(0, dim=c(p,m,k)) for (i in 1:p) diff --git a/R/initSmallEM.R b/R/initSmallEM.R index 3f98e07..7a35bc3 100644 --- a/R/initSmallEM.R +++ b/R/initSmallEM.R @@ -58,7 +58,7 @@ initSmallEM = function(k,X,Y,tau) miniInit = 10 maxiInit = 11 - new_EMG = .Call("EMGLLF",phiInit1[,,,repet],rhoInit1[,,,repet],piInit1[repet,], + new_EMG = .Call("EMGLLF_core",phiInit1[,,,repet],rhoInit1[,,,repet],piInit1[repet,], gamInit1[,,repet],miniInit,maxiInit,1,0,X,Y,tau) LLFEessai = new_EMG$LLF LLFinit1[repet] = LLFEessai[length(LLFEessai)]