Mercurial > octave

comparison scripts/statistics/base/kurtosis.m @ 21309:7fbecef105ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow statistics functions to work over non-existent dimension (bug #33523). * var.m, center.m, kurtosis.m, mean.m, meansq.m, median.m, moment.m, skewness.m, std.m: Remove check for input dimension being within the range of ndims (x). Add BIST tests for new behavior and update input validation tests.
author Rik <rik@octave.org>
date Fri, 19 Feb 2016 21:27:03 -0800
parents c53bfd6d8e08
children bac0d6f07a3e
comparison
equal deleted inserted replaced
21308:c53bfd6d8e08 21309:7fbecef105ca
103 sz = size (x); 103 sz = size (x);
104 if (nargin < 3) 104 if (nargin < 3)
105 ## Find the first non-singleton dimension. 105 ## Find the first non-singleton dimension.
106 (dim = find (sz > 1, 1)) || (dim = 1); 106 (dim = find (sz > 1, 1)) || (dim = 1);
107 else 107 else
108 if (! (isscalar (dim) && dim == fix (dim)) || ! (1 <= dim && dim <= nd)) 108 if (! (isscalar (dim) && dim == fix (dim) && dim > 0))
109 error ("kurtosis: DIM must be an integer and a valid dimension"); 109 error ("kurtosis: DIM must be an integer and a valid dimension");
110 endif 110 endif
111 endif 111 endif
112 112
113 n = sz(dim); 113 n = size (x, dim);
114 sz(dim) = 1; 114 sz(dim) = 1;
115 115
116 x = center (x, dim); # center also promotes integer, logical to double 116 x = center (x, dim); # center also promotes integer, logical to double
117 v = var (x, 1, dim); # normalize with 1/N 117 v = var (x, 1, dim); # normalize with 1/N
118 y = sum (x .^ 4, dim); 118 y = sum (x .^ 4, dim);
138 %! y = [x, 2*x]; 138 %! y = [x, 2*x];
139 %! assert (kurtosis (y), [2.5, 2.5], sqrt (eps)); 139 %! assert (kurtosis (y), [2.5, 2.5], sqrt (eps));
140 140
141 %!assert (kurtosis ([-3, 0, 1]) == kurtosis ([-1, 0, 3])) 141 %!assert (kurtosis ([-3, 0, 1]) == kurtosis ([-1, 0, 3]))
142 %!assert (kurtosis (ones (3, 5)), NaN (1, 5)) 142 %!assert (kurtosis (ones (3, 5)), NaN (1, 5))
143 %!assert (kurtosis (1, [], 3), NaN)
143 144
144 %!assert (kurtosis ([1:5 10; 1:5 10], 0, 2), 5.4377317925288901 * [1; 1], 8 * eps) 145 %!assert (kurtosis ([1:5 10; 1:5 10], 0, 2), 5.4377317925288901 * [1; 1], 8 * eps)
145 %!assert (kurtosis ([1:5 10; 1:5 10], 1, 2), 2.9786509002956195 * [1; 1], 8 * eps) 146 %!assert (kurtosis ([1:5 10; 1:5 10], 1, 2), 2.9786509002956195 * [1; 1], 8 * eps)
146 %!assert (kurtosis ([1:5 10; 1:5 10], [], 2), 2.9786509002956195 * [1; 1], 8 * eps) 147 %!assert (kurtosis ([1:5 10; 1:5 10], [], 2), 2.9786509002956195 * [1; 1], 8 * eps)
147 148
163 %!error <FLAG must be 0 or 1> kurtosis (1, 2) 164 %!error <FLAG must be 0 or 1> kurtosis (1, 2)
164 %!error <FLAG must be 0 or 1> kurtosis (1, [1 0]) 165 %!error <FLAG must be 0 or 1> kurtosis (1, [1 0])
165 %!error <DIM must be an integer> kurtosis (1, [], ones (2,2)) 166 %!error <DIM must be an integer> kurtosis (1, [], ones (2,2))
166 %!error <DIM must be an integer> kurtosis (1, [], 1.5) 167 %!error <DIM must be an integer> kurtosis (1, [], 1.5)
167 %!error <DIM must be .* a valid dimension> kurtosis (1, [], 0) 168 %!error <DIM must be .* a valid dimension> kurtosis (1, [], 0)
168 %!error <DIM must be .* a valid dimension> kurtosis (1, [], 3)
169 169