Warn on unestimated DCM trials and update tests

Author: 4gwe

src/pspm_dcm.m

@@ -748,8 +748,18 @@
   end
   % set disabled trials to NaN (trials during missing data stretches or
   % that are too close to session end)
-  dcm.stats(cTrl + find(trls(:, 1) == 0), :) = NaN;
+  disabled_trials = find(trls(:, 1) == 0);
+  dcm.stats(cTrl + disabled_trials, :) = NaN;
+
+  if ~isempty(disabled_trials)
+      warning('ID:inestimable_trials', ['%d trial(s) in data file ''%s'' could not be estimated '  'and were set to NaN. Trial indices: %s'], ...
+            numel(disabled_trials), ...
+            model.datafile{iSn}, ...
+            mat2str(disabled_trials(:)'));
+      [warnings{end+1, 2}, warnings{end+1, 1}] = lastwarn;
+  end
   cTrl = cTrl + size(trls, 1);
+
 end
 dcm.names = {};
 for iEvnt = 1:numel(dcm.sn{1}.a(1).a)

test/pspm_dcm_test.m

@@ -146,7 +146,12 @@ function test_hra1_flex_cs(this)
           'trlnames', {trialnames},...
           'eventnames', {eventnames} ...
           );
-        this.verifyWarningFree(@() pspm_dcm(model, options));
+        this.verifyWarning(  @() pspm_dcm(model, options), 'ID:inestimable_trials');
+        result = load(fn, 'dcm');
+        nan_trials = find(all(isnan(result.dcm.stats), 2));
+        this.verifyEqual(nan_trials, 5);
+        this.verifyTrue(any(strcmp( result.dcm.warnings(:, 1), 'ID:inestimable_trials')));
+
       end
     end
     function test_hra1_flex_cs_missing(this)
@@ -168,7 +173,13 @@ function test_hra1_flex_cs_missing(this)
           'trlnames', {trialnames},...
           'eventnames', {eventnames} ...
           );
-        this.verifyWarningFree(@() pspm_dcm(model, options));
+
+        this.verifyWarning(  @() pspm_dcm(model, options), 'ID:inestimable_trials');
+        result = load(fn, 'dcm');
+        nan_trials = find(all(isnan(result.dcm.stats), 2));
+        this.verifyEqual(nan_trials, [1; 2; 3; 5]);
+        this.verifyTrue(any(strcmp( result.dcm.warnings(:, 1), 'ID:inestimable_trials')));
+
       end
     end
     function test_hra1_flex_cs_nan(this)
@@ -189,7 +200,12 @@ function test_hra1_flex_cs_nan(this)
           'trlnames', {trialnames},...
           'eventnames', {eventnames} ...
           );
-        this.verifyWarningFree(@() pspm_dcm(model, options));
+        this.verifyWarning(  @() pspm_dcm(model, options), 'ID:inestimable_trials');
+        result = load(fn, 'dcm');
+        nan_trials = find(all(isnan(result.dcm.stats), 2));
+        this.verifyEqual(nan_trials, 5);
+        this.verifyTrue(any(strcmp( result.dcm.warnings(:, 1), 'ID:inestimable_trials')));
+
       end
     end
     function [timing, eventnames, trialnames] = ...