Mercurial > octave
changeset 31526:7b6d4b6afef2
maint: Merge stable to default.
| author | Nicholas R. Jankowski <jankowski.nicholas@gmail.com> |
|---|---|
| date | Wed, 23 Nov 2022 14:32:00 -0500 |
| parents | 8027b17bcb92 (current diff) 24ca5cb70a4a (diff) |
| children | 9ffdaa9da257 |
| files | etc/NEWS.8.md |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/NEWS.8.md Wed Nov 23 08:59:59 2022 -0500 +++ b/etc/NEWS.8.md Wed Nov 23 14:32:00 2022 -0500 @@ -181,7 +181,7 @@ - Improved input validation and/or output handling for `poly`, `pinv`, `patch`, `fill`, `fill3`, `qp`, `datevec`, `textscan`, `sub2ind`, `qr`, `airy`, - `regexp`, `dec2bin`, `dec2hex`, and many others. + `regexp`, `dec2bin`, `dec2hex`, `mean`, and many others. - Improved performance for `complex`, `fftw`, `delaunayn`, `isfield`, `tsearch`, sparse matrix exponentiation, other sparse operations, and many others. - Overhauled `@audiorecorder` and `@audioplayer` classes.
--- a/scripts/statistics/mean.m Wed Nov 23 08:59:59 2022 -0500 +++ b/scripts/statistics/mean.m Wed Nov 23 14:32:00 2022 -0500 @@ -157,7 +157,7 @@ ## Two numeric input arguments, dimensions given. Note scalar is vector! dim = varargin{1}; - if (! (isvector (dim) && all (dim)) || any (rem (dim, 1))) + if (! (isvector (dim) && dim > 0 && rem (dim, 1) == 0)) error ("mean: DIM must be a positive integer scalar or vector"); endif @@ -347,7 +347,11 @@ %!error <X must be either a numeric or logical> mean ("char") %!error <DIM must be a positive integer> mean (1, ones (2,2)) %!error <DIM must be a positive integer> mean (1, 1.5) +%!error <DIM must be a positive integer> mean (1, -1) +%!error <DIM must be a positive integer> mean (1, -1.5) %!error <DIM must be a positive integer> mean (1, 0) +%!error <DIM must be a positive integer> mean (1, NaN) +%!error <DIM must be a positive integer> mean (1, Inf) %!error <DIM must index at least N-2 dimensions of X> %! mean (repmat ([1:20;6:25], [5 2 6 3 5]), [1 2])