Après mon merge héroïque

diff --git a/.gitignore b/.gitignore
index d52ee00..b0455d8 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
 #misc
 Rprof.out
 *.zip
+.Rproj.user

diff --git a/reports/essaiPlot.R b/reports/essaiPlot.R
index bf2b61e..b000987 100644 (file)
--- a/reports/essaiPlot.R
+++ b/reports/essaiPlot.R
@@ -57,4 +57,4 @@ for (r in 1:K){
   meanPerClass[,r] = apply(XY_class[[r]], 2, mean)
 }
 
-matplot(meanPerClass, type='l')
\ No newline at end of file
+matplot(meanPerClass, type='l')

diff --git a/reports/simulData_17mars.R b/reports/simulData_17mars.R
index cdb476c..252e660 100644 (file)
--- a/reports/simulData_17mars.R
+++ b/reports/simulData_17mars.R
@@ -5,10 +5,10 @@ simulData_17mars = function(ite){
   ## Modele
   ###########
   K = 2
-  p = 48
+  p = 20
   T = seq(0,1.5,length.out = p)
   T2 = seq(0,3, length.out = 2*p)
-  n = 100
+  n = 30
   x1 = cos(2*base::pi*T) + 0.2*cos(4*2*base::pi*T) + 0.3*c(rep(0,round(length(T)/7)),rep(1,round(length(T)*(1-1/7))))+1
   sigmaX = 0.12
   sigmaY = 0.12

diff --git a/test/generate_test_data/EMGLLF.R b/test/generate_test_data/EMGLLF.R
index 673b807..de6d40e 100644 (file)
--- a/test/generate_test_data/EMGLLF.R
+++ b/test/generate_test_data/EMGLLF.R
@@ -1,4 +1,4 @@
-EMGLLF_R = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,tau)
+EMGLLF = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,tau)
 {
   #matrix dimensions
   n = dim(X)[1]
@@ -29,7 +29,7 @@ EMGLLF_R = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,ta
   Gam = matrix(0, n,k)
   EPS = 1E-15
   
-  while(ite <= mini || (ite <= maxi && (dist >= tau || dist2 >= sqrt(tau))))
+  while(ite <= mini || (ite<= maxi && (dist>= tau || dist2 >= sqrt(tau))))
        {
     Phi = phi
     Rho = rho
@@ -71,6 +71,7 @@ EMGLLF_R = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,ta
       kk = kk+1
     }
 
+#if (ite==2) browser()
     #t[m] la plus grande valeur dans la grille O.1^k tel que ce soit décroissante ou constante
     while( kk < 1000 && -a/n + lambda * sum(pi^gamma * b) <
                        -sum(gam2 * log(pi2))/n + lambda * sum(pi2^gamma * b) )
@@ -101,7 +102,9 @@ EMGLLF_R = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,ta
                        {
         for (mm in 1:m)
                                {
-          S[j,mm,r] = -rho[mm,mm,r]*ps2[j,mm,r] + sum(phi[-j,mm,r] * Gram2[j, setdiff(1:p,j),r])
+          S[j,mm,r] = -rho[mm,mm,r]*ps2[j,mm,r] + sum(phi[-j,mm,r] * Gram2[j, setdiff(1:p, j),r])
+#                                              (if(j>1) sum(phi[1:(j-1),mm,r] * Gram2[j,1:(j-1),r]) else 0) +
+#                                              (if(j<p) sum(phi[(j+1):p,mm,r] * Gram2[j,(j+1):p,r]) else 0)
           if (abs(S[j,mm,r]) <= n*lambda*(pi[r]^gamma))
             phi[j,mm,r]=0
           else if(S[j,mm,r] > n*lambda*(pi[r]^gamma))
@@ -128,7 +131,9 @@ EMGLLF_R = function(phiInit,rhoInit,piInit,gamInit,mini,maxi,gamma,lambda,X,Y,ta
       sumLLF1 = 0.0;
       for (r in 1:k)
                        {
-                               Gam[i,r] = pi[r] * exp(-0.5*sqNorm2[r]) * det(rho[,,r])
+                               #FIXME: numerical problems, because 0 < det(Rho[,,r] < EPS; what to do ?!
+        #       consequence: error in while() at line 77
+                               Gam[i,r] = pi[r] * exp(-0.5*sqNorm2[r])* det(rho[,,r])
         sumLLF1 = sumLLF1 + Gam[i,r] / (2*base::pi)^(m/2)
       }
       sumLogLLF2 = sumLogLLF2 + log(sumLLF1)