changeset 5813:dfef2f909f34

[project @ 2006-05-11 19:46:15 by dbateman]
author dbateman
date Thu, 11 May 2006 19:46:15 +0000
parents 653405a3af98
children 67bf9b4f2ae2
files liboctave/ChangeLog liboctave/Sparse-op-defs.h
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-08  David Bateman  <dbateman@free.fr>
+
+	* Sparse-op-defs.h (SPARSE_SPARSE_MUL): fix bug in previous
+	modification.
+
 2006-05-09  David Bateman  <dbateman@free.fr>
 
 	* sparse-dmsolve.cc: Remove reference to ov-re-sparse.h,
--- a/liboctave/Sparse-op-defs.h
+++ b/liboctave/Sparse-op-defs.h
@@ -1623,7 +1623,7 @@
 			} \
 		    } \
 		  for (octave_idx_type k = 0; k < nr; k++) \
-		    if (w[k] == i + 1 && Xcol[k] != 0.) \
+		    if (w[k] == i + 1) \
 		      { \
 		        retval.xdata(ii) = Xcol[k]; \
 		        retval.xridx(ii++) = k; \
@@ -1655,7 +1655,7 @@
 		    retval.xdata(k) = Xcol[retval.xridx(k)]; \
 		}  \
 	    } \
-	  retval.maybe_compress ();\
+	  retval.maybe_compress (true);\
 	  return retval; \
 	} \
     }