Mercurial > octave

changeset 11191:01ddaedd6ad5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reverse changeset b1f4bdc276b6. Use all lower case for "uniformoutput" option.
author Rik <octave@nomad.inbox5.com>
date Thu, 04 Nov 2010 12:18:08 -0700
parents b1f4bdc276b6
children 452dc55cc556
files scripts/ChangeLog scripts/Makefile.am scripts/general/accumarray.m scripts/general/accumdim.m scripts/general/blkdiag.m scripts/general/cell2mat.m scripts/general/common_size.m scripts/general/private/__isequal__.m scripts/general/private/__splinen__.m scripts/geometry/voronoi.m scripts/io/textscan.m scripts/miscellaneous/private/__xzip__.m scripts/pkg/pkg.m scripts/plot/axis.m scripts/plot/pareto.m scripts/plot/private/__patch__.m scripts/statistics/base/mode.m scripts/strings/deblank.m scripts/strings/strcat.m scripts/strings/strmatch.m scripts/strings/strtrim.m scripts/strings/untabify.m
diffstat 22 files changed, 46 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog	Wed Nov 03 17:37:00 2010 -0700
+++ b/scripts/ChangeLog	Thu Nov 04 12:18:08 2010 -0700
@@ -1,3 +1,15 @@
+2010-11-04  Rik  <octave@nomad.inbox5.com>
+
+	* general/accumarray.m, general/accumdim.m, general/blkdiag.m,
+	  general/cell2mat.m, general/common_size.m,
+	  general/private/__isequal__.m, general/private/__splinen__.m,
+	  geometry/voronoi.m, io/textscan.m, miscellaneous/private/__xzip__.m,
+	  pkg/pkg.m, plot/axis.m, plot/pareto.m, plot/private/__patch__.m,
+	  statistics/base/mode.m, strings/deblank.m, strings/strcat.m,
+	  strings/strmatch.m, strings/strtrim.m, strings/untabify.m:
+	  Reverse previous changeset.  Use all lower case for "uniformoutput"
+	  option.
+
 2010-11-03  Rik  <octave@nomad.inbox5.com>
 
 	* general/accumdim.m, general/cell2mat.m, general/common_size.m,
--- a/scripts/Makefile.am	Wed Nov 03 17:37:00 2010 -0700
+++ b/scripts/Makefile.am	Thu Nov 04 12:18:08 2010 -0700
@@ -332,10 +332,10 @@
 	@$(do_subst_config_vals)
 
 check-m-sources:
-	@echo -n "checking whether files in source tree are listed in module.mk files..."; \
+	@echo "checking whether files in source tree are listed in module.mk files..."; \
 	for f in $$(find $(srcdir) -name '*.m'); do \
 	  found=false; \
-	  for m in $(FCN_FILES); do \
+	  for m in $(FCN_FILES) $(GEN_FCN_FILES); do \
 	    if [ "$$f" = $(srcdir)/"$$m" ]; then \
 	      found=true; \
 	      break; \
--- a/scripts/general/accumarray.m	Wed Nov 03 17:37:00 2010 -0700
+++ b/scripts/general/accumarray.m	Thu Nov 04 12:18:08 2010 -0700
@@ -71,7 +71,7 @@
   endif
 
   if (iscell (subs))
-    subs = cellfun (@vec, subs, "UniformOutput", false);
+    subs = cellfun (@vec, subs, "uniformoutput", false);
     ndims = numel (subs);
     if (ndims == 1)
       subs = subs{1};
--- a/scripts/general/accumdim.m	Wed Nov 03 17:37:00 2010 -0700
+++ b/scripts/general/accumdim.m	Thu Nov 04 12:18:08 2010 -0700
@@ -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/blkdiag.m	Wed Nov 03 17:37:00 2010 -0700
+++ b/scripts/general/blkdiag.m	Thu Nov 04 12:18:08 2010 -0700
@@ -44,7 +44,7 @@
 
   ## size is an option for cellfun, but it's a bit different from
   ## calling size directly.
