Mercurial > hg > octave-terminal
changeset 11190:b1f4bdc276b6
Use CamelCase for 'UniformOutput' option to cellfun.
author | Rik <octave@nomad.inbox5.com> |
---|---|
date | Wed, 03 Nov 2010 17:37:00 -0700 |
parents | a3cb42b394eb |
children | 01ddaedd6ad5 |
files | scripts/ChangeLog scripts/general/accumdim.m scripts/general/cell2mat.m scripts/general/common_size.m scripts/general/structfun.m scripts/pkg/pkg.m scripts/strings/untabify.m |
diffstat | 7 files changed, 14 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,9 @@ +2010-11-03 Rik <octave@nomad.inbox5.com> + + * general/accumdim.m, general/cell2mat.m, general/common_size.m, + general/structfun.m, pkg/pkg.m, strings/untabify.m: Use CamelCase + for 'UniformOutput' option to cellfun. + 2010-11-03 Rik <octave@nomad.inbox5.com> * scripts/plot/plotyy.m, scripts/plot/xlim.m, scripts/plot/ylim.m,
--- a/scripts/general/accumdim.m +++ b/scripts/general/accumdim.m @@ -116,9 +116,9 @@ val = mat2cell (val(subsc{:}), szc{:}); ## Apply reductions. Special case min, max. if (func == @min || func == @max) - val = cellfun (func, val, {[]}, {dim}, "uniformoutput", false); + val = cellfun (func, val, {[]}, {dim}, "UniformOutput", false); else - val = cellfun (func, val, {dim}, "uniformoutput", false); + val = cellfun (func, val, {dim}, "UniformOutput", false); endif subs = subs(jdx);
--- a/scripts/general/cell2mat.m +++ b/scripts/general/cell2mat.m @@ -70,7 +70,7 @@ endif xdim = [1:idim-1, idim+1:nd]; cc = num2cell (c, xdim); - c = cellfun (@cat, {idim}, cc{:}, "uniformoutput", false); + c = cellfun (@cat, {idim}, cc{:}, "UniformOutput", false); endfor m = c{1}; endif
--- a/scripts/general/common_size.m +++ b/scripts/general/common_size.m @@ -72,7 +72,7 @@ varargout = varargin; if (any (nscal)) dims = size (varargin{find (nscal, 1)}); - subs = arrayfun (@ones, 1, dims, "uniformoutput", false); + subs = arrayfun (@ones, 1, dims, "UniformOutput", false); varargout(scal) = cellindexmat (varargin(scal), subs{:}); endif endif
--- a/scripts/general/structfun.m +++ b/scripts/general/structfun.m @@ -140,6 +140,6 @@ %! s = struct ("a", {1, 2, 3}, "b", {4, 5, 6}); %! c = struct ("a", {2, 4, 6}, "b", {8, 10, 12}); %! d = struct ("a", {1, 4, 9}, "b", {16, 25, 36}); -%! [aa, bb] = structfun(@twoouts, s, "uniformoutput", false); +%! [aa, bb] = structfun(@twoouts, s, "UniformOutput", false); %! assert(aa, c); %! assert(bb, d);
--- a/scripts/pkg/pkg.m +++ b/scripts/pkg/pkg.m @@ -342,8 +342,8 @@ unwind_protect if (octave_forge) - [urls, local_files] = cellfun (@get_forge_download, files, "uniformoutput", false); - [files, succ] = cellfun (@urlwrite, urls, local_files, "uniformoutput", false); + [urls, local_files] = cellfun (@get_forge_download, files, "UniformOutput", false); + [files, succ] = cellfun (@urlwrite, urls, local_files, "UniformOutput", false); succ = [succ{:}]; if (! all (succ)) i = find (! succ, 1);
--- a/scripts/strings/untabify.m +++ b/scripts/strings/untabify.m @@ -56,7 +56,7 @@ if (ischar (t)) s = replace_tabs (t, tw); else - s = cellfun (@(str) replace_tabs (str, tw), t, "uniformoutput", false); + s = cellfun (@(str) replace_tabs (str, tw), t, "UniformOutput", false); endif if (db) s = deblank (s);