Mercurial > octave-nkf
changeset 4847:83ddfedb8db7
[project @ 2004-04-02 21:15:34 by jwe]
| author | jwe |
|---|---|
| date | Fri, 02 Apr 2004 21:15:34 +0000 |
| parents | 7a3eb3cc292b |
| children | 8122518935e4 |
| files | scripts/ChangeLog scripts/statistics/base/range.m src/ChangeLog src/ov-bool.h |
| diffstat | 4 files changed, 16 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog Fri Apr 02 20:52:12 2004 +0000 +++ b/scripts/ChangeLog Fri Apr 02 21:15:34 2004 +0000 @@ -1,8 +1,9 @@ 2004-04-02 David Bateman <dbateman@free.fr> * statistics/base/std.m: Allow optional args for type and dim. - * statistics/base/center.m statistics/base/meansq.m - statistics/base/moment.m statistics/base/range.m: Update for NDArrays. + * statistics/base/center.m, statistics/base/meansq.m, + statistics/base/moment.m, statistics/base/range.m: + Update for NDArrays. * signal/fftshift.m: Fix dimensioning error. * statistics/base/std.m: Use repmat not ones(nr,1)*mean to allow
--- a/scripts/statistics/base/range.m Fri Apr 02 20:52:12 2004 +0000 +++ b/scripts/statistics/base/range.m Fri Apr 02 21:15:34 2004 +0000 @@ -19,21 +19,25 @@ ## -*- texinfo -*- ## @deftypefn {Function File} {} range (@var{x}) +## @deftypefn {Function File} {} range (@var{x},@var{dim}) ## If @var{x} is a vector, return the range, i.e., the difference ## between the maximum and the minimum, of the input data. ## ## If @var{x} is a matrix, do the above for each column of @var{x}. +## +## If the optional argument @var{dim} is supplied, work along dimension +## @var{dim}. ## @end deftypefn ## Author: KH <Kurt.Hornik@ci.tuwien.ac.at> ## Description: Compute range -function y = range (x) +function y = range (x, varargin{:}) - if (nargin != 1) - usage ("range (x)"); + if (nargin != 1 && nargin != 2) + usage ("range (x, dim)"); endif - y = max (x) - min (x); + y = max (x, varargin{:}) - min (x, varargin{:}); endfunction
--- a/src/ChangeLog Fri Apr 02 20:52:12 2004 +0000 +++ b/src/ChangeLog Fri Apr 02 21:15:34 2004 +0000 @@ -1,5 +1,7 @@ 2004-04-02 John W. Eaton <jwe@bevo.che.wisc.edu> + * ov-bool.h (octave_bool::bool_array_value): New function. + * ov-base-mat.cc (octave_base_matrix<MT>::subsasgn): Don't allow expressions like x(i)(j) or x(i){j} when x is empty.
--- a/src/ov-bool.h Fri Apr 02 20:52:12 2004 +0000 +++ b/src/ov-bool.h Fri Apr 02 21:15:34 2004 +0000 @@ -108,6 +108,9 @@ boolMatrix bool_matrix_value (void) const { return boolMatrix (1, 1, scalar); } + boolNDArray bool_array_value (void) const + { return boolNDArray (dim_vector (1, 1), scalar); } + octave_value convert_to_str_internal (bool pad, bool force) const; bool save_ascii (std::ostream& os, bool& infnan_warned,