-  tmp = cell2mat (cellfun (@size, varargin', "UniformOutput", false));
+  tmp = cell2mat (cellfun (@size, varargin', "uniformoutput", false));
   csz = cumsum ([0 0; tmp], 1);
   retval = zeros (csz(end,:));
 
--- a/scripts/general/cell2mat.m	Wed Nov 03 17:37:00 2010 -0700
+++ b/scripts/general/cell2mat.m	Thu Nov 04 12:18:08 2010 -0700
@@ -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	Wed Nov 03 17:37:00 2010 -0700
+++ b/scripts/general/common_size.m	Thu Nov 04 12:18:08 2010 -0700
@@ -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/private/__isequal__.m	Wed Nov 03 17:37:00 2010 -0700
+++ b/scripts/general/private/__isequal__.m	Thu Nov 04 12:18:08 2010 -0700
@@ -59,7 +59,7 @@
   ## All arguments must either be of the same class or they must be
   ## numeric values.
   t = (all (strcmp (class(x),
-                   cellfun (@class, varargin, "UniformOutput", false)))
+                   cellfun (@class, varargin, "uniformoutput", false)))
        || ((isnumeric (x) || islogical (x))
            && all (cellfun (@isnumeric, varargin)
                    | cellfun (@islogical, varargin))));
@@ -67,7 +67,7 @@
   if (t)
     ## Test that everything has the same number of dimensions.
     s_x = size (x);
-    s_v = cellfun (@size, varargin, "UniformOutput", false);
+    s_v = cellfun (@size, varargin, "uniformoutput", false);
     t = all (length (s_x) == cellfun (@length, s_v));
   endif
 
@@ -89,7 +89,7 @@
       ## Test the number of fields.
       fn_x = fieldnames (x);
       l_fn_x = length (fn_x);
-      fn_v = cellfun (@fieldnames, varargin, "UniformOutput", false);
+      fn_v = cellfun (@fieldnames, varargin, "uniformoutput", false);
       t = all (l_fn_x == cellfun (@length, fn_v));
 
       ## Test that all the names are equal.
--- a/scripts/general/private/__splinen__.m	Wed Nov 03 17:37:00 2010 -0700
+++ b/scripts/general/private/__splinen__.m	Thu Nov 04 12:18:08 2010 -0700
@@ -40,7 +40,7 @@
     yi = permute (spline (x{i}, yi, xi{i}(:)), [length(x),1:length(x)-1]);
   endfor
 
-  [xi{:}] = ndgrid (cellfun (@(x) x(:), xi, "UniformOutput", false){:});
+  [xi{:}] = ndgrid (cellfun (@(x) x(:), xi, "uniformoutput", false){:});
   idx = zeros (size(xi{1}));
   for i = 1 : length(x)
     idx |= xi{i} < min (x{i}(:)) | xi{i} > max (x{i}(:));
--- a/scripts/geometry/voronoi.m	Wed Nov 03 17:37:00 2010 -0700
+++ b/scripts/geometry/voronoi.m	Thu Nov 04 12:18:08 2010 -0700
@@ -131,7 +131,7 @@
   c = c(idx).';
   k = sum (cellfun ('length', c));
   edges = cell2mat(cellfun (@(x) [x ; [x(end), x(1:end-1)]], c, 
-                            "UniformOutput", false));
+                            "uniformoutput", false));
 
   ## Identify the unique edges of the Voronoi diagram
   edges = sortrows (sort (edges).').';
--- a/scripts/io/textscan.m	Wed Nov 03 17:37:00 2010 -0700
+++ b/scripts/io/textscan.m	Thu Nov 04 12:18:08 2010 -0700
@@ -106,7 +106,7 @@
       [c{:}] = strread (str, formatstr, args{:});
 
       if (ischar (fid) && isfinite (nlines))
-        c = cellfun (@(x) x(1:nlines), c, "UniformOutput", false);
+        c = cellfun (@(x) x(1:nlines), c, "uniformoutput", false);
       endif
 
       if (nargout == 2)
--- a/scripts/miscellaneous/private/__xzip__.m	Wed Nov 03 17:37:00 2010 -0700
+++ b/scripts/miscellaneous/private/__xzip__.m	Thu Nov 04 12:18:08 2010 -0700
@@ -76,14 +76,14 @@
         if (nargin == 5)
           compressed_files = cellfun(
               @(x) fullfile (outdir, sprintf ("%s.%s", x, extension)), 
-              f, "UniformOutput", false);
+              f, "uniformoutput", false);
         else
           movefile (cellfun(@(x) sprintf ("%s.%s", x, extension), f, 
-                            "UniformOutput", false), cwd);
+                            "uniformoutput", false), cwd);
           ## FIXME this does not work when you try to compress directories
 
           compressed_files  = cellfun(@(x) sprintf ("%s.%s", x, extension), 
-                                      files, "UniformOutput", false);
+                                      files, "uniformoutput", false);
         endif
 
         if (nargout > 0)
