Mercurial > octave
diff src/OPERATORS/op-fm-fcm.cc @ 11586:12df7854fa7c
strip trailing whitespace from source files
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 20 Jan 2011 17:24:59 -0500 |
parents | fd0a3ac60b0e |
children | 72c96de7a403 |
line wrap: on
line diff
--- a/src/OPERATORS/op-fm-fcm.cc Thu Jan 20 17:21:27 2011 -0500 +++ b/src/OPERATORS/op-fm-fcm.cc Thu Jan 20 17:24:59 2011 -0500 @@ -43,9 +43,9 @@ // matrix by complex matrix ops. -DEFNDBINOP_OP (add, float_matrix, float_complex_matrix, float_array, +DEFNDBINOP_OP (add, float_matrix, float_complex_matrix, float_array, float_complex_array, +) -DEFNDBINOP_OP (sub, float_matrix, float_complex_matrix, float_array, +DEFNDBINOP_OP (sub, float_matrix, float_complex_matrix, float_array, float_complex_array, -) DEFBINOP_OP (mul, float_matrix, float_complex_matrix, *) @@ -63,11 +63,11 @@ DEFBINOP (div, float_matrix, float_complex_matrix) { - CAST_BINOP_ARGS (const octave_float_matrix&, + CAST_BINOP_ARGS (const octave_float_matrix&, const octave_float_complex_matrix&); MatrixType typ = v2.matrix_type (); - - FloatComplexMatrix ret = xdiv (v1.float_matrix_value (), + + FloatComplexMatrix ret = xdiv (v1.float_matrix_value (), v2.float_complex_matrix_value (), typ); v2.matrix_type (typ); @@ -82,11 +82,11 @@ DEFBINOP (ldiv, float_matrix, float_complex_matrix) { - CAST_BINOP_ARGS (const octave_float_matrix&, + CAST_BINOP_ARGS (const octave_float_matrix&, const octave_float_complex_matrix&); MatrixType typ = v1.matrix_type (); - - FloatComplexMatrix ret = xleftdiv (v1.float_matrix_value (), + + FloatComplexMatrix ret = xleftdiv (v1.float_matrix_value (), v2.float_complex_matrix_value (), typ); v1.matrix_type (typ); @@ -95,57 +95,57 @@ DEFBINOP (trans_ldiv, float_matrix, float_complex_matrix) { - CAST_BINOP_ARGS (const octave_float_matrix&, + CAST_BINOP_ARGS (const octave_float_matrix&, const octave_float_complex_matrix&); MatrixType typ = v1.matrix_type (); - - FloatComplexMatrix ret = xleftdiv (v1.float_matrix_value (), + + FloatComplexMatrix ret = xleftdiv (v1.float_matrix_value (), v2.float_complex_matrix_value (), typ, blas_trans); v1.matrix_type (typ); return ret; } -DEFNDCMPLXCMPOP_FN (lt, float_matrix, float_complex_matrix, float_array, +DEFNDCMPLXCMPOP_FN (lt, float_matrix, float_complex_matrix, float_array, float_complex_array, mx_el_lt) -DEFNDCMPLXCMPOP_FN (le, float_matrix, float_complex_matrix, float_array, +DEFNDCMPLXCMPOP_FN (le, float_matrix, float_complex_matrix, float_array, float_complex_array, mx_el_le) -DEFNDCMPLXCMPOP_FN (eq, float_matrix, float_complex_matrix, float_array, +DEFNDCMPLXCMPOP_FN (eq, float_matrix, float_complex_matrix, float_array, float_complex_array, mx_el_eq) -DEFNDCMPLXCMPOP_FN (ge, float_matrix, float_complex_matrix, float_array, +DEFNDCMPLXCMPOP_FN (ge, float_matrix, float_complex_matrix, float_array, float_complex_array, mx_el_ge) -DEFNDCMPLXCMPOP_FN (gt, float_matrix, float_complex_matrix, float_array, +DEFNDCMPLXCMPOP_FN (gt, float_matrix, float_complex_matrix, float_array, float_complex_array, mx_el_gt) -DEFNDCMPLXCMPOP_FN (ne, float_matrix, float_complex_matrix, float_array, +DEFNDCMPLXCMPOP_FN (ne, float_matrix, float_complex_matrix, float_array, float_complex_array, mx_el_ne) -DEFNDBINOP_FN (el_mul, float_matrix, float_complex_matrix, float_array, +DEFNDBINOP_FN (el_mul, float_matrix, float_complex_matrix, float_array, float_complex_array, product) -DEFNDBINOP_FN (el_div, float_matrix, float_complex_matrix, float_array, +DEFNDBINOP_FN (el_div, float_matrix, float_complex_matrix, float_array, float_complex_array, quotient) -DEFNDBINOP_FN (el_pow, float_matrix, float_complex_matrix, float_array, +DEFNDBINOP_FN (el_pow, float_matrix, float_complex_matrix, float_array, float_complex_array, elem_xpow) DEFBINOP (el_ldiv, float_matrix, float_complex_matrix) { - CAST_BINOP_ARGS (const octave_float_matrix&, + CAST_BINOP_ARGS (const octave_float_matrix&, const octave_float_complex_matrix&); return quotient (v2.float_complex_array_value (), v1.float_array_value ()); } -DEFNDBINOP_FN (el_and, float_matrix, float_complex_matrix, float_array, +DEFNDBINOP_FN (el_and, float_matrix, float_complex_matrix, float_array, float_complex_array, mx_el_and) -DEFNDBINOP_FN (el_or, float_matrix, float_complex_matrix, float_array, +DEFNDBINOP_FN (el_or, float_matrix, float_complex_matrix, float_array, float_complex_array, mx_el_or) -DEFNDCATOP_FN (fm_fcm, float_matrix, float_complex_matrix, float_array, +DEFNDCATOP_FN (fm_fcm, float_matrix, float_complex_matrix, float_array, float_complex_array, concat) -DEFNDCATOP_FN (m_fcm, matrix, float_complex_matrix, float_array, +DEFNDCATOP_FN (m_fcm, matrix, float_complex_matrix, float_array, float_complex_array, concat) -DEFNDCATOP_FN (fm_cm, float_matrix, complex_matrix, float_array, +DEFNDCATOP_FN (fm_cm, float_matrix, complex_matrix, float_array, float_complex_array, concat) DEFCONV (float_complex_matrix_conv, float_matrix, float_complex_matrix) @@ -163,7 +163,7 @@ INSTALL_BINOP (op_mul, octave_float_matrix, octave_float_complex_matrix, mul); INSTALL_BINOP (op_div, octave_float_matrix, octave_float_complex_matrix, div); INSTALL_BINOP (op_pow, octave_float_matrix, octave_float_complex_matrix, pow); - INSTALL_BINOP (op_ldiv, octave_float_matrix, + INSTALL_BINOP (op_ldiv, octave_float_matrix, octave_float_complex_matrix, ldiv); INSTALL_BINOP (op_lt, octave_float_matrix, octave_float_complex_matrix, lt); INSTALL_BINOP (op_le, octave_float_matrix, octave_float_complex_matrix, le); @@ -171,36 +171,36 @@ INSTALL_BINOP (op_ge, octave_float_matrix, octave_float_complex_matrix, ge); INSTALL_BINOP (op_gt, octave_float_matrix, octave_float_complex_matrix, gt); INSTALL_BINOP (op_ne, octave_float_matrix, octave_float_complex_matrix, ne); - INSTALL_BINOP (op_el_mul, octave_float_matrix, + INSTALL_BINOP (op_el_mul, octave_float_matrix, octave_float_complex_matrix, el_mul); - INSTALL_BINOP (op_el_div, octave_float_matrix, + INSTALL_BINOP (op_el_div, octave_float_matrix, octave_float_complex_matrix, el_div); - INSTALL_BINOP (op_el_pow, octave_float_matrix, + INSTALL_BINOP (op_el_pow, octave_float_matrix, octave_float_complex_matrix, el_pow); - INSTALL_BINOP (op_el_ldiv, octave_float_matrix, + INSTALL_BINOP (op_el_ldiv, octave_float_matrix, octave_float_complex_matrix, el_ldiv); - INSTALL_BINOP (op_el_and, octave_float_matrix, + INSTALL_BINOP (op_el_and, octave_float_matrix, octave_float_complex_matrix, el_and); - INSTALL_BINOP (op_el_or, octave_float_matrix, + INSTALL_BINOP (op_el_or, octave_float_matrix, octave_float_complex_matrix, el_or); - INSTALL_BINOP (op_trans_mul, octave_float_matrix, + INSTALL_BINOP (op_trans_mul, octave_float_matrix, octave_float_complex_matrix, trans_mul); - INSTALL_BINOP (op_herm_mul, octave_float_matrix, + INSTALL_BINOP (op_herm_mul, octave_float_matrix, octave_float_complex_matrix, trans_mul); - INSTALL_BINOP (op_trans_ldiv, octave_float_matrix, + INSTALL_BINOP (op_trans_ldiv, octave_float_matrix, octave_float_complex_matrix, trans_ldiv); - INSTALL_BINOP (op_herm_ldiv, octave_float_matrix, + INSTALL_BINOP (op_herm_ldiv, octave_float_matrix, octave_float_complex_matrix, trans_ldiv); INSTALL_CATOP (octave_float_matrix, octave_float_complex_matrix, fm_fcm); INSTALL_CATOP (octave_matrix, octave_float_complex_matrix, m_fcm); INSTALL_CATOP (octave_float_matrix, octave_complex_matrix, fm_cm); - INSTALL_ASSIGNCONV (octave_float_matrix, octave_float_complex_matrix, + INSTALL_ASSIGNCONV (octave_float_matrix, octave_float_complex_matrix, octave_float_complex_matrix); - INSTALL_ASSIGNCONV (octave_matrix, octave_float_complex_matrix, + INSTALL_ASSIGNCONV (octave_matrix, octave_float_complex_matrix, octave_complex_matrix); - INSTALL_WIDENOP (octave_float_matrix, octave_float_complex_matrix, + INSTALL_WIDENOP (octave_float_matrix, octave_float_complex_matrix, float_complex_matrix_conv); }