Mercurial > hg > octave-lyh

changeset 9417:5d46c4a894e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix bugs in sparse reductions
author Jaroslav Hajek <highegg@gmail.com>
date Fri, 03 Jul 2009 12:21:12 +0200
parents 2cc47338e427
children f008a3a1bcb0
files liboctave/CSparse.cc liboctave/ChangeLog liboctave/Sparse-op-defs.h liboctave/dSparse.cc
diffstat 4 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/CSparse.cc
+++ b/liboctave/CSparse.cc
@@ -7373,7 +7373,7 @@
   else
     {
       SPARSE_REDUCTION_OP (SparseComplexMatrix, Complex, *=, 
-			   (cidx(j+1) - cidx(j) < nc ? 0.0 : 1.0), 1.0);
+			   (cidx(j+1) - cidx(j) < nr ? 0.0 : 1.0), 1.0);
     }
 }
 
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-03  Jaroslav Hajek  <highegg@gmail.com>
+
+	* Sparse-op-defs.h (SPARSE_ALL_OP): Fix typo.
+	* dSparse.cc (SparseMatrix::prod): Ditto.
+	* CSparse.cc (ComplexSparseMatrix::prod): Ditto.
+
 2009-07-02  Jaroslav Hajek  <highegg@gmail.com>
 
 	* Sparse-diag-op-defs.h (inner_do_add_sm_dm): Rewrite to ensure
--- a/liboctave/Sparse-op-defs.h
+++ b/liboctave/Sparse-op-defs.h
@@ -1828,7 +1828,7 @@
     return transpose (). all (0). transpose(); \
   else \
     { \
-      SPARSE_ANY_ALL_OP (DIM, (cidx(j+1) - cidx(j) < nc ? false : true), \
+      SPARSE_ANY_ALL_OP (DIM, (cidx(j+1) - cidx(j) < nr ? false : true), \
 			 true, ==, false); \
     }
 
--- a/liboctave/dSparse.cc
+++ b/liboctave/dSparse.cc
@@ -7483,7 +7483,7 @@
   else
     {
       SPARSE_REDUCTION_OP (SparseMatrix, double, *=, 
-			   (cidx(j+1) - cidx(j) < nc ? 0.0 : 1.0), 1.0);
+			   (cidx(j+1) - cidx(j) < nr ? 0.0 : 1.0), 1.0);
     }
 }