Mercurial > octave

diff src/OPERATORS/op-dm-scm.cc @ 9732:b4fdfee405b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove ArrayN<T> + fix nonhom. diag-scalar ops
author Jaroslav Hajek <highegg@gmail.com>
date Fri, 16 Oct 2009 13:12:31 +0200
parents 1bba53c0a38d
children fb6b6fcafa62
line wrap: on
line diff
--- a/src/OPERATORS/op-dm-scm.cc	Fri Oct 16 10:28:26 2009 +0200
+++ b/src/OPERATORS/op-dm-scm.cc	Fri Oct 16 13:12:31 2009 +0200
@@ -148,7 +148,7 @@
     {
       std::complex<double> d = v2.complex_value ();
 
-      return octave_value (v1.diag_matrix_value () + d);
+      return octave_value (v1.matrix_value () + d);
     }
   else
     return v1.diag_matrix_value () + v2.sparse_complex_matrix_value ();
@@ -164,7 +164,7 @@
     {
       double d = v2.scalar_value ();
 
-      return octave_value (v1.complex_diag_matrix_value () + d);
+      return octave_value (v1.complex_matrix_value () + d);
     }
   else
     return v1.complex_diag_matrix_value () + v2.sparse_matrix_value ();
@@ -180,7 +180,7 @@
     {
       std::complex<double> d = v2.complex_value ();
 
-      return octave_value (v1.complex_diag_matrix_value () + d);
+      return octave_value (v1.complex_matrix_value () + d);
     }
   else
     return v1.complex_diag_matrix_value () + v2.sparse_complex_matrix_value ();
@@ -196,7 +196,7 @@
     {
       std::complex<double> d = v2.complex_value ();
 
-      return octave_value (v1.diag_matrix_value () + (-d));
+      return octave_value (v1.matrix_value () + (-d));
     }
   else
     return v1.diag_matrix_value () - v2.sparse_complex_matrix_value ();
@@ -212,7 +212,7 @@
     {
       double d = v2.scalar_value ();
 
-      return octave_value (v1.complex_diag_matrix_value () + (-d));
+      return octave_value (v1.complex_matrix_value () + (-d));
     }
   else
     return v1.complex_diag_matrix_value () - v2.sparse_matrix_value ();
@@ -228,7 +228,7 @@
     {
       std::complex<double> d = v2.complex_value ();
 
-      return octave_value (v1.complex_diag_matrix_value () + (-d));
+      return octave_value (v1.complex_matrix_value () + (-d));
     }
   else
     return v1.complex_diag_matrix_value () - v2.sparse_complex_matrix_value ();