ENH - numerous small changes as suggested by the MATLAB coder for compatibility reasons.

Author: robertoostenveld

ft_appenddata.m

@@ -89,13 +89,13 @@
 
 % ensure consistent input data
 for i=2:Ndata
-  if isfield(varargin{1}, 'topo'),
+  if isfield(varargin{1}, 'topo')
     assert(isequaln(varargin{1}.topo, varargin{i}.topo), 'the input has inconsistent topo fields')
   end
-  if isfield(varargin{1}, 'topolabel'),
+  if isfield(varargin{1}, 'topolabel')
     assert(isequaln(varargin{1}.topolabel, varargin{i}.topolabel), 'the input has inconsistent topolabel fields')
   end
-  if isfield(varargin{1}, 'unmixing'),
+  if isfield(varargin{1}, 'unmixing')
     assert(isequaln(varargin{1}.unmixing, varargin{i}.unmixing), 'the input has inconsistent unmixing fields')
   end
 end
@@ -177,7 +177,7 @@
     if haselec, sens{j} = varargin{j}.elec; end
     if hasgrad, sens{j} = varargin{j}.grad; end
     if hasopto, sens{j} = varargin{j}.opto; end
-    if j>1,
+    if j>1
       if ~isequaln(sens{j}, sens{1})
         removesens = 1;
         warning('sensor information does not seem to be consistent across the input arguments');
@@ -222,9 +222,9 @@
 shuflabel  = cattrial && ~all(all(order-repmat(order(:,1),[1 Ndata])==0));
 prunelabel = cattrial && sum(sum(order~=0,2)==Ndata)<length(alllabel);
 
-if shuflabel,
+if shuflabel
   fprintf('the channel order in the input-structures is not consistent, reordering\n');
-  if prunelabel,
+  if prunelabel
     fprintf('not all input-structures contain the same channels, pruning the input prior to concatenating over trials\n');
     selall    = find(sum(order~=0,2)==Ndata);
     alllabel  = alllabel(selall);

plotting/ft_plot_slice.m

@@ -409,12 +409,14 @@
   v1 = loc + inplane(1,:);
   v2 = loc + inplane(2,:);
   v3 = loc + inplane(3,:);
+  pr = nan(size(plotmarker,1), 3);
+  d  = nan(size(plotmarker,1), 1);
   for k = 1:size(plotmarker,1)
-    [pr(k,:),d(k,:)] = ptriprojn(v1,v2,v3,plotmarker(k,:));
+    [pr(k,:), d(k,:)] = ptriprojn(v1, v2, v3, plotmarker(k,:));
   end
   sel = d<eps*1e8;
-  if sum(sel)>0,
-    ft_plot_dipole(pr(sel,:),repmat([0;0;1],1,size(pr,1)),'length',0,'color',markercolor,'diameter',markersize);
+  if sum(sel)>0
+    ft_plot_dipole(pr(sel,:), repmat([0;0;1], 1, size(pr,1)), 'length', 0, 'color', markercolor, 'diameter', markersize);
   end
 end
 
@@ -423,7 +425,7 @@
 axis(ax([1 4 2 5 3 6])); % reorder into [xmin xmax ymin ymaz zmin zmax]
 
 st = dbstack;
-if numel(st)>1,
+if numel(st)>1
   % ft_plot_slice has been called from another function
   % assume the remainder of the axis settings to be handled there
 else

plotting/ft_plot_vol.m

@@ -75,8 +75,8 @@ function ft_plot_vol(headmodel, varargin)
 switch ft_voltype(headmodel)
   case {'singlesphere' 'concentricspheres'}
     headmodel.r = sort(headmodel.r);
-    bnd = [];
-    for i=1:length(headmodel.r)
+    bnd = repmat(struct(), numel(headmodel.r));
+    for i=1:numel(headmodel.r)
       bnd(i).pos(:,1) = pos(:,1)*headmodel.r(i) + headmodel.o(1);
       bnd(i).pos(:,2) = pos(:,2)*headmodel.r(i) + headmodel.o(2);
       bnd(i).pos(:,3) = pos(:,3)*headmodel.r(i) + headmodel.o(3);
@@ -87,8 +87,8 @@ function ft_plot_vol(headmodel, varargin)
     end
 
   case 'localspheres'
