Merge pull request #92 from Bingram22/downsamplingFix

Downsampling issue with Gaussian obervation model
OHBA-analysis · Mar 22, 2023 · 627cdaa · 627cdaa
2 parents 2653d61 + c06c562
commit 627cdaa
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 13 deletions.
diff --git a/utils/analysis/getFractionalOccupancy.m b/utils/analysis/getFractionalOccupancy.m
@@ -62,7 +62,8 @@
    options.order = (sum(T) - size(Gamma,1)) / length(T);
 end
 
-if isfield(options,'tuda') && options.tuda
+if isfield(options,'tuda') && options.tuda | ...
+        isfield(options, 'order') && options.order == 0
     T = ceil(r * T);
 elseif isfield(options,'order') && options.order > 0
     T = ceil(r * T);

diff --git a/utils/analysis/getStateIntervalTimes.m b/utils/analysis/getStateIntervalTimes.m
@@ -54,17 +54,21 @@
     r = (options.downsample/options.Fs);
 end
 
-if isfield(options,'order') && options.order > 0
+if ~isfield(options,'order') && ~isfield(options,'embeddedlags')
+   options.order = (sum(T) - size(Gamma,1)) / length(T);
+end
+
+if isfield(options,'tuda') && options.tuda | ...
+        isfield(options, 'order') && options.order == 0
+    T = ceil(r * T);
+elseif isfield(options,'order') && options.order > 0
     T = ceil(r * T);
     T = T - options.order; 
 elseif isfield(options,'embeddedlags') && length(options.embeddedlags) > 1
     d1 = -min(0,options.embeddedlags(1));
     d2 = max(0,options.embeddedlags(end));
     T = T - (d1+d2);
     T = ceil(r * T);
-else
-    options.order = (sum(T) - size(Gamma,1)) / length(T); 
-    T = T - options.order; 
 end
 
 if is_vpath % viterbi path

diff --git a/utils/analysis/getStateLifeTimes.m b/utils/analysis/getStateLifeTimes.m
@@ -55,17 +55,21 @@
     r = (options.downsample/options.Fs);
 end
 
-if isfield(options,'order') && options.order > 0
+if ~isfield(options,'order') && ~isfield(options,'embeddedlags')
+   options.order = (sum(T) - size(Gamma,1)) / length(T);
+end
+
+if isfield(options,'tuda') && options.tuda | ...
+        isfield(options, 'order') && options.order == 0
+    T = ceil(r * T);
+elseif isfield(options,'order') && options.order > 0
     T = ceil(r * T);
     T = T - options.order; 
 elseif isfield(options,'embeddedlags') && length(options.embeddedlags) > 1
     d1 = -min(0,options.embeddedlags(1));
     d2 = max(0,options.embeddedlags(end));
     T = T - (d1+d2);
     T = ceil(r * T);
-else
-    options.order = (sum(T) - size(Gamma,1)) / length(T); 
-    T = T - options.order; 
 end
 
 if is_vpath % viterbi path

diff --git a/utils/analysis/getSwitchingRate.m b/utils/analysis/getSwitchingRate.m
@@ -41,17 +41,21 @@
     r = (options.downsample/options.Fs);
 end
 
-if isfield(options,'order') && options.order > 0
+if ~isfield(options,'order') && ~isfield(options,'embeddedlags')
+   options.order = (sum(T) - size(Gamma,1)) / length(T);
+end
+
+if isfield(options,'tuda') && options.tuda | ...
+        isfield(options, 'order') && options.order == 0
+    T = ceil(r * T);
+elseif isfield(options,'order') && options.order > 0
     T = ceil(r * T);
     T = T - options.order; 
 elseif isfield(options,'embeddedlags') && length(options.embeddedlags) > 1
     d1 = -min(0,options.embeddedlags(1));
     d2 = max(0,options.embeddedlags(end));
     T = T - (d1+d2);
     T = ceil(r * T);
-else
-    options.order = (sum(T) - size(Gamma,1)) / length(T); 
-    T = T - options.order;     
 end
 
 if is_vpath % viterbi path