@@ -112,9 +112,9 @@
 endfunction
 
 function [d, f] = myfileparts (files)
-  [d, f, ext] = cellfun (@(x) fileparts (x), files, "UniformOutput", false);
+  [d, f, ext] = cellfun (@(x) fileparts (x), files, "uniformoutput", false);
   f = cellfun (@(x, y) sprintf ("%s%s", x, y), f, ext,
-               "UniformOutput", false); 
+               "uniformoutput", false); 
   idx = cellfun (@isdir, files);
   d(idx) = "";
   f(idx) = files(idx);
--- a/scripts/pkg/pkg.m	Wed Nov 03 17:37:00 2010 -0700
+++ b/scripts/pkg/pkg.m	Thu Nov 04 12:18:08 2010 -0700
@@ -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);
@@ -503,7 +503,7 @@
     wd = pwd ();
     unwind_protect
       cd (prefix);
-      dirlist = glob (cellfun(@(x) cstrcat(x, '-*'), files, 'UniformOutput', 0));
+      dirlist = glob (cellfun(@(x) cstrcat(x, '-*'), files, 'uniformoutput', 0));
     unwind_protect_cleanup
       cd (wd);
     end_unwind_protect
@@ -1359,7 +1359,7 @@
 
       filenames = cellfun (@(x) fullfile (src, x),
                            {m.name, oct.name, mex.name},
-                           "UniformOutput", false);
+                           "uniformoutput", false);
     endif
 
     ## Split into architecture dependent and independent files.
--- a/scripts/plot/axis.m	Wed Nov 03 17:37:00 2010 -0700
+++ b/scripts/plot/axis.m	Thu Nov 04 12:18:08 2010 -0700
@@ -322,8 +322,8 @@
     if (iscell (data))
       data = data (find (! cellfun (@isempty, data)));
       if (! isempty (data))
-        lims_min = min (cellfun (@min, cellfun (@min, data, 'UniformOutput', false)(:))); 
-        lims_max = max (cellfun (@max, cellfun (@max, data, 'UniformOutput', false)(:))); 
+        lims_min = min (cellfun (@min, cellfun (@min, data, 'uniformoutput', false)(:))); 
+        lims_max = max (cellfun (@max, cellfun (@max, data, 'uniformoutput', false)(:))); 
         lims = [lims_min, lims_max]; 
       else
         lims = [0, 1];
--- a/scripts/plot/pareto.m	Wed Nov 03 17:37:00 2010 -0700
+++ b/scripts/plot/pareto.m	Thu Nov 04 12:18:08 2010 -0700
@@ -66,12 +66,12 @@
       if (ischar (y))
         y = cellstr (y);
       else
-        y = cellfun (@num2str, num2cell (y), "UniformOutput", false);
+        y = cellfun (@num2str, num2cell (y), "uniformoutput", false);
       endif
     endif
   else
     y = cellfun (@int2str, num2cell (1 : numel(x)), 
-                 "UniformOutput", false);
+                 "uniformoutput", false);
   endif
 
   [x, idx] = sort (x, "descend");
