Mercurial > hg > octave-nkf
diff liboctave/dMatrix.cc @ 6390:334499d75c5c
[project @ 2007-03-07 18:11:28 by jwe]
| author | jwe |
|---|---|
| date | Wed, 07 Mar 2007 18:11:29 +0000 |
| parents | 15b299f6803d |
| children | 2ee8293554a3 |
line wrap: on
line diff
--- a/liboctave/dMatrix.cc +++ b/liboctave/dMatrix.cc @@ -1345,7 +1345,7 @@ if (typ == MatrixType::Permuted_Upper) { (*current_liboctave_error_handler) - ("Permuted triangular matrix not implemented"); + ("permuted triangular matrix not implemented"); } else { @@ -1451,7 +1451,7 @@ if (typ == MatrixType::Permuted_Lower) { (*current_liboctave_error_handler) - ("Permuted triangular matrix not implemented"); + ("permuted triangular matrix not implemented"); } else { @@ -3145,22 +3145,30 @@ if (nr == 1) F77_FUNC (xddot, XDDOT) (nc, m.data (), 1, a.data (), 1, *c); else - F77_XFCN (dgemv, DGEMV, (F77_CONST_CHAR_ARG2 ("N", 1), - nr, nc, 1.0, m.data (), ld, - a.data (), 1, 0.0, c, 1 - F77_CHAR_ARG_LEN (1))); + { + F77_XFCN (dgemv, DGEMV, (F77_CONST_CHAR_ARG2 ("N", 1), + nr, nc, 1.0, m.data (), ld, + a.data (), 1, 0.0, c, 1 + F77_CHAR_ARG_LEN (1))); + + if (f77_exception_encountered) + (*current_liboctave_error_handler) + ("unrecoverable error in dgemv"); + } } else - F77_XFCN (dgemm, DGEMM, (F77_CONST_CHAR_ARG2 ("N", 1), - F77_CONST_CHAR_ARG2 ("N", 1), - nr, a_nc, nc, 1.0, m.data (), - ld, a.data (), lda, 0.0, c, nr - F77_CHAR_ARG_LEN (1) - F77_CHAR_ARG_LEN (1))); - - if (f77_exception_encountered) - (*current_liboctave_error_handler) - ("unrecoverable error in dgemm"); + { + F77_XFCN (dgemm, DGEMM, (F77_CONST_CHAR_ARG2 ("N", 1), + F77_CONST_CHAR_ARG2 ("N", 1), + nr, a_nc, nc, 1.0, m.data (), + ld, a.data (), lda, 0.0, c, nr + F77_CHAR_ARG_LEN (1) + F77_CHAR_ARG_LEN (1))); + + if (f77_exception_encountered) + (*current_liboctave_error_handler) + ("unrecoverable error in dgemm"); + } } }