some minor change of notation

fchamroukhi · Dec 20, 2018 · fda2328 · fda2328
1 parent 04e5d04
commit fda2328
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/init_MixFHMM.m b/init_MixFHMM.m
@@ -56,7 +56,7 @@
         % 3. Initialisation de la matrice des transitions
         mixFHMM.param.A_k(:,:,k)  =  mixFHMM_init.trans_mat;
         if order_constraint
-            mixFHMM.mask.mask = mixFHMM_init.mask;
+            mixFHMM.stats.mask = mixFHMM_init.mask;
         end
         % 4. Initialisation des moyennes
         mixFHMM.param.mu_kr(:,k) = mixFHMM_init.mur;

diff --git a/main_MixFHMM.m b/main_MixFHMM.m
@@ -30,6 +30,17 @@
 % type = {Ph.D. Thesis},
 % url ={https://chamroukhi.com/papers/FChamroukhi-Thesis.pdf}
 % }
+%
+% @article{Chamroukhi-FDA-2018,
+% 	Journal = {Wiley Interdisciplinary Reviews: Data Mining and Knowledge Discovery},
+% 	Author = {Faicel Chamroukhi and Hien D. Nguyen},
+% 	Note = {DOI: 10.1002/widm.1298.},
+% 	Volume = {},
+% 	Title = {Model-Based Clustering and Classification of Functional Data},
+% 	Year = {2019},
+% 	Month = {to appear},
+% 	url =  {https://chamroukhi.com/papers/MBCC-FDA.pdf}
+% 	}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 clear 
@@ -42,8 +53,8 @@
 R = 3;% number of regimes (HMM states)
 
 % % options
-variance_type = 'common';
-%variance_type = 'free'; 
+%variance_type = 'common';
+variance_type = 'free'; 
 ordered_states = 1;
 total_EM_tries = 1;
 max_iter_EM = 1000;

diff --git a/show_mixFHMM_results.m b/show_mixFHMM_results.m
@@ -24,7 +24,6 @@ function show_mixFHMM_results(data,mixFHMM)
 
 colors = {'r','g','b','k','m','y','c','r','g','b','k','m','y','c'};
 figure('Position',[scrsz(4) scrsz(4)/2 550 scrsz(4)/2.15]);
-%clf(1)
 
 for k=1:K
     plot(t,data(mixFHMM.stats.klas==k,:)','color',colors{k})