From: Benjamin Goehry <benjamin.goehry@math.u-psud.fr>
Date: Mon, 30 Jan 2017 13:11:10 +0000 (+0100)
Subject: correction calcul matrice
X-Git-Url: https://git.auder.net/variants/%24%7Bvname%7D/current/pieces/cb.svg?a=commitdiff_plain;h=b45ba1b0c818a6cc18ed353830f2cd85d4bb687d;p=valse.git

correction calcul matrice
---

diff --git a/src/test/generate_test_data/helpers/EMGLLF.R b/src/test/generate_test_data/helpers/EMGLLF.R
index d1217ff..42dcd00 100644
--- a/src/test/generate_test_data/helpers/EMGLLF.R
+++ b/src/test/generate_test_data/helpers/EMGLLF.R
@@ -38,10 +38,10 @@ EMGLLF = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,tau)
     #calcul associé à Y et X
     for(r in 1:k){
       for(mm in 1:m){
-        Y2[,mm,r] = sqrt(gam[,r]) .* Y[,mm]
+        Y2[,mm,r] = sqrt(gam[,r]) ^ Y[,mm]
       }
       for(i in 1:n){
-        X2[i,,r] = X[i,] .* sqrt(gam[i,r])
+        X2[i,,r] = X[i,] ^ sqrt(gam[i,r])
       }
       for(mm in 1:m){
         ps2[,mm,r] = crossprod(X2[,,r],Y2[,mm,r])
@@ -92,18 +92,18 @@ EMGLLF = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,tau)
     for(r in 1:k){
       for(mm in 1:m){
         for(i in 1:n){
-          ps1[i,mm,r] = Y2[i,mm,r] * dot(X2(i,:,r), phi(:,mm,r))
+          ps1[i,mm,r] = Y2[i,mm,r] * X2[i,,r]%*% t(phi[,mm,r])
           nY21[i,mm,r] = (Y2[i,mm,r])^2
         }
-        ps[mm,r] = sum(ps1(:,mm,r));
-        nY2[mm,r] = sum(nY21(:,mm,r));
+        ps[mm,r] = sum(ps1[,mm,r])
+        nY2[mm,r] = sum(nY21[,mm,r])
         rho[mm,mm,r] = ((ps[mm,r]+sqrt(ps[mm,r]^2+4*nY2[mm,r]*(gam2[r])))/(2*nY2[mm,r]))
       }
     }
     for(r in 1:k){
       for(j in 1:p){
         for(mm in 1:m){
-          S[j,mm,r] = -rho[mm,mm,r]*ps2[j,mm,r] + dot(phi[1:j-1,mm,r],Gram2[j,1:j-1,r])  + dot(phi[j+1:p,mm,r],Gram2[j,j+1:p,r])
+          S[j,mm,r] = -rho[mm,mm,r]*ps2[j,mm,r] + phi[1:j-1,mm,r]%*%t(Gram2[j,1:j-1,r])  + phi[j+1:p,mm,r]%*%t(Gram2[j,j+1:p,r])
           if(abs(S(j,mm,r)) <= n*lambda*(Pi[r]^gamma)){
             phi[j,mm,r]=0
           }else{
@@ -146,7 +146,7 @@ EMGLLF = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,tau)
     
     sumPen = 0
     for(r in 1:k){
-      sumPen = sumPen + Pi[r].^gamma^b[r]
+      sumPen = sumPen + Pi[r]^gamma^b[r]
     }
     LLF[ite] = -(1/n)*sumLogLLF2 + lambda*sumPen
     
@@ -155,10 +155,10 @@ EMGLLF = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,tau)
     else
       dist = (LLF[ite]-LLF[ite-1])/(1+abs(LLF[ite]))
     
-    Dist1=max(max(max((abs(phi-Phi))./(1+abs(phi)))))
-    Dist2=max(max(max((abs(rho-Rho))./(1+abs(rho)))))
-    Dist3=max(max((abs(Pi-PI))./(1+abs(PI))))
-    dist2=max([Dist1,Dist2,Dist3])
+    Dist1=max(max(max((abs(phi-Phi))/(1+abs(phi)))))
+    Dist2=max(max(max((abs(rho-Rho))/(1+abs(rho)))))
+    Dist3=max(max((abs(Pi-PI))/(1+abs(PI))))
+    dist2=max(c(Dist1,Dist2,Dist3))
     
     ite=ite+1
   }