Mercurial > octave

diff src/OPERATORS/op-m-cm.cc @ 4550:69a9b22a72a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2003-10-27 15:41:55 by jwe]
author jwe
date Mon, 27 Oct 2003 15:41:55 +0000
parents 74c92e375b54
children c638c144d4da
line wrap: on
line diff
--- a/src/OPERATORS/op-m-cm.cc	Mon Oct 27 03:31:29 2003 +0000
+++ b/src/OPERATORS/op-m-cm.cc	Mon Oct 27 15:41:55 2003 +0000
@@ -45,8 +45,8 @@
 
 // matrix by complex matrix ops.
 
-DEFNDBINOP_OP (add, matrix, complex_matrix, array, array, +)
-DEFNDBINOP_OP (sub, matrix, complex_matrix, array, array, -)
+DEFNDBINOP_OP (add, matrix, complex_matrix, array, complex_array, +)
+DEFNDBINOP_OP (sub, matrix, complex_matrix, array, complex_array, -)
 
 DEFBINOP_OP (mul, matrix, complex_matrix, *)
 DEFBINOP_FN (div, matrix, complex_matrix, xdiv)
@@ -59,26 +59,26 @@
 
 DEFBINOP_FN (ldiv, matrix, complex_matrix, xleftdiv)
 
-DEFNDBINOP_FN (lt, matrix, complex_matrix, array, array, mx_el_lt)
-DEFNDBINOP_FN (le, matrix, complex_matrix, array, array, mx_el_le)
-DEFNDBINOP_FN (eq, matrix, complex_matrix, array, array, mx_el_eq)
-DEFNDBINOP_FN (ge, matrix, complex_matrix, array, array, mx_el_ge)
-DEFNDBINOP_FN (gt, matrix, complex_matrix, array, array, mx_el_gt)
-DEFNDBINOP_FN (ne, matrix, complex_matrix, array, array, mx_el_ne)
+DEFNDBINOP_FN (lt, matrix, complex_matrix, array, complex_array, mx_el_lt)
+DEFNDBINOP_FN (le, matrix, complex_matrix, array, complex_array, mx_el_le)
+DEFNDBINOP_FN (eq, matrix, complex_matrix, array, complex_array, mx_el_eq)
+DEFNDBINOP_FN (ge, matrix, complex_matrix, array, complex_array, mx_el_ge)
+DEFNDBINOP_FN (gt, matrix, complex_matrix, array, complex_array, mx_el_gt)
+DEFNDBINOP_FN (ne, matrix, complex_matrix, array, complex_array, mx_el_ne)
 
-DEFNDBINOP_FN (el_mul, matrix, complex_matrix, array, array, product)
-DEFNDBINOP_FN (el_div, matrix, complex_matrix, array, array, quotient)
-DEFNDBINOP_FN (el_pow, matrix, complex_matrix, array, array, elem_xpow)
+DEFNDBINOP_FN (el_mul, matrix, complex_matrix, array, complex_array, product)
+DEFNDBINOP_FN (el_div, matrix, complex_matrix, array, complex_array, quotient)
+DEFNDBINOP_FN (el_pow, matrix, complex_matrix, array, complex_array, elem_xpow)
 
 DEFBINOP (el_ldiv, matrix, complex_matrix)
 {
   CAST_BINOP_ARGS (const octave_matrix&, const octave_complex_matrix&);
 
-  return quotient (v2.array_value (), v1.array_value ());
+  return quotient (v2.complex_array_value (), v1.array_value ());
 }
 
-DEFNDBINOP_FN (el_and, matrix, complex_matrix, array, array, mx_el_and)
-DEFNDBINOP_FN (el_or,  matrix, complex_matrix, array, array, mx_el_or)
+DEFNDBINOP_FN (el_and, matrix, complex_matrix, array, complex_array, mx_el_and)
+DEFNDBINOP_FN (el_or,  matrix, complex_matrix, array, complex_array, mx_el_or)
 
 DEFCONV (complex_matrix_conv, matrix, complex_matrix)
 {