Mercurial > octave-nkf
diff src/OPERATORS/op-fcm-fm.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-fcm-fm.cc Thu Jan 20 17:21:27 2011 -0500 +++ b/src/OPERATORS/op-fcm-fm.cc Thu Jan 20 17:24:59 2011 -0500 @@ -61,11 +61,11 @@ DEFBINOP (div, float_complex_matrix, float_matrix) { - CAST_BINOP_ARGS (const octave_float_complex_matrix&, + CAST_BINOP_ARGS (const octave_float_complex_matrix&, const octave_float_matrix&); MatrixType typ = v2.matrix_type (); - - FloatComplexMatrix ret = xdiv (v1.float_complex_matrix_value (), + + FloatComplexMatrix ret = xdiv (v1.float_complex_matrix_value (), v2.float_matrix_value (), typ); v2.matrix_type (typ); @@ -81,62 +81,62 @@ DEFBINOP (ldiv, float_complex_matrix, float_matrix) { - CAST_BINOP_ARGS (const octave_float_complex_matrix&, + CAST_BINOP_ARGS (const octave_float_complex_matrix&, const octave_float_matrix&); MatrixType typ = v1.matrix_type (); - - FloatComplexMatrix ret = xleftdiv (v1.float_complex_matrix_value (), + + FloatComplexMatrix ret = xleftdiv (v1.float_complex_matrix_value (), v2.float_matrix_value (), typ); v1.matrix_type (typ); return ret; } -DEFNDCMPLXCMPOP_FN (lt, float_complex_matrix, float_matrix, +DEFNDCMPLXCMPOP_FN (lt, float_complex_matrix, float_matrix, float_complex_array, float_array, mx_el_lt) -DEFNDCMPLXCMPOP_FN (le, float_complex_matrix, float_matrix, +DEFNDCMPLXCMPOP_FN (le, float_complex_matrix, float_matrix, float_complex_array, float_array, mx_el_le) -DEFNDCMPLXCMPOP_FN (eq, float_complex_matrix, float_matrix, +DEFNDCMPLXCMPOP_FN (eq, float_complex_matrix, float_matrix, float_complex_array, float_array, mx_el_eq) -DEFNDCMPLXCMPOP_FN (ge, float_complex_matrix, float_matrix, +DEFNDCMPLXCMPOP_FN (ge, float_complex_matrix, float_matrix, float_complex_array, float_array, mx_el_ge) -DEFNDCMPLXCMPOP_FN (gt, float_complex_matrix, float_matrix, +DEFNDCMPLXCMPOP_FN (gt, float_complex_matrix, float_matrix, float_complex_array, float_array, mx_el_gt) -DEFNDCMPLXCMPOP_FN (ne, float_complex_matrix, float_matrix, +DEFNDCMPLXCMPOP_FN (ne, float_complex_matrix, float_matrix, float_complex_array, float_array, mx_el_ne) -DEFNDBINOP_FN (el_mul, float_complex_matrix, float_matrix, +DEFNDBINOP_FN (el_mul, float_complex_matrix, float_matrix, float_complex_array, float_array, product) -DEFNDBINOP_FN (el_div, float_complex_matrix, float_matrix, +DEFNDBINOP_FN (el_div, float_complex_matrix, float_matrix, float_complex_array, float_array, quotient) -DEFNDBINOP_FN (el_pow, float_complex_matrix, float_matrix, +DEFNDBINOP_FN (el_pow, float_complex_matrix, float_matrix, float_complex_array, float_array, elem_xpow) DEFBINOP (el_ldiv, float_complex_matrix, float_matrix) { - CAST_BINOP_ARGS (const octave_float_complex_matrix&, + CAST_BINOP_ARGS (const octave_float_complex_matrix&, const octave_float_matrix&); return quotient (v2.float_array_value (), v1.float_complex_array_value ()); } -DEFNDBINOP_FN (el_and, float_complex_matrix, float_matrix, +DEFNDBINOP_FN (el_and, float_complex_matrix, float_matrix, float_complex_array, float_array, mx_el_and) -DEFNDBINOP_FN (el_or, float_complex_matrix, float_matrix, +DEFNDBINOP_FN (el_or, float_complex_matrix, float_matrix, float_complex_array, float_array, mx_el_or) -DEFNDCATOP_FN (fcm_fm, float_complex_matrix, float_matrix, +DEFNDCATOP_FN (fcm_fm, float_complex_matrix, float_matrix, float_complex_array, float_array, concat) -DEFNDCATOP_FN (cm_fm, complex_matrix, float_matrix, +DEFNDCATOP_FN (cm_fm, complex_matrix, float_matrix, float_complex_array, float_array, concat) -DEFNDCATOP_FN (fcm_m, float_complex_matrix, matrix, +DEFNDCATOP_FN (fcm_m, float_complex_matrix, matrix, float_complex_array, float_array, concat) -DEFNDASSIGNOP_FN (assign, float_complex_matrix, float_matrix, +DEFNDASSIGNOP_FN (assign, float_complex_matrix, float_matrix, float_complex_array, assign) -DEFNDASSIGNOP_FN (dbl_assign, complex_matrix, float_matrix, +DEFNDASSIGNOP_FN (dbl_assign, complex_matrix, float_matrix, complex_array, assign) void @@ -147,7 +147,7 @@ INSTALL_BINOP (op_mul, octave_float_complex_matrix, octave_float_matrix, mul); INSTALL_BINOP (op_div, octave_float_complex_matrix, octave_float_matrix, div); INSTALL_BINOP (op_pow, octave_float_complex_matrix, octave_float_matrix, pow); - INSTALL_BINOP (op_ldiv, octave_float_complex_matrix, + INSTALL_BINOP (op_ldiv, octave_float_complex_matrix, octave_float_matrix, ldiv); INSTALL_BINOP (op_lt, octave_float_complex_matrix, octave_float_matrix, lt); INSTALL_BINOP (op_le, octave_float_complex_matrix, octave_float_matrix, le); @@ -155,29 +155,29 @@ INSTALL_BINOP (op_ge, octave_float_complex_matrix, octave_float_matrix, ge); INSTALL_BINOP (op_gt, octave_float_complex_matrix, octave_float_matrix, gt); INSTALL_BINOP (op_ne, octave_float_complex_matrix, octave_float_matrix, ne); - INSTALL_BINOP (op_el_mul, octave_float_complex_matrix, + INSTALL_BINOP (op_el_mul, octave_float_complex_matrix, octave_float_matrix, el_mul); - INSTALL_BINOP (op_el_div, octave_float_complex_matrix, + INSTALL_BINOP (op_el_div, octave_float_complex_matrix, octave_float_matrix, el_div); - INSTALL_BINOP (op_el_pow, octave_float_complex_matrix, + INSTALL_BINOP (op_el_pow, octave_float_complex_matrix, octave_float_matrix, el_pow); - INSTALL_BINOP (op_el_ldiv, octave_float_complex_matrix, + INSTALL_BINOP (op_el_ldiv, octave_float_complex_matrix, octave_float_matrix, el_ldiv); - INSTALL_BINOP (op_el_and, octave_float_complex_matrix, + INSTALL_BINOP (op_el_and, octave_float_complex_matrix, octave_float_matrix, el_and); - INSTALL_BINOP (op_el_or, octave_float_complex_matrix, + INSTALL_BINOP (op_el_or, octave_float_complex_matrix, octave_float_matrix, el_or); - INSTALL_BINOP (op_mul_trans, octave_float_complex_matrix, + INSTALL_BINOP (op_mul_trans, octave_float_complex_matrix, octave_float_matrix, mul_trans); - INSTALL_BINOP (op_mul_herm, octave_float_complex_matrix, + INSTALL_BINOP (op_mul_herm, octave_float_complex_matrix, octave_float_matrix, mul_trans); INSTALL_CATOP (octave_float_complex_matrix, octave_float_matrix, fcm_fm); INSTALL_CATOP (octave_complex_matrix, octave_float_matrix, cm_fm); INSTALL_CATOP (octave_float_complex_matrix, octave_matrix, fcm_m); - INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix, + INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix, octave_float_matrix, assign); - INSTALL_ASSIGNOP (op_asn_eq, octave_complex_matrix, + INSTALL_ASSIGNOP (op_asn_eq, octave_complex_matrix, octave_float_matrix, dbl_assign); }