Commit 1018f24f authored by Stéphane Adjemian's avatar Stéphane Adjemian
Browse files

Merge branch 'master' into experimental

parents e0fa737c 74334df1
This diff is collapsed.
......@@ -49,10 +49,11 @@ function c = nandemean(x)
% AUTHOR(S) stephane DOT adjemian AT univ DASH lemans DOT fr
if ndim(x)==1
switch ndim(x)
case 1
c = x-nanmean(x);
elseif ndim(x)==2
case 2
c = bsxfun(@minus,x,nanmean(x));
else
otherwise
error('descriptive_statistics::nandemean:: This function is not implemented for arrays with dimension greater than two!')
end
\ No newline at end of file
......@@ -3,7 +3,7 @@ function y = nanmean(x)
%@info:
%! @deftypefn {Function File} {@var{y} =} nanmean (@var{x})
%! @anchor{nandemean}
%! @anchor{nanmean}
%! @sp 1
%! Computes the mean of each column of a matrix with some NaNs.
%! @sp 2
......@@ -16,7 +16,7 @@ function y = nanmean(x)
%! @strong{Outputs}
%! @table @ @var
%! @item y
%! Matlab matrix (T-by-N). The demeaned x matrix.
%! Matlab vector (1-by-N), the mean.
%! @end table
%! @sp 2
%! @strong{This function is called by:}
......@@ -25,7 +25,7 @@ function y = nanmean(x)
%! @sp 2
%! @strong{This function calls:}
%! @sp 1
%! @ref{ndim},
%! @ref{ndim}
%!
%! @end deftypefn
%@eod:
......
switch_dw @ fc3ee3d8
Subproject commit 1a61d4ad39f81193babf4a7f09deefd65ffbcdfe
Subproject commit fc3ee3d8f4268c44150358fa166dc97eab1c9b26
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment