changeset 6772:315bc7c8f9b5

[project @ 2007-07-10 09:51:39 by dbateman]
author dbateman
date Tue, 10 Jul 2007 09:54:23 +0000
parents ffaac3c723ac
children b6e2ab6a8421
files scripts/general/Makefile.in src/ChangeLog src/DLD-FUNCTIONS/sparse.cc src/data.cc
diffstat 4 files changed, 15 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/general/Makefile.in	Tue Jul 10 09:15:59 2007 +0000
+++ b/scripts/general/Makefile.in	Tue Jul 10 09:54:23 2007 +0000
@@ -20,9 +20,9 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 
-SOURCES = __isequal__.m __splinen__.m arrayfun.m bicubic.m bitcmp.m bitget.m \
-  bitset.m blkdiag.m cart2pol.m cart2sph.m cell2mat.m circshift.m \
-  common_size.m cplxpair.m cumtrapz.m deal.m diff.m flipdim.m \
+SOURCES = __isequal__.m __splinen__.m accumarray.m arrayfun.m bicubic.m \
+  bitcmp.m bitget.m bitset.m blkdiag.m cart2pol.m cart2sph.m cell2mat.m \
+  circshift.m common_size.m cplxpair.m cumtrapz.m deal.m diff.m flipdim.m \
   fliplr.m flipud.m gradient.m ind2sub.m int2str.m interp1.m \
   interp2.m interp3.m interpn.m interpft.m is_duplicate_entry.m isa.m \
   isdefinite.m isdir.m isequal.m isequalwithequalnans.m isscalar.m \
--- a/src/ChangeLog	Tue Jul 10 09:15:59 2007 +0000
+++ b/src/ChangeLog	Tue Jul 10 09:54:23 2007 +0000
@@ -1,7 +1,8 @@
 2007-06-27  David Bateman  <dbateman@free.fr>
 
 	* DLD-FUNCTIONS/sparse.cc (Fspdiag): Ensure spdiag(zeros(1,0)) returns
-	0x0 matrix.
+	0x0 matrix. Doc update.
+	* data.cc (Fdiag): Doc update.
 
 2007-06-28  John W. Eaton  <jwe@octave.org>
 
--- a/src/DLD-FUNCTIONS/sparse.cc	Tue Jul 10 09:15:59 2007 +0000
+++ b/src/DLD-FUNCTIONS/sparse.cc	Tue Jul 10 09:54:23 2007 +0000
@@ -1054,6 +1054,7 @@
 the vector is placed on the main diagonal.  For example,\n\
 \n\
 @example\n\
+@group\n\
 spdiag ([1, 2, 3], 1)\n\
 ans =\n\
 \n\
@@ -1061,7 +1062,12 @@
   (1 , 2) -> 1\n\
   (2 , 3) -> 2\n\
   (3 , 4) -> 3\n\
+@end group\n\
 @end example\n\
+\n\
+@noindent\n\
+Given a matrix argument, instead of a vector, @code{spdiag} extracts the\n\
+@var{k}-th diagonal of the sparse matrix.\n\ 
 @seealso{diag}\n\
 @end deftypefn")
 {
--- a/src/data.cc	Tue Jul 10 09:15:59 2007 +0000
+++ b/src/data.cc	Tue Jul 10 09:54:23 2007 +0000
@@ -653,6 +653,10 @@
          0  0  0  0\n\
 @end group\n\
 @end example\n\
+\n\
+@noindent\n\
+Given a matrix argument, instead of a vector, @code{diag} extracts the\n\
+@var{k}-th diagonal of the matrix.\n\ 
 @end deftypefn")
 {
   octave_value retval;