Mercurial > octave

diff src/OPERATORS/op-cm-m.cc @ 5785:6b9cec830d72

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2006-05-03 19:32:46 by dbateman]
author dbateman
date Wed, 03 May 2006 19:32:48 +0000
parents 4c8a2e4e0717
children 93c65f2a5668
line wrap: on
line diff
--- a/src/OPERATORS/op-cm-m.cc	Wed May 03 05:57:16 2006 +0000
+++ b/src/OPERATORS/op-cm-m.cc	Wed May 03 19:32:48 2006 +0000
@@ -46,7 +46,19 @@
 DEFNDBINOP_OP (sub, complex_matrix, matrix, complex_array, array, -)
 
 DEFBINOP_OP (mul, complex_matrix, matrix, *)
-DEFBINOP_FN (div, complex_matrix, matrix, xdiv)
+
+DEFBINOP (div, complex_matrix, matrix)
+{
+  CAST_BINOP_ARGS (const octave_complex_matrix&, const octave_matrix&);
+  MatrixType typ = v2.matrix_type ();
+  
+  ComplexMatrix ret = xdiv (v1.complex_matrix_value (), 
+			    v2.matrix_value (), typ);
+
+  v2.matrix_type (typ);
+  return ret;
+}
+
 
 DEFBINOPX (pow, complex_matrix, matrix)
 {
@@ -54,7 +66,17 @@
   return octave_value ();
 }
 
-DEFBINOP_FN (ldiv, complex_matrix, matrix, xleftdiv)
+DEFBINOP (ldiv, complex_matrix, matrix)
+{
+  CAST_BINOP_ARGS (const octave_complex_matrix&, const octave_matrix&);
+  MatrixType typ = v1.matrix_type ();
+  
+  ComplexMatrix ret = xleftdiv (v1.complex_matrix_value (), 
+				v2.matrix_value (), typ);
+
+  v1.matrix_type (typ);
+  return ret;
+}
 
 DEFNDBINOP_FN (lt, complex_matrix, matrix, complex_array, array, mx_el_lt)
 DEFNDBINOP_FN (le, complex_matrix, matrix, complex_array, array, mx_el_le)