Mercurial > hg > octave-nkf
diff src/OPERATORS/op-sm-m.cc @ 6221:8e0f1eda266b
[project @ 2007-01-03 17:23:33 by jwe]
author | jwe |
---|---|
date | Wed, 03 Jan 2007 17:23:34 +0000 |
parents | 6b9cec830d72 |
children | 93c65f2a5668 |
line wrap: on
line diff
--- a/src/OPERATORS/op-sm-m.cc +++ b/src/OPERATORS/op-sm-m.cc @@ -65,13 +65,26 @@ DEFBINOP (ldiv, sparse_matrix, matrix) { CAST_BINOP_ARGS (const octave_sparse_matrix&, const octave_matrix&); - MatrixType typ = v1.matrix_type (); + + if (v1.rows() == 1 && v1.columns() == 1) + { + double d = v1.scalar_value (); + + if (d == 0.0) + gripe_divide_by_zero (); - Matrix ret = xleftdiv (v1.sparse_matrix_value (), - v2.matrix_value (), typ); + return octave_value (v2.array_value () / d); + } + else + { + MatrixType typ = v1.matrix_type (); - v1.matrix_type (typ); - return ret; + Matrix ret = xleftdiv (v1.sparse_matrix_value (), + v2.matrix_value (), typ); + + v1.matrix_type (typ); + return ret; + } } DEFBINOP_FN (lt, sparse_matrix, matrix, mx_el_lt)