Mercurial > octave-libgccjit
diff libinterp/corefcn/data.cc @ 18810:2e68c34521e0 gui-release
maint: Periodic merge of stable to gui-release.
author | Rik <rik@octave.org> |
---|---|
date | Sun, 08 Jun 2014 16:34:22 -0700 |
parents | 59975c3cea6b 53af80da6781 |
children | c53e11fab75f 589354cf668f |
line wrap: on
line diff
--- a/libinterp/corefcn/data.cc Fri Jun 06 09:43:11 2014 -0400 +++ b/libinterp/corefcn/data.cc Sun Jun 08 16:34:22 2014 -0700 @@ -112,11 +112,11 @@ @deftypefn {Built-in Function} {} all (@var{x})\n\ @deftypefnx {Built-in Function} {} all (@var{x}, @var{dim})\n\ For a vector argument, return true (logical 1) if all elements of the vector\n\ -are nonzero.\n\ +are non-zero.\n\ \n\ For a matrix argument, return a row vector of logical ones and\n\ zeros with each element indicating whether all of the elements of the\n\ -corresponding column of the matrix are nonzero. For example:\n\ +corresponding column of the matrix are non-zero. For example:\n\ \n\ @example\n\ @group\n\ @@ -159,11 +159,11 @@ @deftypefn {Built-in Function} {} any (@var{x})\n\ @deftypefnx {Built-in Function} {} any (@var{x}, @var{dim})\n\ For a vector argument, return true (logical 1) if any element of the vector\n\ -is nonzero.\n\ +is non-zero.\n\ \n\ For a matrix argument, return a row vector of logical ones and\n\ zeros with each element indicating whether any of the elements of the\n\ -corresponding column of the matrix are nonzero. For example:\n\ +corresponding column of the matrix are non-zero. For example:\n\ \n\ @example\n\ @group\n\ @@ -2677,9 +2677,9 @@ DEFUN (nnz, args, , "-*- texinfo -*-\n\ -@deftypefn {Built-in Function} {@var{scalar} =} nnz (@var{a})\n\ -Return the number of non zero elements in @var{a}.\n\ -@seealso{sparse, nzmax}\n\ +@deftypefn {Built-in Function} {@var{n} =} nnz (@var{a})\n\ +Return the number of non-zero elements in @var{a}.\n\ +@seealso{nzmax, nonzeros, find}\n\ @end deftypefn") { octave_value retval; @@ -2694,12 +2694,12 @@ DEFUN (nzmax, args, , "-*- texinfo -*-\n\ -@deftypefn {Built-in Function} {@var{scalar} =} nzmax (@var{SM})\n\ +@deftypefn {Built-in Function} {@var{n} =} nzmax (@var{SM})\n\ Return the amount of storage allocated to the sparse matrix @var{SM}.\n\ +\n\ Note that Octave tends to crop unused memory at the first opportunity\n\ -for sparse objects. There are some cases of user created sparse objects\n\ -where the value returned by @dfn{nzmax} will not be the same as @dfn{nnz},\n\ -but in general they will give the same result.\n\ +for sparse objects. Thus, in general the value of @code{nzmax} will be the\n\ +the same as @code{nnz} except for some cases of user-created sparse objects.\n\ @seealso{nnz, spalloc, sparse}\n\ @end deftypefn") { @@ -5223,9 +5223,9 @@ DEFUN (full, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {@var{FM} =} full (@var{SM})\n\ -Return a full storage matrix from a sparse, diagonal, permutation matrix\n\ +Return a full storage matrix from a sparse, diagonal, permutation matrix,\n\ or a range.\n\ -@seealso{sparse}\n\ +@seealso{sparse, issparse}\n\ @end deftypefn") { octave_value retval;