Mercurial > octave
diff src/OPERATORS/op-cs-m.cc @ 4543:79df15d4470c
[project @ 2003-10-18 03:53:52 by jwe]
| author | jwe |
|---|---|
| date | Sat, 18 Oct 2003 03:53:53 +0000 |
| parents | 2bc437206787 |
| children | 74c92e375b54 |
line wrap: on
line diff
--- a/src/OPERATORS/op-cs-m.cc Fri Oct 17 04:41:36 2003 +0000 +++ b/src/OPERATORS/op-cs-m.cc Sat Oct 18 03:53:53 2003 +0000 @@ -44,9 +44,9 @@ // complex scalar by matrix ops. -DEFBINOP_OP (add, complex, matrix, +) -DEFBINOP_OP (sub, complex, matrix, -) -DEFBINOP_OP (mul, complex, matrix, *) +DEFNDBINOP_OP (add, complex, matrix, complex, array, +) +DEFNDBINOP_OP (sub, complex, matrix, complex, array, -) +DEFNDBINOP_OP (mul, complex, matrix, complex, array, *) DEFBINOP (div, complex, matrix) { @@ -69,19 +69,19 @@ if (d == 0.0) gripe_divide_by_zero (); - return octave_value (v2.matrix_value () / d); + return octave_value (v2.array_value () / d); } -DEFBINOP_FN (lt, complex, matrix, mx_el_lt) -DEFBINOP_FN (le, complex, matrix, mx_el_le) -DEFBINOP_FN (eq, complex, matrix, mx_el_eq) -DEFBINOP_FN (ge, complex, matrix, mx_el_ge) -DEFBINOP_FN (gt, complex, matrix, mx_el_gt) -DEFBINOP_FN (ne, complex, matrix, mx_el_ne) +DEFNDBINOP_FN (lt, complex, matrix, complex, array, mx_el_lt) +DEFNDBINOP_FN (le, complex, matrix, complex, array, mx_el_le) +DEFNDBINOP_FN (eq, complex, matrix, complex, array, mx_el_eq) +DEFNDBINOP_FN (ge, complex, matrix, complex, array, mx_el_ge) +DEFNDBINOP_FN (gt, complex, matrix, complex, array, mx_el_gt) +DEFNDBINOP_FN (ne, complex, matrix, complex, array, mx_el_ne) -DEFBINOP_OP (el_mul, complex, matrix, *) -DEFBINOP_FN (el_div, complex, matrix, x_el_div) -DEFBINOP_FN (el_pow, complex, matrix, elem_xpow) +DEFNDBINOP_OP (el_mul, complex, matrix, complex, array, *) +DEFNDBINOP_FN (el_div, complex, matrix, complex, array, x_el_div) +DEFNDBINOP_FN (el_pow, complex, matrix, complex, array, elem_xpow) DEFBINOP (el_ldiv, complex, matrix) { @@ -92,11 +92,11 @@ if (d == 0.0) gripe_divide_by_zero (); - return octave_value (v2.matrix_value () / d); + return octave_value (v2.array_value () / d); } -DEFBINOP_FN (el_and, complex, matrix, mx_el_and) -DEFBINOP_FN (el_or, complex, matrix, mx_el_or) +DEFNDBINOP_FN (el_and, complex, matrix, complex, array, mx_el_and) +DEFNDBINOP_FN (el_or, complex, matrix, complex, array, mx_el_or) void install_cs_m_ops (void)