-    bnd = [];
-    for i=1:length(headmodel.label)
+    bnd = repmat(struct(), numel(headmodel.label));
+    for i=1:numel(headmodel.label)
       bnd(i).pos(:,1) = pos(:,1)*headmodel.r(i) + headmodel.o(i,1);
       bnd(i).pos(:,2) = pos(:,2)*headmodel.r(i) + headmodel.o(i,2);
       bnd(i).pos(:,3) = pos(:,3)*headmodel.r(i) + headmodel.o(i,3);

plotting/private/ptriprojn.m

@@ -19,6 +19,7 @@
 end
 
 [la, mu, dist, proj] = lmoutrn(v1, v2, v3, r);
+
 switch flag
   case 0
     % finished

utilities/ft_checkdata.m

@@ -1348,6 +1348,8 @@
   % concatenate all trials
   tmptrial = nan(ntrial, nchan, length(time));
 
+  begsmp = nan(ntrial, 1);
+  endsmp = nan(ntrial, 1);
   for i=1:ntrial
     begsmp(i) = nearest(time, data.time{i}(1));
     endsmp(i) = nearest(time, data.time{i}(end));

utilities/nearest.m

@@ -54,18 +54,17 @@
 if numel(val)==2
   % interpret this as a range specification like [minval maxval]
   % see also http://bugzilla.fcdonders.nl/show_bug.cgi?id=1431
-  intervaltol=eps;
+  intervaltol = eps;
   sel = find(array>=val(1) & array<=val(2));
   if isempty(sel)
     error('The limits you selected are outside the range available in the data');
   end
-  indx(1) = sel(1);
-  indx(2) = sel(end);
+  indx = sel([1 end]);
   if indx(1)>1 && abs(array(indx(1)-1)-val(1))<=intervaltol
-    indx(1)=indx(1)-1;
+    indx(1) = indx(1)-1;
   end
   if indx(2)<length(array) && abs(array(indx(2)+1)-val(2))<=intervaltol
-    indx(2)=indx(2)+1;
+    indx(2) = indx(2)+1;
   end
   return
 end

utilities/private/channelposition.m

@@ -165,14 +165,16 @@
     end
     chan = unique(chan);
     % find the matching channel-duplets
-    ind = [];
-    lab = {};
+    ind = false(size(chan));
+    lab = cell(length(chan),2);
+    pnt = nan(length(chan),3);
+    ori = nan(length(chan),3);
     for i=1:length(chan)
       ch1 =  [chan{i} '_dH'];
       ch2 =  [chan{i} '_dV'];
       sel = match_str(sens.label, {ch1, ch2});
       if length(sel)==2
-        ind = [ind; i];
+        ind(i)   = true;
         lab(i,:) = {ch1, ch2};
         meanpnt1 = mean(sens.coilpos(abs(sens.tra(sel(1),:))>0.5, :), 1);
         meanpnt2 = mean(sens.coilpos(abs(sens.tra(sel(2),:))>0.5, :), 1);

utilities/private/fixinside.m

@@ -65,12 +65,17 @@
   if ~isfield(source, 'outside')
     source.outside = [];
   end
-  inside(source.inside)  = (1==1);  % true
-  inside(source.outside) = (1==0);  % false
-  source.inside = inside(:);
+  if isfield(source, 'pos')
+    tmp  = false(size(source.pos,1),1);
+  elseif isfield(source, 'dim')
+    tmp  = false(prod(source.dim),1);
+  end
+  tmp(source.inside) = true;
   if isfield(source, 'outside')
+    tmp(source.outside) = false;
     source = rmfield(source, 'outside');
   end
+  source.inside = tmp(:);
 elseif logicalfmt && strcmp(opt, 'index')
   % convert to a vectors with indices
   tmp = source.inside;

utilities/private/pos2dim.m

@@ -14,7 +14,7 @@
 
 % Copyright (C) 2009, Jan-Mathijs Schoffelen
 
-if isstruct(pos),
+if isstruct(pos)
   pos = pos.pos;
 end
 
@@ -24,6 +24,7 @@
 npos = size(pos,1);
 dpos = zscore(abs(diff(pos,[],1)));
 
+dim        = nan(1,3);
 [tmp, ind] = max(dpos,[],2);
 dim(1)     = find(tmp>1.5,1,'first');
 dpos       = dpos(dim:dim:npos-1,:);