From 05834cceaddb8942c850d5b24f69c6dcfb7134ae Mon Sep 17 00:00:00 2001 From: Benjamin Auder Date: Fri, 3 Nov 2017 08:56:34 +0100 Subject: [PATCH] cosmetics --- pkg/src/sources/EMGLLF.c | 4 ++-- reports/{bazar Emilie => bazar_Emilie}/dessinBeta.m | 0 reports/{bazar Emilie => bazar_Emilie}/niveauColores.m | 0 reports/{bazar Emilie => bazar_Emilie}/ondelettes.m | 0 reports/{bazar Emilie => bazar_Emilie}/ondelettes2.m | 0 reports/{bazar Emilie => bazar_Emilie}/pretraitement.m | 0 reports/{bazar Emilie => bazar_Emilie}/recomp.m | 0 reports/{bazar Emilie => bazar_Emilie}/reconstruction.m | 0 reports/{bazar Emilie => bazar_Emilie}/resultatSousEns.m | 0 reports/{bazar Emilie => bazar_Emilie}/sautDeDimension.m | 0 reports/{bazar Emilie => bazar_Emilie}/script.m | 0 reports/{bazar Emilie => bazar_Emilie}/scriptEssai.m | 0 reports/{bazar Emilie => bazar_Emilie}/scriptSimules.m | 0 reports/{bazar Emilie => bazar_Emilie}/simulatedData.R | 0 14 files changed, 2 insertions(+), 2 deletions(-) rename reports/{bazar Emilie => bazar_Emilie}/dessinBeta.m (100%) rename reports/{bazar Emilie => bazar_Emilie}/niveauColores.m (100%) rename reports/{bazar Emilie => bazar_Emilie}/ondelettes.m (100%) rename reports/{bazar Emilie => bazar_Emilie}/ondelettes2.m (100%) rename reports/{bazar Emilie => bazar_Emilie}/pretraitement.m (100%) rename reports/{bazar Emilie => bazar_Emilie}/recomp.m (100%) rename reports/{bazar Emilie => bazar_Emilie}/reconstruction.m (100%) rename reports/{bazar Emilie => bazar_Emilie}/resultatSousEns.m (100%) rename reports/{bazar Emilie => bazar_Emilie}/sautDeDimension.m (100%) rename reports/{bazar Emilie => bazar_Emilie}/script.m (100%) rename reports/{bazar Emilie => bazar_Emilie}/scriptEssai.m (100%) rename reports/{bazar Emilie => bazar_Emilie}/scriptSimules.m (100%) rename reports/{bazar Emilie => bazar_Emilie}/simulatedData.R (100%) diff --git a/pkg/src/sources/EMGLLF.c b/pkg/src/sources/EMGLLF.c index d9f92c0..e8b3b84 100644 --- a/pkg/src/sources/EMGLLF.c +++ b/pkg/src/sources/EMGLLF.c @@ -16,7 +16,7 @@ void EMGLLF_core( Real lambda, // valeur du paramètre de régularisation du Lasso const Real* X, // régresseurs const Real* Y, // réponse - Real tau, // seuil pour accepter la convergence + Real eps, // seuil pour accepter la convergence // OUT parameters (all pointers, to be modified) Real* phi, // parametre de moyenne renormalisé, calculé par l'EM Real* rho, // parametre de variance renormalisé, calculé par l'EM @@ -379,7 +379,7 @@ void EMGLLF_core( if (Dist3 > dist2) dist2 = Dist3; - if (ite >= mini && (dist >= tau || dist2 >= sqrt(tau))) + if (ite >= mini && (dist >= eps || dist2 >= sqrt(eps))) break; } diff --git a/reports/bazar Emilie/dessinBeta.m b/reports/bazar_Emilie/dessinBeta.m similarity index 100% rename from reports/bazar Emilie/dessinBeta.m rename to reports/bazar_Emilie/dessinBeta.m diff --git a/reports/bazar Emilie/niveauColores.m b/reports/bazar_Emilie/niveauColores.m similarity index 100% rename from reports/bazar Emilie/niveauColores.m rename to reports/bazar_Emilie/niveauColores.m diff --git a/reports/bazar Emilie/ondelettes.m b/reports/bazar_Emilie/ondelettes.m similarity index 100% rename from reports/bazar Emilie/ondelettes.m rename to reports/bazar_Emilie/ondelettes.m diff --git a/reports/bazar Emilie/ondelettes2.m b/reports/bazar_Emilie/ondelettes2.m similarity index 100% rename from reports/bazar Emilie/ondelettes2.m rename to reports/bazar_Emilie/ondelettes2.m diff --git a/reports/bazar Emilie/pretraitement.m b/reports/bazar_Emilie/pretraitement.m similarity index 100% rename from reports/bazar Emilie/pretraitement.m rename to reports/bazar_Emilie/pretraitement.m diff --git a/reports/bazar Emilie/recomp.m b/reports/bazar_Emilie/recomp.m similarity index 100% rename from reports/bazar Emilie/recomp.m rename to reports/bazar_Emilie/recomp.m diff --git a/reports/bazar Emilie/reconstruction.m b/reports/bazar_Emilie/reconstruction.m similarity index 100% rename from reports/bazar Emilie/reconstruction.m rename to reports/bazar_Emilie/reconstruction.m diff --git a/reports/bazar Emilie/resultatSousEns.m b/reports/bazar_Emilie/resultatSousEns.m similarity index 100% rename from reports/bazar Emilie/resultatSousEns.m rename to reports/bazar_Emilie/resultatSousEns.m diff --git a/reports/bazar Emilie/sautDeDimension.m b/reports/bazar_Emilie/sautDeDimension.m similarity index 100% rename from reports/bazar Emilie/sautDeDimension.m rename to reports/bazar_Emilie/sautDeDimension.m diff --git a/reports/bazar Emilie/script.m b/reports/bazar_Emilie/script.m similarity index 100% rename from reports/bazar Emilie/script.m rename to reports/bazar_Emilie/script.m diff --git a/reports/bazar Emilie/scriptEssai.m b/reports/bazar_Emilie/scriptEssai.m similarity index 100% rename from reports/bazar Emilie/scriptEssai.m rename to reports/bazar_Emilie/scriptEssai.m diff --git a/reports/bazar Emilie/scriptSimules.m b/reports/bazar_Emilie/scriptSimules.m similarity index 100% rename from reports/bazar Emilie/scriptSimules.m rename to reports/bazar_Emilie/scriptSimules.m diff --git a/reports/bazar Emilie/simulatedData.R b/reports/bazar_Emilie/simulatedData.R similarity index 100% rename from reports/bazar Emilie/simulatedData.R rename to reports/bazar_Emilie/simulatedData.R -- 2.44.0