Mercurial > hg > octave-nkf
view scripts/general/postpad.m @ 18581:d28c4c4547ef gui-release
Allow postpad and prepad to expand singleton dimensions (bug #41633)
* postpad.m, prepad.m: Allow postpad and prepad to expand singleton
dimensions. Add %!tests. Remove %!errors that are no longer errors.
author | Mike Miller <mtmiller@ieee.org> |
---|---|
date | Fri, 21 Feb 2014 17:48:51 -0500 |
parents | d63878346099 |
children | 107ec5195a47 |
line wrap: on
line source
## Copyright (C) 1994-2013 John W. Eaton ## ## This file is part of Octave. ## ## Octave is free software; you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by ## the Free Software Foundation; either version 3 of the License, or (at ## your option) any later version. ## ## Octave is distributed in the hope that it will be useful, but ## WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ## General Public License for more details. ## ## You should have received a copy of the GNU General Public License ## along with Octave; see the file COPYING. If not, see ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- ## @deftypefn {Function File} {} postpad (@var{x}, @var{l}) ## @deftypefnx {Function File} {} postpad (@var{x}, @var{l}, @var{c}) ## @deftypefnx {Function File} {} postpad (@var{x}, @var{l}, @var{c}, @var{dim}) ## Append the scalar value @var{c} to the vector @var{x} until it is of length ## @var{l}. If @var{c} is not given, a value of 0 is used. ## ## If @code{length (@var{x}) > @var{l}}, elements from the end of ## @var{x} are removed until a vector of length @var{l} is obtained. ## ## If @var{x} is a matrix, elements are appended or removed from each row. ## ## If the optional argument @var{dim} is given, operate along this ## dimension. ## ## If @var{dim} is larger than the dimensions of @var{x}, the result will ## have @var{dim} dimensions. ## @seealso{prepad, cat, resize} ## @end deftypefn ## Author: Tony Richardson <arichard@stark.cc.oh.us> ## Created: June 1994 function y = postpad (x, l, c, dim) if (nargin < 2 || nargin > 4) print_usage (); endif if (nargin < 3 || isempty (c)) c = 0; else if (! isscalar (c)) error ("postpad: third argument must be empty or a scalar"); endif endif nd = ndims (x); sz = size (x); if (nargin < 4) ## Find the first non-singleton dimension. (dim = find (sz > 1, 1)) || (dim = 1); else if (!(isscalar (dim) && dim == fix (dim) && dim >= 1)) error ("postpad: DIM must be an integer and a valid dimension"); endif endif if (! isscalar (l) || l < 0) error ("postpad: second argument must be a positive scaler"); endif if (dim > nd) sz(nd+1:dim) = 1; endif d = sz (dim); if (d >= l) idx = repmat ({':'}, nd, 1); idx{dim} = 1:l; y = x(idx{:}); else sz (dim) = l - d; y = cat (dim, x, c(ones (sz))); endif endfunction %!assert (postpad ([1,2], 4), [1,2,0,0]) %!assert (postpad ([1;2], 4), [1;2;0;0]) %!assert (postpad ([1,2], 4, 2), [1,2,2,2]) %!assert (postpad ([1;2], 4, 2), [1;2;2;2]) %!assert (postpad ([1,2], 2, 2, 1), [1,2;2,2]) %!assert (postpad ([1;2], 2, 2, 3), reshape ([1;2;2;2], 2, 1, 2)) %!assert (postpad ([1,2], 2, 2, 3), reshape ([1,2,2,2], 1, 2, 2)) %!error postpad () %!error postpad (1) %!error postpad (1,2,3,4,5)