Mercurial > octave-nkf
diff src/OPERATORS/op-fcm-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 | 6abc581bf2c9 |
line wrap: on
line diff
--- a/src/OPERATORS/op-fcm-fcm.cc Thu Jan 20 17:21:27 2011 -0500 +++ b/src/OPERATORS/op-fcm-fcm.cc Thu Jan 20 17:24:59 2011 -0500 @@ -73,20 +73,20 @@ // complex matrix by complex matrix ops. -DEFNDBINOP_OP (add, float_complex_matrix, float_complex_matrix, +DEFNDBINOP_OP (add, float_complex_matrix, float_complex_matrix, float_complex_array, float_complex_array, +) -DEFNDBINOP_OP (sub, float_complex_matrix, float_complex_matrix, +DEFNDBINOP_OP (sub, float_complex_matrix, float_complex_matrix, float_complex_array, float_complex_array, -) DEFBINOP_OP (mul, float_complex_matrix, float_complex_matrix, *) DEFBINOP (div, float_complex_matrix, float_complex_matrix) { - CAST_BINOP_ARGS (const octave_float_complex_matrix&, + CAST_BINOP_ARGS (const octave_float_complex_matrix&, const octave_float_complex_matrix&); MatrixType typ = v2.matrix_type (); - - FloatComplexMatrix ret = xdiv (v1.float_complex_matrix_value (), + + FloatComplexMatrix ret = xdiv (v1.float_complex_matrix_value (), v2.float_complex_matrix_value (), typ); v2.matrix_type (typ); @@ -101,11 +101,11 @@ DEFBINOP (ldiv, float_complex_matrix, float_complex_matrix) { - CAST_BINOP_ARGS (const octave_float_complex_matrix&, + CAST_BINOP_ARGS (const octave_float_complex_matrix&, const octave_float_complex_matrix&); MatrixType typ = v1.matrix_type (); - - FloatComplexMatrix ret = xleftdiv (v1.float_complex_matrix_value (), + + FloatComplexMatrix ret = xleftdiv (v1.float_complex_matrix_value (), v2.float_complex_matrix_value (), typ); v1.matrix_type (typ); @@ -115,7 +115,7 @@ DEFBINOP (trans_mul, float_complex_matrix, float_complex_matrix) { CAST_BINOP_ARGS (const octave_float_complex_matrix&, const octave_float_complex_matrix&); - return octave_value(xgemm (v1.float_complex_matrix_value (), + return octave_value(xgemm (v1.float_complex_matrix_value (), v2.float_complex_matrix_value (), blas_trans, blas_no_trans)); } @@ -123,7 +123,7 @@ DEFBINOP (mul_trans, float_complex_matrix, float_complex_matrix) { CAST_BINOP_ARGS (const octave_float_complex_matrix&, const octave_float_complex_matrix&); - return octave_value(xgemm (v1.float_complex_matrix_value (), + return octave_value(xgemm (v1.float_complex_matrix_value (), v2.float_complex_matrix_value (), blas_no_trans, blas_trans)); } @@ -131,7 +131,7 @@ DEFBINOP (herm_mul, float_complex_matrix, float_complex_matrix) { CAST_BINOP_ARGS (const octave_float_complex_matrix&, const octave_float_complex_matrix&); - return octave_value(xgemm (v1.float_complex_matrix_value (), + return octave_value(xgemm (v1.float_complex_matrix_value (), v2.float_complex_matrix_value (), blas_conj_trans, blas_no_trans)); } @@ -139,18 +139,18 @@ DEFBINOP (mul_herm, float_complex_matrix, float_complex_matrix) { CAST_BINOP_ARGS (const octave_float_complex_matrix&, const octave_float_complex_matrix&); - return octave_value(xgemm (v1.float_complex_matrix_value (), + return octave_value(xgemm (v1.float_complex_matrix_value (), v2.float_complex_matrix_value (), blas_no_trans, blas_conj_trans)); } DEFBINOP (trans_ldiv, float_complex_matrix, float_complex_matrix) { - CAST_BINOP_ARGS (const octave_float_complex_matrix&, + CAST_BINOP_ARGS (const octave_float_complex_matrix&, const octave_float_complex_matrix&); MatrixType typ = v1.matrix_type (); - - FloatComplexMatrix ret = xleftdiv (v1.float_complex_matrix_value (), + + FloatComplexMatrix ret = xleftdiv (v1.float_complex_matrix_value (), v2.float_complex_matrix_value (), typ, blas_trans); v1.matrix_type (typ); @@ -159,35 +159,35 @@ DEFBINOP (herm_ldiv, float_complex_matrix, float_complex_matrix) { - CAST_BINOP_ARGS (const octave_float_complex_matrix&, + CAST_BINOP_ARGS (const octave_float_complex_matrix&, const octave_float_complex_matrix&); MatrixType typ = v1.matrix_type (); - - FloatComplexMatrix ret = xleftdiv (v1.float_complex_matrix_value (), + + FloatComplexMatrix ret = xleftdiv (v1.float_complex_matrix_value (), v2.float_complex_matrix_value (), typ, blas_conj_trans); v1.matrix_type (typ); return ret; } -DEFNDCMPLXCMPOP_FN (lt, float_complex_matrix, float_complex_matrix, +DEFNDCMPLXCMPOP_FN (lt, float_complex_matrix, float_complex_matrix, float_complex_array, float_complex_array, mx_el_lt) -DEFNDCMPLXCMPOP_FN (le, float_complex_matrix, float_complex_matrix, +DEFNDCMPLXCMPOP_FN (le, float_complex_matrix, float_complex_matrix, float_complex_array, float_complex_array, mx_el_le) -DEFNDCMPLXCMPOP_FN (eq, float_complex_matrix, float_complex_matrix, +DEFNDCMPLXCMPOP_FN (eq, float_complex_matrix, float_complex_matrix, float_complex_array, float_complex_array, mx_el_eq) -DEFNDCMPLXCMPOP_FN (ge, float_complex_matrix, float_complex_matrix, +DEFNDCMPLXCMPOP_FN (ge, float_complex_matrix, float_complex_matrix, float_complex_array, float_complex_array, mx_el_ge) -DEFNDCMPLXCMPOP_FN (gt, float_complex_matrix, float_complex_matrix, +DEFNDCMPLXCMPOP_FN (gt, float_complex_matrix, float_complex_matrix, float_complex_array, float_complex_array, mx_el_gt) -DEFNDCMPLXCMPOP_FN (ne, float_complex_matrix, float_complex_matrix, +DEFNDCMPLXCMPOP_FN (ne, float_complex_matrix, float_complex_matrix, float_complex_array, float_complex_array, mx_el_ne) -DEFNDBINOP_FN (el_mul, float_complex_matrix, float_complex_matrix, +DEFNDBINOP_FN (el_mul, float_complex_matrix, float_complex_matrix, float_complex_array, float_complex_array, product) -DEFNDBINOP_FN (el_div, float_complex_matrix, float_complex_matrix, +DEFNDBINOP_FN (el_div, float_complex_matrix, float_complex_matrix, float_complex_array, float_complex_array, quotient) -DEFNDBINOP_FN (el_pow, float_complex_matrix, float_complex_matrix, +DEFNDBINOP_FN (el_pow, float_complex_matrix, float_complex_matrix, float_complex_array, float_complex_array, elem_xpow) DEFBINOP (el_ldiv, float_complex_matrix, float_complex_matrix) @@ -198,30 +198,30 @@ return octave_value (quotient (v2.float_complex_array_value (), v1.float_complex_array_value ())); } -DEFNDBINOP_FN (el_and, float_complex_matrix, float_complex_matrix, +DEFNDBINOP_FN (el_and, float_complex_matrix, float_complex_matrix, float_complex_array, float_complex_array, mx_el_and) -DEFNDBINOP_FN (el_or, float_complex_matrix, float_complex_matrix, +DEFNDBINOP_FN (el_or, float_complex_matrix, float_complex_matrix, float_complex_array, float_complex_array, mx_el_or) -DEFNDCATOP_FN (fcm_fcm, float_complex_matrix, float_complex_matrix, +DEFNDCATOP_FN (fcm_fcm, float_complex_matrix, float_complex_matrix, float_complex_array, float_complex_array, concat) -DEFNDCATOP_FN (cm_fcm, complex_matrix, float_complex_matrix, +DEFNDCATOP_FN (cm_fcm, complex_matrix, float_complex_matrix, float_complex_array, float_complex_array, concat) -DEFNDCATOP_FN (fcm_cm, float_complex_matrix, complex_matrix, +DEFNDCATOP_FN (fcm_cm, float_complex_matrix, complex_matrix, float_complex_array, float_complex_array, concat) -DEFNDASSIGNOP_FN (assign, float_complex_matrix, float_complex_matrix, +DEFNDASSIGNOP_FN (assign, float_complex_matrix, float_complex_matrix, float_complex_array, assign) -DEFNDASSIGNOP_FN (dbl_assign, float_complex_matrix, complex_matrix, +DEFNDASSIGNOP_FN (dbl_assign, float_complex_matrix, complex_matrix, float_complex_array, assign) DEFNULLASSIGNOP_FN (null_assign, float_complex_matrix, delete_elements) -DEFNDASSIGNOP_OP (assign_add, float_complex_matrix, +DEFNDASSIGNOP_OP (assign_add, float_complex_matrix, float_complex_matrix, float_complex_array, +=) -DEFNDASSIGNOP_OP (assign_sub, float_complex_matrix, +DEFNDASSIGNOP_OP (assign_sub, float_complex_matrix, float_complex_matrix, float_complex_array, -=) DEFNDASSIGNOP_FNOP (assign_el_mul, float_complex_matrix, float_complex_matrix, float_complex_array, product_eq) @@ -248,73 +248,73 @@ INSTALL_NCUNOP (op_decr, octave_float_complex_matrix, decr); INSTALL_NCUNOP (op_uminus, octave_float_complex_matrix, changesign); - INSTALL_BINOP (op_add, octave_float_complex_matrix, + INSTALL_BINOP (op_add, octave_float_complex_matrix, octave_float_complex_matrix, add); - INSTALL_BINOP (op_sub, octave_float_complex_matrix, + INSTALL_BINOP (op_sub, octave_float_complex_matrix, octave_float_complex_matrix, sub); - INSTALL_BINOP (op_mul, octave_float_complex_matrix, + INSTALL_BINOP (op_mul, octave_float_complex_matrix, octave_float_complex_matrix, mul); - INSTALL_BINOP (op_div, octave_float_complex_matrix, + INSTALL_BINOP (op_div, octave_float_complex_matrix, octave_float_complex_matrix, div); - INSTALL_BINOP (op_pow, octave_float_complex_matrix, + INSTALL_BINOP (op_pow, octave_float_complex_matrix, octave_float_complex_matrix, pow); - INSTALL_BINOP (op_ldiv, octave_float_complex_matrix, + INSTALL_BINOP (op_ldiv, octave_float_complex_matrix, octave_float_complex_matrix, ldiv); - INSTALL_BINOP (op_trans_mul, octave_float_complex_matrix, + INSTALL_BINOP (op_trans_mul, octave_float_complex_matrix, octave_float_complex_matrix, trans_mul); - INSTALL_BINOP (op_mul_trans, octave_float_complex_matrix, + INSTALL_BINOP (op_mul_trans, octave_float_complex_matrix, octave_float_complex_matrix, mul_trans); - INSTALL_BINOP (op_herm_mul, octave_float_complex_matrix, + INSTALL_BINOP (op_herm_mul, octave_float_complex_matrix, octave_float_complex_matrix, herm_mul); - INSTALL_BINOP (op_mul_herm, octave_float_complex_matrix, + INSTALL_BINOP (op_mul_herm, octave_float_complex_matrix, octave_float_complex_matrix, mul_herm); - INSTALL_BINOP (op_trans_ldiv, octave_float_complex_matrix, + INSTALL_BINOP (op_trans_ldiv, octave_float_complex_matrix, octave_float_complex_matrix, trans_ldiv); - INSTALL_BINOP (op_herm_ldiv, octave_float_complex_matrix, + INSTALL_BINOP (op_herm_ldiv, octave_float_complex_matrix, octave_float_complex_matrix, herm_ldiv); - INSTALL_BINOP (op_lt, octave_float_complex_matrix, + INSTALL_BINOP (op_lt, octave_float_complex_matrix, octave_float_complex_matrix, lt); - INSTALL_BINOP (op_le, octave_float_complex_matrix, + INSTALL_BINOP (op_le, octave_float_complex_matrix, octave_float_complex_matrix, le); - INSTALL_BINOP (op_eq, octave_float_complex_matrix, + INSTALL_BINOP (op_eq, octave_float_complex_matrix, octave_float_complex_matrix, eq); - INSTALL_BINOP (op_ge, octave_float_complex_matrix, + INSTALL_BINOP (op_ge, octave_float_complex_matrix, octave_float_complex_matrix, ge); - INSTALL_BINOP (op_gt, octave_float_complex_matrix, + INSTALL_BINOP (op_gt, octave_float_complex_matrix, octave_float_complex_matrix, gt); - INSTALL_BINOP (op_ne, octave_float_complex_matrix, + INSTALL_BINOP (op_ne, octave_float_complex_matrix, octave_float_complex_matrix, ne); - INSTALL_BINOP (op_el_mul, octave_float_complex_matrix, + INSTALL_BINOP (op_el_mul, octave_float_complex_matrix, octave_float_complex_matrix, el_mul); - INSTALL_BINOP (op_el_div, octave_float_complex_matrix, + INSTALL_BINOP (op_el_div, octave_float_complex_matrix, octave_float_complex_matrix, el_div); - INSTALL_BINOP (op_el_pow, octave_float_complex_matrix, + INSTALL_BINOP (op_el_pow, octave_float_complex_matrix, octave_float_complex_matrix, el_pow); - INSTALL_BINOP (op_el_ldiv, octave_float_complex_matrix, + INSTALL_BINOP (op_el_ldiv, octave_float_complex_matrix, octave_float_complex_matrix, el_ldiv); - INSTALL_BINOP (op_el_and, octave_float_complex_matrix, + INSTALL_BINOP (op_el_and, octave_float_complex_matrix, octave_float_complex_matrix, el_and); - INSTALL_BINOP (op_el_or, octave_float_complex_matrix, + INSTALL_BINOP (op_el_or, octave_float_complex_matrix, octave_float_complex_matrix, el_or); - INSTALL_CATOP (octave_float_complex_matrix, + INSTALL_CATOP (octave_float_complex_matrix, octave_float_complex_matrix, fcm_fcm); - INSTALL_CATOP (octave_complex_matrix, + INSTALL_CATOP (octave_complex_matrix, octave_float_complex_matrix, cm_fcm); - INSTALL_CATOP (octave_float_complex_matrix, + INSTALL_CATOP (octave_float_complex_matrix, octave_complex_matrix, fcm_cm); - INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix, + INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix, octave_float_complex_matrix, assign); - INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix, + INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix, octave_complex_matrix, dbl_assign); - INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix, + INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix, octave_null_matrix, null_assign); - INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix, + INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix, octave_null_str, null_assign); - INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix, + INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix, octave_null_sq_str, null_assign); INSTALL_ASSIGNOP (op_add_eq, octave_float_complex_matrix, @@ -326,6 +326,6 @@ INSTALL_ASSIGNOP (op_el_div_eq, octave_float_complex_matrix, octave_float_complex_matrix, assign_el_div); - INSTALL_CONVOP (octave_float_complex_matrix, octave_complex_matrix, + INSTALL_CONVOP (octave_float_complex_matrix, octave_complex_matrix, float_complex_matrix_to_complex_matrix); }