--- a/scripts/plot/private/__patch__.m	Wed Nov 03 17:37:00 2010 -0700
+++ b/scripts/plot/private/__patch__.m	Thu Nov 04 12:18:08 2010 -0700
@@ -209,7 +209,7 @@
     t2 = find (t1 != t1([2:end,end],:));
     idx (t1) = idx (t2 (cell2mat (cellfun (@(x) x(1)*ones(1,x(2)),
                 mat2cell ([1 : nc; sum(t1)], 2, ones(1,nc)), 
-                                           "UniformOutput", false))));
+                                           "uniformoutput", false))));
   endif
   x = reshape (vert(:,1)(idx), size (idx));
   y = reshape (vert(:,2)(idx), size (idx));
--- a/scripts/statistics/base/mode.m	Wed Nov 03 17:37:00 2010 -0700
+++ b/scripts/statistics/base/mode.m	Thu Nov 04 12:18:08 2010 -0700
@@ -115,7 +115,7 @@
 %! [m2, f2, c2] = mode (full (a));
 %! assert (m, sparse (m2));
 %! assert (f, sparse (f2));
-%! assert (c, cellfun (@(x) sparse (0), c2, 'UniformOutput', false));
+%! assert (c, cellfun (@(x) sparse (0), c2, 'uniformoutput', false));
 
 %!assert(mode([2,3,1,2,3,4],1),[2,3,1,2,3,4])
 %!assert(mode([2,3,1,2,3,4],2),2)
--- a/scripts/strings/deblank.m	Wed Nov 03 17:37:00 2010 -0700
+++ b/scripts/strings/deblank.m	Thu Nov 04 12:18:08 2010 -0700
@@ -55,7 +55,7 @@
 
   elseif (iscell(s))
 
-    s = cellfun (@deblank, s, "UniformOutput", false);
+    s = cellfun (@deblank, s, "uniformoutput", false);
 
   else
     error ("deblank: expecting character string argument");
--- a/scripts/strings/strcat.m	Wed Nov 03 17:37:00 2010 -0700
+++ b/scripts/strings/strcat.m	Thu Nov 04 12:18:08 2010 -0700
@@ -61,7 +61,7 @@
       st = varargin{1};
     elseif (nargin > 1)
       ## Convert to cells of strings
-      uo = "UniformOutput";
+      uo = "uniformoutput";
       reals = cellfun (@isreal, varargin);
       if (any (reals))
         varargin(reals) = cellfun (@char, varargin(reals), uo, false);
--- a/scripts/strings/strmatch.m	Wed Nov 03 17:37:00 2010 -0700
+++ b/scripts/strings/strmatch.m	Thu Nov 04 12:18:08 2010 -0700
@@ -67,7 +67,7 @@
     idx = find (strncmp (s, A, len));
     if (exact)
       ## We can't just use strcmp, because we need to ignore whitespace.
-      B = cellfun (@strtrimr, A(idx), "UniformOutput", false);
+      B = cellfun (@strtrimr, A(idx), "uniformoutput", false);
       idx = idx (strcmp (s, B));
     endif
   elseif (ischar (A))
--- a/scripts/strings/strtrim.m	Wed Nov 03 17:37:00 2010 -0700
+++ b/scripts/strings/strtrim.m	Thu Nov 04 12:18:08 2010 -0700
@@ -55,7 +55,7 @@
 
   elseif (iscell(s))
 
-    s = cellfun (@strtrim, s, "UniformOutput", false);
+    s = cellfun (@strtrim, s, "uniformoutput", false);
 
   else
     error ("strtrim: expecting string argument");
--- a/scripts/strings/untabify.m	Wed Nov 03 17:37:00 2010 -0700
+++ b/scripts/strings/untabify.m	Thu Nov 04 12:18:08 2010 -0700
@@ -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);