From: Alois S. <sch...@us...> - 2006-08-06 20:09:21
|
Update of /cvsroot/octave/octave-forge/extra/NaN In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19005 Modified Files: nanstd.m Log Message: define FLAG if nargin<2 Index: nanstd.m =================================================================== RCS file: /cvsroot/octave/octave-forge/extra/NaN/nanstd.m,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- nanstd.m 2 Aug 2006 17:27:40 -0000 1.3 +++ nanstd.m 6 Aug 2006 20:09:07 -0000 1.4 @@ -35,13 +35,19 @@ % $Id$ -if nargin>1 - [s,n,y] = sumskipnan(i,DIM); -else - [s,n,y] = sumskipnan(i); +if nargin<2, + FLAG = 0; +end; + +if nargin<3, + DIM = []; +end; +if isempty(DIM), + DIM=min(find(size(i)>1)); + if isempty(DIM), DIM=1; end; end; -y = y.*n - real(s).^2 - imag(s).^2; % n*n * (summed squares with removed mean) +[y,n] = sumskipnan(center(i,DIM).^2,DIM); if (FLAG~=1) y = sqrt(y./(n.*max(n-1,0))); % normalize with N-1 |