Mercurial > octave
diff src/OPERATORS/op-dm-sm.cc @ 9732:b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
author | Jaroslav Hajek <highegg@gmail.com> |
---|---|
date | Fri, 16 Oct 2009 13:12:31 +0200 |
parents | 5bbbf482909a |
children | fb6b6fcafa62 |
line wrap: on
line diff
--- a/src/OPERATORS/op-dm-sm.cc Fri Oct 16 10:28:26 2009 +0200 +++ b/src/OPERATORS/op-dm-sm.cc Fri Oct 16 13:12:31 2009 +0200 @@ -78,7 +78,7 @@ { double d = v2.scalar_value (); - return octave_value (v1.diag_matrix_value () + d); + return octave_value (v1.matrix_value () + d); } else return v1.diag_matrix_value () + v2.sparse_matrix_value (); @@ -94,7 +94,7 @@ { double d = v2.scalar_value (); - return octave_value (v1.diag_matrix_value () - d); + return octave_value (v1.matrix_value () - d); } else return v1.diag_matrix_value () - v2.sparse_matrix_value (); @@ -155,7 +155,7 @@ { double d = v1.scalar_value (); - return octave_value (d + v2.diag_matrix_value ()); + return octave_value (d + v2.matrix_value ()); } else return v1.sparse_matrix_value () + v2.diag_matrix_value (); @@ -171,7 +171,7 @@ { double d = v1.scalar_value (); - return octave_value (d - v2.diag_matrix_value ()); + return octave_value (d - v2.matrix_value ()); } else return v1.sparse_matrix_value () - v2.diag_matrix_value ();