Mercurial > octave
diff src/OPERATORS/op-cm-m.cc @ 4550:69a9b22a72a2
[project @ 2003-10-27 15:41:55 by jwe]
| author | jwe |
|---|---|
| date | Mon, 27 Oct 2003 15:41:55 +0000 |
| parents | 74c92e375b54 |
| children | c7ae43dfdea4 |
line wrap: on
line diff
--- a/src/OPERATORS/op-cm-m.cc Mon Oct 27 03:31:29 2003 +0000 +++ b/src/OPERATORS/op-cm-m.cc Mon Oct 27 15:41:55 2003 +0000 @@ -45,8 +45,8 @@ // complex matrix by matrix ops. -DEFNDBINOP_OP (add, complex_matrix, matrix, array, array, +) -DEFNDBINOP_OP (sub, complex_matrix, matrix, array, array, -) +DEFNDBINOP_OP (add, complex_matrix, matrix, complex_array, array, +) +DEFNDBINOP_OP (sub, complex_matrix, matrix, complex_array, array, -) DEFBINOP_OP (mul, complex_matrix, matrix, *) DEFBINOP_FN (div, complex_matrix, matrix, xdiv) @@ -59,26 +59,26 @@ DEFBINOP_FN (ldiv, complex_matrix, matrix, xleftdiv) -DEFNDBINOP_FN (lt, complex_matrix, matrix, array, array, mx_el_lt) -DEFNDBINOP_FN (le, complex_matrix, matrix, array, array, mx_el_le) -DEFNDBINOP_FN (eq, complex_matrix, matrix, array, array, mx_el_eq) -DEFNDBINOP_FN (ge, complex_matrix, matrix, array, array, mx_el_ge) -DEFNDBINOP_FN (gt, complex_matrix, matrix, array, array, mx_el_gt) -DEFNDBINOP_FN (ne, complex_matrix, matrix, array, array, mx_el_ne) +DEFNDBINOP_FN (lt, complex_matrix, matrix, complex_array, array, mx_el_lt) +DEFNDBINOP_FN (le, complex_matrix, matrix, complex_array, array, mx_el_le) +DEFNDBINOP_FN (eq, complex_matrix, matrix, complex_array, array, mx_el_eq) +DEFNDBINOP_FN (ge, complex_matrix, matrix, complex_array, array, mx_el_ge) +DEFNDBINOP_FN (gt, complex_matrix, matrix, complex_array, array, mx_el_gt) +DEFNDBINOP_FN (ne, complex_matrix, matrix, complex_array, array, mx_el_ne) -DEFNDBINOP_FN (el_mul, complex_matrix, matrix, array, array, product) -DEFNDBINOP_FN (el_div, complex_matrix, matrix, array, array, quotient) -DEFNDBINOP_FN (el_pow, complex_matrix, matrix, array, array, elem_xpow) +DEFNDBINOP_FN (el_mul, complex_matrix, matrix, complex_array, array, product) +DEFNDBINOP_FN (el_div, complex_matrix, matrix, complex_array, array, quotient) +DEFNDBINOP_FN (el_pow, complex_matrix, matrix, complex_array, array, elem_xpow) DEFBINOP (el_ldiv, complex_matrix, matrix) { CAST_BINOP_ARGS (const octave_complex_matrix&, const octave_matrix&); - return quotient (v2.array_value (), v1.array_value ()); + return quotient (v2.array_value (), v1.complex_array_value ()); } -DEFNDBINOP_FN (el_and, complex_matrix, matrix, array, array, mx_el_and) -DEFNDBINOP_FN (el_or, complex_matrix, matrix, array, array, mx_el_or) +DEFNDBINOP_FN (el_and, complex_matrix, matrix, complex_array, array, mx_el_and) +DEFNDBINOP_FN (el_or, complex_matrix, matrix, complex_array, array, mx_el_or) DEFASSIGNOP_FN (assign, complex_matrix, matrix, assign)