Merge branch 'devel' of https://github.com/sccn/BCILAB into devel

Author: chkothe

code/dataset_editing/set_insert_markers.m

@@ -268,12 +268,16 @@
 % sort the events by latency...
 newsignal.event = newsignal.event(hlp_getresult(2,@sort,[newsignal.event.latency]));
 
-% update .urevent field if trivial
-if isempty(newsignal.urevent) || isequal([newsignal.event.urevent],1:length(newsignal.event))
-    newsignal.urevent = newsignal.event;
-    [newsignal.event.urevent] = arraydeal(1:length(newsignal.event));
+try
+    % update .urevent field if trivial
+    if isempty(newsignal.urevent) || isequal([newsignal.event.urevent],1:length(newsignal.event))
+        newsignal.urevent = newsignal.event;
+        [newsignal.event.urevent] = arraydeal(1:length(newsignal.event));
+    end
+catch e
+    hlp_handleerror(['Could not update .urevent field, skipping... (' e.message ')']);
 end
-
+    
 % conclude randomization
 if strcmp(opts.placement,'random') && opts.repeatable && hlp_matlab_version < 707
     % restore saved RNG state

code/expressions/exp_beginfun.m

@@ -277,13 +277,15 @@
 %       
 %                                Christian Kothe, Swartz Center for Computational Neuroscience, UCSD
 %                                2010-04-14
-dp;
 
 % --- obtain & interpret calling context ---
 
 % obtain execution context
 ctx.stack = dbstack('-completenames');
 
+% debug print
+dp(['in ' ctx.stack(2).name]);
+
 % early check of whether the expression system is disabled
 if  ~strcmp(setting,'symbolic') && hlp_resolve('disable_expressions',false,ctx) && ~isequal(varargin,{'delayed_online',true})
     % and exit exp_beginfun, if so

code/machine_learning/ml_traincov.m

@@ -23,7 +23,8 @@
 %
 %                           Christian Kothe, Syntrogi
 %                           2015-04-21
-        
+dp;
+
 arg_define([0 3],varargin, ...
     arg_norep('trials'), ...
     arg_norep('targets'), ...

code/machine_learning/ml_traindal.m

@@ -127,6 +127,7 @@
 %
 %                                Christian Kothe, Swartz Center for Computational Neuroscience, UCSD
 %                                2010-06-25
+dp;
 
 expose_handles(@process_fold,varargin{:});
 

code/machine_learning/ml_trainglm.m

@@ -138,6 +138,7 @@
 %
 %                                Christian Kothe, Swartz Center for Computational Neuroscience, UCSD
 %                                2011-07-08
+dp;
 
 % define common parameters of different distributions
 common_parameters = { ...

code/machine_learning/ml_traingmm.m

@@ -85,6 +85,7 @@
 %
 %                           Christian Kothe, Swartz Center for Computational Neuroscience, UCSD
 %                           2010-04-05
+dp;
 
 arg_define([0 3],varargin, ...
     arg_norep('trials'), ...

code/machine_learning/ml_trainhdca.m

@@ -44,7 +44,8 @@
 %
 %                           Christian Kothe, Swartz Center for Computational Neuroscience, UCSD
 %                           2010-04-03
-        
+dp;   
+
 args = arg_define([0 2],varargin, ...
     arg_norep('trials'), ...
     arg_norep('targets'), ...

code/machine_learning/ml_trainhkl.m

@@ -77,6 +77,7 @@
 %
 %                           Christian Kothe, Swartz Center for Computational Neuroscience, UCSD
 %                           2010-04-04
+dp;
 
 opts=arg_define([0 3],varargin, ...
     arg_norep('trials'), ...

code/machine_learning/ml_trainlda.m

@@ -82,7 +82,8 @@
 %
 %                           Christian Kothe, Swartz Center for Computational Neuroscience, UCSD
 %                           2010-04-03
-        
+dp;         
+
 arg_define([0 3],varargin, ...
     arg_norep('trials'), ...
     arg_norep('targets'), ...
@@ -161,4 +162,5 @@
     w = (mu{2} - mu{1}) / sig_both;
     w = w / (mu{2}*w' - mu_both*w');
     model = struct('w',{w}, 'b',{mu_both*w'}, 'classes',{classes},'featuremask',{retain},'lams',{lams});
+    1;
 end

code/machine_learning/ml_trainlogreg.m

@@ -122,6 +122,7 @@
 %
 %                           Christian Kothe, Swartz Center for Computational Neuroscience, UCSD
 %                           2010-04-04
+dp;
 
 arg_define([0 3],varargin, ...
     arg_norep('trials'), ...