# HG changeset patch
# User Jaroslav Hajek <highegg@gmail.com>
# Date 1246616472 -7200
# Node ID 5d46c4a894e81548889d677381c80db0a56d01f3
# Parent  2cc47338e4276a24ff71725f56e49371affab17a
fix bugs in sparse reductions

diff -r 2cc47338e427 -r 5d46c4a894e8 liboctave/CSparse.cc
--- a/liboctave/CSparse.cc	Thu Jul 02 13:26:15 2009 +0200
+++ b/liboctave/CSparse.cc	Fri Jul 03 12:21:12 2009 +0200
@@ -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);
     }
 }
 
diff -r 2cc47338e427 -r 5d46c4a894e8 liboctave/ChangeLog
--- a/liboctave/ChangeLog	Thu Jul 02 13:26:15 2009 +0200
+++ b/liboctave/ChangeLog	Fri Jul 03 12:21:12 2009 +0200
@@ -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
diff -r 2cc47338e427 -r 5d46c4a894e8 liboctave/Sparse-op-defs.h
--- a/liboctave/Sparse-op-defs.h	Thu Jul 02 13:26:15 2009 +0200
+++ b/liboctave/Sparse-op-defs.h	Fri Jul 03 12:21:12 2009 +0200
@@ -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); \
     }
 
diff -r 2cc47338e427 -r 5d46c4a894e8 liboctave/dSparse.cc
--- a/liboctave/dSparse.cc	Thu Jul 02 13:26:15 2009 +0200
+++ b/liboctave/dSparse.cc	Fri Jul 03 12:21:12 2009 +0200
@@ -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);
     }
 }