Mercurial > hg > octave-thorsten
changeset 9371:56751dfc6ebd
fix var for scalar and empty arguments
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 22 Jun 2009 11:39:45 -0400 |
| parents | 4ff6f8efdda2 |
| children | 32b15d5c3147 |
| files | scripts/ChangeLog scripts/statistics/base/var.m |
| diffstat | 2 files changed, 36 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,8 @@ +2009-06-22 John W. Eaton <jwe@octave.org> + + * statistics/base/var.m: Return zero for scalar case. Handle + empty arguments in a Matlab compatible way. New tests. + 2009-06-19 Jaroslav Hajek <highegg@gmail.com> * set/ismember.m: Properly handle NaNs. Fix test.
--- a/scripts/statistics/base/var.m +++ b/scripts/statistics/base/var.m @@ -56,13 +56,39 @@ opt = 0; endif - n = size (x, dim); - if (n == 1) + sz = size (x); + n = sz(dim); + if (isempty (x)) + ## FIXME -- is there a way to obtain these results without all the + ## special cases? + if (ndim (x) == 2 && sz(0) == 0 && sz(1) == 0) + retval = NaN; + else + sz(dim) = 1; + if (n == 0) + if (prod (sz) == 0) + retval = zeros (sz); + else + retval = NaN (sz); + endif + else + retval = zeros (sz); + endif + endif + elseif (n == 1) retval = zeros (sz); - elseif (numel (x) > 0) + else retval = sumsq (center (x, dim), dim) / (n + opt - 1); - else - error ("var: x must not be empty"); endif endfunction + +%!assert (var (13), 0) +%!assert (var ([]), NaN) +%!assert (var (ones (0, 0, 0), 0, 1), zeros (1, 0, 0)) +%!assert (var (ones (0, 0, 0), 0, 2), zeros (0, 1, 0)) +%!assert (var (ones (0, 0, 0), 0, 3), zeros (0, 0)) +%!assert (var (ones (1, 2, 0)), zeros (1, 1, 0)) +%!assert (var (ones (1, 2, 0, 0), 0, 1), zeros (1, 2, 0, 0)) +%!assert (var (ones (1, 2, 0, 0), 0, 2), zeros (1, 1, 0, 0)) +%!assert (var (ones (1, 2, 0, 0), 0, 3), zeros (1, 2, 1, 0))