Mercurial > octave-nkf
changeset 11605:fd4eb4f95bb4 release-3-0-x
[3-0-0-branch @ 2008-01-07 18:04:06 by jwe]
| author | jwe |
|---|---|
| date | Mon, 07 Jan 2008 18:04:06 +0000 |
| parents | 4c9677b526b1 |
| children | a16658ac8eb9 |
| files | liboctave/ChangeLog liboctave/Sparse-op-defs.h |
| diffstat | 2 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog Fri Jan 04 21:49:30 2008 +0000 +++ b/liboctave/ChangeLog Mon Jan 07 18:04:06 2008 +0000 @@ -1,3 +1,8 @@ +2008-01-07 David Bateman <dbateman@free.fr> + + * Sparse-op-defs.h (SPARSE_ANY_ALL_OP_ROW_CODE): Don't break from + loop if this test succeeds. + 2008-01-03 David Bateman <dbateman@free.fr> * MSparse.cc (SPARSE_A2A2_OP): If first arg is scalar zero, then
--- a/liboctave/Sparse-op-defs.h Fri Jan 04 21:49:30 2008 +0000 +++ b/liboctave/Sparse-op-defs.h Mon Jan 07 18:04:06 2008 +0000 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004, 2005, 2006, 2007 David Bateman +Copyright (C) 2004, 2005, 2006, 2007, 2008 David Bateman Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Andy Adler This file is part of Octave. @@ -1694,12 +1694,12 @@ SPARSE_REDUCTION_OP_COL_EXPR (OP), \ INIT_VAL, MT_RESULT) +// Don't break from this loop if the test succeeds because +// we are looping over the rows and not the columns in the inner +// loop. #define SPARSE_ANY_ALL_OP_ROW_CODE(TEST_OP, TEST_TRUE_VAL) \ if (data (i) TEST_OP 0.0) \ - { \ - tmp[ridx(i)] = TEST_TRUE_VAL; \ - break; \ - } + tmp[ridx(i)] = TEST_TRUE_VAL; \ #define SPARSE_ANY_ALL_OP_COL_CODE(TEST_OP, TEST_TRUE_VAL) \ if (data (i) TEST_OP 0.0) \