Mercurial > octave

diff src/OPERATORS/op-cs-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 79df15d4470c
children c638c144d4da
line wrap: on
line diff
--- a/src/OPERATORS/op-cs-cm.cc	Mon Oct 27 03:31:29 2003 +0000
+++ b/src/OPERATORS/op-cs-cm.cc	Mon Oct 27 15:41:55 2003 +0000
@@ -40,9 +40,9 @@
 
 // complex scalar by complex matrix ops.
 
-DEFNDBINOP_OP (add, complex, complex_matrix, complex, array, +)
-DEFNDBINOP_OP (sub, complex, complex_matrix, complex, array, -)
-DEFNDBINOP_OP (mul, complex, complex_matrix, complex, array, *)
+DEFNDBINOP_OP (add, complex, complex_matrix, complex, complex_array, +)
+DEFNDBINOP_OP (sub, complex, complex_matrix, complex, complex_array, -)
+DEFNDBINOP_OP (mul, complex, complex_matrix, complex, complex_array, *)
 
 DEFBINOP (div, complex, complex_matrix)
 {
@@ -65,19 +65,19 @@
   if (d == 0.0)
     gripe_divide_by_zero ();
 
-  return octave_value (v2.array_value () / d);
+  return octave_value (v2.complex_array_value () / d);
 }
 
-DEFNDBINOP_FN (lt, complex, complex_matrix, complex, array, mx_el_lt)
-DEFNDBINOP_FN (le, complex, complex_matrix, complex, array, mx_el_le)
-DEFNDBINOP_FN (eq, complex, complex_matrix, complex, array, mx_el_eq)
-DEFNDBINOP_FN (ge, complex, complex_matrix, complex, array, mx_el_ge)
-DEFNDBINOP_FN (gt, complex, complex_matrix, complex, array, mx_el_gt)
-DEFNDBINOP_FN (ne, complex, complex_matrix, complex, array, mx_el_ne)
+DEFNDBINOP_FN (lt, complex, complex_matrix, complex, complex_array, mx_el_lt)
+DEFNDBINOP_FN (le, complex, complex_matrix, complex, complex_array, mx_el_le)
+DEFNDBINOP_FN (eq, complex, complex_matrix, complex, complex_array, mx_el_eq)
+DEFNDBINOP_FN (ge, complex, complex_matrix, complex, complex_array, mx_el_ge)
+DEFNDBINOP_FN (gt, complex, complex_matrix, complex, complex_array, mx_el_gt)
+DEFNDBINOP_FN (ne, complex, complex_matrix, complex, complex_array, mx_el_ne)
 
-DEFNDBINOP_OP (el_mul, complex, complex_matrix, complex, array, *)
-DEFNDBINOP_FN (el_div, complex, complex_matrix, complex, array, x_el_div)
-DEFNDBINOP_FN (el_pow, complex, complex_matrix, complex, array, elem_xpow)
+DEFNDBINOP_OP (el_mul, complex, complex_matrix, complex, complex_array, *)
+DEFNDBINOP_FN (el_div, complex, complex_matrix, complex, complex_array, x_el_div)
+DEFNDBINOP_FN (el_pow, complex, complex_matrix, complex, complex_array, elem_xpow)
 
 DEFBINOP (el_ldiv, complex, complex_matrix)
 {
@@ -88,11 +88,11 @@
   if (d == 0.0)
     gripe_divide_by_zero ();
 
-  return octave_value (v2.array_value () / d);
+  return octave_value (v2.complex_array_value () / d);
 }
 
-DEFNDBINOP_FN (el_and, complex, complex_matrix, complex, array, mx_el_and)
-DEFNDBINOP_FN (el_or,  complex, complex_matrix, complex, array, mx_el_or)
+DEFNDBINOP_FN (el_and, complex, complex_matrix, complex, complex_array, mx_el_and)
+DEFNDBINOP_FN (el_or,  complex, complex_matrix, complex, complex_array, mx_el_or)
 
 DEFCONV (complex_matrix_conv, complex, complex_matrix)
 {