Mercurial > octave-nkf
diff src/OPERATORS/op-fm-fcm.cc @ 9931:fb6b6fcafa62
untabify files in src/OPERATORS directory
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 07 Dec 2009 14:49:48 -0500 |
parents | 1dba57e9d08d |
children | ac4b97c6bf8b |
line wrap: on
line diff
--- a/src/OPERATORS/op-fm-fcm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-fm-fcm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,7 +1,7 @@ /* Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008 John W. Eaton + 2007, 2008, 2009 John W. Eaton This file is part of Octave. @@ -45,9 +45,9 @@ // matrix by complex matrix ops. DEFNDBINOP_OP (add, float_matrix, float_complex_matrix, float_array, - float_complex_array, +) + float_complex_array, +) DEFNDBINOP_OP (sub, float_matrix, float_complex_matrix, float_array, - float_complex_array, -) + float_complex_array, -) DEFBINOP_OP (mul, float_matrix, float_complex_matrix, *) @@ -65,11 +65,11 @@ DEFBINOP (div, float_matrix, float_complex_matrix) { CAST_BINOP_ARGS (const octave_float_matrix&, - const octave_float_complex_matrix&); + const octave_float_complex_matrix&); MatrixType typ = v2.matrix_type (); FloatComplexMatrix ret = xdiv (v1.float_matrix_value (), - v2.float_complex_matrix_value (), typ); + v2.float_complex_matrix_value (), typ); v2.matrix_type (typ); return ret; @@ -84,11 +84,11 @@ DEFBINOP (ldiv, float_matrix, float_complex_matrix) { CAST_BINOP_ARGS (const octave_float_matrix&, - const octave_float_complex_matrix&); + const octave_float_complex_matrix&); MatrixType typ = v1.matrix_type (); FloatComplexMatrix ret = xleftdiv (v1.float_matrix_value (), - v2.float_complex_matrix_value (), typ); + v2.float_complex_matrix_value (), typ); v1.matrix_type (typ); return ret; @@ -108,46 +108,46 @@ } DEFNDCMPLXCMPOP_FN (lt, float_matrix, float_complex_matrix, float_array, - float_complex_array, mx_el_lt) + float_complex_array, mx_el_lt) DEFNDCMPLXCMPOP_FN (le, float_matrix, float_complex_matrix, float_array, - float_complex_array, mx_el_le) + float_complex_array, mx_el_le) DEFNDCMPLXCMPOP_FN (eq, float_matrix, float_complex_matrix, float_array, - float_complex_array, mx_el_eq) + float_complex_array, mx_el_eq) DEFNDCMPLXCMPOP_FN (ge, float_matrix, float_complex_matrix, float_array, - float_complex_array, mx_el_ge) + float_complex_array, mx_el_ge) DEFNDCMPLXCMPOP_FN (gt, float_matrix, float_complex_matrix, float_array, - float_complex_array, mx_el_gt) + float_complex_array, mx_el_gt) DEFNDCMPLXCMPOP_FN (ne, float_matrix, float_complex_matrix, float_array, - float_complex_array, mx_el_ne) + float_complex_array, mx_el_ne) DEFNDBINOP_FN (el_mul, float_matrix, float_complex_matrix, float_array, - float_complex_array, product) + float_complex_array, product) DEFNDBINOP_FN (el_div, float_matrix, float_complex_matrix, float_array, - float_complex_array, quotient) + float_complex_array, quotient) DEFNDBINOP_FN (el_pow, float_matrix, float_complex_matrix, float_array, - float_complex_array, elem_xpow) + float_complex_array, elem_xpow) DEFBINOP (el_ldiv, float_matrix, float_complex_matrix) { CAST_BINOP_ARGS (const octave_float_matrix&, - const octave_float_complex_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, - float_complex_array, mx_el_and) + float_complex_array, mx_el_and) DEFNDBINOP_FN (el_or, float_matrix, float_complex_matrix, float_array, - float_complex_array, mx_el_or) + float_complex_array, mx_el_or) DEFNDCATOP_FN (fm_fcm, float_matrix, float_complex_matrix, float_array, - float_complex_array, concat) + float_complex_array, concat) DEFNDCATOP_FN (m_fcm, matrix, float_complex_matrix, float_array, - float_complex_array, concat) + float_complex_array, concat) DEFNDCATOP_FN (fm_cm, float_matrix, complex_matrix, float_array, - float_complex_array, concat) + float_complex_array, concat) DEFCONV (float_complex_matrix_conv, float_matrix, float_complex_matrix) { @@ -165,7 +165,7 @@ 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, - octave_float_complex_matrix, ldiv); + 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); INSTALL_BINOP (op_eq, octave_float_matrix, octave_float_complex_matrix, eq); @@ -173,17 +173,17 @@ 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, - octave_float_complex_matrix, el_mul); + octave_float_complex_matrix, el_mul); INSTALL_BINOP (op_el_div, octave_float_matrix, - octave_float_complex_matrix, el_div); + octave_float_complex_matrix, el_div); INSTALL_BINOP (op_el_pow, octave_float_matrix, - octave_float_complex_matrix, el_pow); + octave_float_complex_matrix, el_pow); INSTALL_BINOP (op_el_ldiv, octave_float_matrix, - octave_float_complex_matrix, el_ldiv); + octave_float_complex_matrix, el_ldiv); INSTALL_BINOP (op_el_and, octave_float_matrix, - octave_float_complex_matrix, el_and); + octave_float_complex_matrix, el_and); INSTALL_BINOP (op_el_or, octave_float_matrix, - octave_float_complex_matrix, el_or); + octave_float_complex_matrix, el_or); INSTALL_BINOP (op_trans_mul, octave_float_matrix, octave_float_complex_matrix, trans_mul); INSTALL_BINOP (op_herm_mul, octave_float_matrix, @@ -198,12 +198,12 @@ INSTALL_CATOP (octave_float_matrix, octave_complex_matrix, fm_cm); INSTALL_ASSIGNCONV (octave_float_matrix, octave_float_complex_matrix, - octave_float_complex_matrix); + octave_float_complex_matrix); INSTALL_ASSIGNCONV (octave_matrix, octave_float_complex_matrix, - octave_complex_matrix); + octave_complex_matrix); INSTALL_WIDENOP (octave_float_matrix, octave_float_complex_matrix, - float_complex_matrix_conv); + float_complex_matrix_conv); } /*