diff --git a/align.m b/align.m index 6c090af04aad092831480498329f08b85a75a70b..864644333c67340ea6f6da38d55b694988265d50 100644 --- a/align.m +++ b/align.m @@ -1,57 +1,57 @@ -function [Vals,Offs,varargout] = align(Vals,Offs,filter,varargin) +function [Cols,Offs,varargout] = align(Cols,Offs,filter,varargin) %ALIGN Summary of this function goes here % Detailed explanation goes here nvararg = nargin-3; -numVal = numel(Vals); -Maxs = cell(size(Vals)); +numLab = numel(Cols); +Maxs = cell(size(Cols)); -for val = 1:numVal - if ~isempty(Vals{val}) +for lab = 1:numLab + if ~isempty(Cols{lab}) break end end -Off_ = Offs{val}; -numDim = numel(Off_); -Max_ = size(Vals{val}); -Max_(end+1:numDim) = 1; -Max_ = Max_+Off_; +Off = Offs{lab}; +numDim = numel(Off); +Max = size(Cols{lab}); +Max(end+1:numDim) = 1; +Max = Max+Off; -for val = 1:numVal - if isempty(Vals{val}) +for lab = 1:numLab + if isempty(Cols{lab}) continue end - Maxs{val} = size(Vals{val}); - Maxs{val}(end+1:numDim) = 1; - Maxs{val} = Maxs{val} + Offs{val}; + Maxs{lab} = size(Cols{lab}); + Maxs{lab}(end+1:numDim) = 1; + Maxs{lab} = Maxs{lab} + Offs{lab}; - Off_ = min(Offs{val},Off_); - Max_ = max(Maxs{val},Max_); + Off = min(Offs{lab},Off); + Max = max(Maxs{lab},Max); end varargout = varargin; -for val = 1:numVal - if isempty(Vals{val}) +for lab = 1:numLab + if isempty(Cols{lab}) continue end - padPre = Offs{val}-Off_; - padPost = Max_-Maxs{val}; + padPre = Offs{lab}-Off; + padPost = Max-Maxs{lab}; padPre (~filter) = 0; padPost(~filter) = 0; - Vals{val} = padarray(Vals{val},padPre ,nan,'pre' ); - Vals{val} = padarray(Vals{val},padPost,nan,'post'); + Cols{lab} = padarray(Cols{lab},padPre ,nan,'pre' ); + Cols{lab} = padarray(Cols{lab},padPost,nan,'post'); for it = 1:nvararg - varargout{it}{val} = padarray(varargout{it}{val},padPre ,nan,'pre' ); - varargout{it}{val} = padarray(varargout{it}{val},padPost,nan,'post'); + varargout{it}{lab} = padarray(varargout{it}{lab},padPre ,nan,'pre' ); + varargout{it}{lab} = padarray(varargout{it}{lab},padPost,nan,'post'); end - Offs{val} = Off_; + Offs{lab} = Off; end end \ No newline at end of file diff --git a/join.m b/join.m index f4cdbb7f6c730f4a767049480453bd11292d5a26..6e8148190551c09c5ca148e943d3f653a9e94375 100644 --- a/join.m +++ b/join.m @@ -1,4 +1,4 @@ -function [Val,Lab,Off,varargout] = join(Vals,Labs,Offs,varargin) +function [Col,Lab,Off,varargout] = join(Cols,Labs,Offs,varargin) %JOIN Summary of this function goes here % Detailed explanation goes here @@ -7,35 +7,35 @@ numLab = numel(Labs); Sizes = cell(1,numLab); for lab = 1:numLab - if ~isempty(Vals{lab}) + if ~isempty(Cols{lab}) break end end Off = Offs{lab}; -Max = size(Vals{lab}); +Max = size(Cols{lab}); numDim = numel(Offs{lab}); Max(end+1:numDim) = 1; Max = Off+Max; for lab = 1:numLab - if isempty(Vals{lab}) + if isempty(Cols{lab}) continue end Off = min(Off,Offs{lab}); - Sizes{lab} = size(Vals{lab}); + Sizes{lab} = size(Cols{lab}); Sizes{lab}(end+1:numDim) = 1; Max = max(Max,Offs{lab}+Sizes{lab}); end Size = Max-Off; -[Val,varargout{1:nvararg}] = deal(nan(Size)); +[Col,varargout{1:nvararg}] = deal(nan(Size)); Lab = zeros(Size); for lab = 1:numLab - if isempty(Vals{lab}) + if isempty(Cols{lab}) continue end @@ -47,7 +47,7 @@ for lab = 1:numLab inds = sub2ind(Size,GV{:}); inds = inds(Mask(:)); - Val(inds) = Vals{lab}(Mask(:)); + Col(inds) = Cols{lab}(Mask(:)); Lab(inds) = Labs{lab}(Mask(:)); for it = 1:nvararg diff --git a/split.m b/split.m index 4f990aa4db45719483cb6d3d65cc562338bde04f..a20e2a21434eeba60126f316573175943f3f5445 100644 --- a/split.m +++ b/split.m @@ -1,11 +1,11 @@ -function [Vals,Labs,Offs,varargout] = split(Val,Lab,Off,varargin) +function [Cols,Labs,Offs,varargout] = split(Col,Lab,Off,varargin) %SPLIT Summary of this function goes here % Detailed explanation goes here nvararg = nargin-3; numDim = numel(Off); numLab = max(Lab(:)); -[Vals,Labs,Offs,varargout{1:nvararg}] = deal(cell(1,numLab)); +[Cols,Labs,Offs,varargout{1:nvararg}] = deal(cell(1,numLab)); Offs(:) = deal({Off}); @@ -14,7 +14,7 @@ for lab = 1:numLab continue end - [Vals{lab},gv] = utils.tighten(Val,Lab==lab); + [Cols{lab},gv] = utils.tighten(Col,Lab==lab); Labs{lab} = Lab(gv{:}); gv(end+1:numDim) = deal({1}); Offs{lab} = Off-1+cellfun(@(v) v(1),gv);