Mercurial > octave

diff src/OPERATORS/op-cm-s.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 c7ae43dfdea4
line wrap: on
line diff
--- a/src/OPERATORS/op-cm-s.cc	Mon Oct 27 03:31:29 2003 +0000
+++ b/src/OPERATORS/op-cm-s.cc	Mon Oct 27 15:41:55 2003 +0000
@@ -44,9 +44,9 @@
 
 // complex matrix by scalar ops.
 
-DEFNDBINOP_OP (add, complex_matrix, scalar, array, scalar, +)
-DEFNDBINOP_OP (sub, complex_matrix, scalar, array, scalar, -)
-DEFNDBINOP_OP (mul, complex_matrix, scalar, array, scalar, *)
+DEFNDBINOP_OP (add, complex_matrix, scalar, complex_array, scalar, +)
+DEFNDBINOP_OP (sub, complex_matrix, scalar, complex_array, scalar, -)
+DEFNDBINOP_OP (mul, complex_matrix, scalar, complex_array, scalar, *)
 
 DEFBINOP (div, complex_matrix, scalar)
 {
@@ -57,7 +57,7 @@
   if (d == 0.0)
     gripe_divide_by_zero ();
 
-  return octave_value (v1.array_value () / d);
+  return octave_value (v1.complex_array_value () / d);
 }
 
 DEFBINOP_FN (pow, complex_matrix, scalar, xpow)
@@ -72,12 +72,12 @@
   return octave_value (xleftdiv (m1, m2));
 }
 
-DEFNDBINOP_FN (lt, complex_matrix, scalar, array, scalar, mx_el_lt)
-DEFNDBINOP_FN (le, complex_matrix, scalar, array, scalar, mx_el_le)
-DEFNDBINOP_FN (eq, complex_matrix, scalar, array, scalar, mx_el_eq)
-DEFNDBINOP_FN (ge, complex_matrix, scalar, array, scalar, mx_el_ge)
-DEFNDBINOP_FN (gt, complex_matrix, scalar, array, scalar, mx_el_gt)
-DEFNDBINOP_FN (ne, complex_matrix, scalar, array, scalar, mx_el_ne)
+DEFNDBINOP_FN (lt, complex_matrix, scalar, complex_array, scalar, mx_el_lt)
+DEFNDBINOP_FN (le, complex_matrix, scalar, complex_array, scalar, mx_el_le)
+DEFNDBINOP_FN (eq, complex_matrix, scalar, complex_array, scalar, mx_el_eq)
+DEFNDBINOP_FN (ge, complex_matrix, scalar, complex_array, scalar, mx_el_ge)
+DEFNDBINOP_FN (gt, complex_matrix, scalar, complex_array, scalar, mx_el_gt)
+DEFNDBINOP_FN (ne, complex_matrix, scalar, complex_array, scalar, mx_el_ne)
 
 DEFBINOP_OP (el_mul, complex_matrix, scalar, *)
 
@@ -90,20 +90,20 @@
   if (d == 0.0)
     gripe_divide_by_zero ();
 
-  return octave_value (v1.array_value () / d);
+  return octave_value (v1.complex_array_value () / d);
 }
 
-DEFNDBINOP_FN (el_pow, complex_matrix, scalar, array, scalar, elem_xpow)
+DEFNDBINOP_FN (el_pow, complex_matrix, scalar, complex_array, scalar, elem_xpow)
 
 DEFBINOP (el_ldiv, complex_matrix, scalar)
 {
   CAST_BINOP_ARGS (const octave_complex_matrix&, const octave_scalar&);
 
-  return x_el_div (v2.double_value (), v1.array_value ());
+  return x_el_div (v2.double_value (), v1.complex_array_value ());
 }
 
-DEFNDBINOP_FN (el_and, complex_matrix, scalar, array, scalar, mx_el_and)
-DEFNDBINOP_FN (el_or,  complex_matrix, scalar, array, scalar, mx_el_or)
+DEFNDBINOP_FN (el_and, complex_matrix, scalar, complex_array, scalar, mx_el_and)
+DEFNDBINOP_FN (el_or,  complex_matrix, scalar, complex_array, scalar, mx_el_or)
 
 DEFASSIGNOP_FN (assign, complex_matrix, scalar, assign)