Mercurial > octave

comparison libinterp/operators/op-fcm-fm.cc @ 21647:66cae7a6dc47

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate some macros for operator definitions * ops.h (CAST_UNOP_ARG, CAST_BINOP_ARGS, CAST_CONV_ARG, ASSIGNOPDECL, NULLASSIGNOPDECL, ASSIGNANYOPDECL, DEFASSIGNOP, DEFASSIGNOP_FN, UNOPDECL, BINOPDECL, CATOPDECL): Delete macros. * make_int.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-flt-cx-diag.cc, ov-flt-re-diag.cc, ov-lazy-idx.cc, ov-null-mat.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-scalar.cc, ov-str-mat.cc, op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-bm.cc, op-bm-sbm.cc, op-cdm-cdm.cc, op-cell.cc, op-chm.cc, op-cm-cm.cc, op-cm-cs.cc, op-cm-m.cc, op-cm-s.cc, op-cm-scm.cc, op-cm-sm.cc, op-cs-cm.cc, op-cs-cs.cc, op-cs-m.cc, op-cs-s.cc, op-cs-scm.cc, op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc, op-dm-template.cc, op-dms-template.cc, op-fcdm-fcdm.cc, op-fcm-fcm.cc, op-fcm-fcs.cc, op-fcm-fm.cc, op-fcm-fs.cc, op-fcn.cc, op-fcs-fcm.cc, op-fcs-fcs.cc, op-fcs-fm.cc, op-fcs-fs.cc, op-fdm-fdm.cc, op-fm-fcm.cc, op-fm-fcs.cc, op-fm-fm.cc, op-fm-fs.cc, op-fs-fcm.cc, op-fs-fcs.cc, op-fs-fm.cc, op-fs-fs.cc, op-int-conv.cc, op-int.h, op-m-cm.cc, op-m-cs.cc, op-m-m.cc, op-m-s.cc, op-m-scm.cc, op-m-sm.cc, op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-pm-template.cc, op-range.cc, op-s-cm.cc, op-s-cs.cc, op-s-m.cc, op-s-s.cc, op-s-scm.cc, op-s-sm.cc, op-sbm-b.cc, op-sbm-bm.cc, op-sbm-sbm.cc, op-scm-cm.cc, op-scm-cs.cc, op-scm-m.cc, op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc, op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc, op-sm-s.cc, op-sm-scm.cc, op-sm-sm.cc, op-str-m.cc, op-str-s.cc, op-str-str.cc, op-struct.cc, ops.h: Expand eliminated macros in place.
author John W. Eaton <jwe@octave.org>
date Wed, 27 Apr 2016 16:13:40 -0400
parents 40de9f8f23a6
children aba2e6293dd8
comparison
equal deleted inserted replaced
21646:3cddf1e65ccf 21647:66cae7a6dc47
50 50
51 DEFBINOP_OP (mul, float_complex_matrix, float_matrix, *) 51 DEFBINOP_OP (mul, float_complex_matrix, float_matrix, *)
52 52
53 DEFBINOP (mul_trans, float_complex_matrix, float_matrix) 53 DEFBINOP (mul_trans, float_complex_matrix, float_matrix)
54 { 54 {
55 CAST_BINOP_ARGS (const octave_float_complex_matrix&, 55 const octave_float_complex_matrix& v1 = dynamic_cast<const octave_float_complex_matrix&> (a1);
56 const octave_float_matrix&); 56 const octave_float_matrix& v2 = dynamic_cast<const octave_float_matrix&> (a2);
57 57
58 FloatComplexMatrix m1 = v1.float_complex_matrix_value (); 58 FloatComplexMatrix m1 = v1.float_complex_matrix_value ();
59 FloatMatrix m2 = v2.float_matrix_value (); 59 FloatMatrix m2 = v2.float_matrix_value ();
60 60
61 return FloatComplexMatrix (xgemm (real (m1), m2, blas_no_trans, blas_trans), 61 return FloatComplexMatrix (xgemm (real (m1), m2, blas_no_trans, blas_trans),
62 xgemm (imag (m1), m2, blas_no_trans, blas_trans)); 62 xgemm (imag (m1), m2, blas_no_trans, blas_trans));
63 } 63 }
64 64
65 DEFBINOP (div, float_complex_matrix, float_matrix) 65 DEFBINOP (div, float_complex_matrix, float_matrix)
66 { 66 {
67 CAST_BINOP_ARGS (const octave_float_complex_matrix&, 67 const octave_float_complex_matrix& v1 = dynamic_cast<const octave_float_complex_matrix&> (a1);
68 const octave_float_matrix&); 68 const octave_float_matrix& v2 = dynamic_cast<const octave_float_matrix&> (a2);
69 MatrixType typ = v2.matrix_type (); 69 MatrixType typ = v2.matrix_type ();
70 70
71 FloatComplexMatrix ret = xdiv (v1.float_complex_matrix_value (), 71 FloatComplexMatrix ret = xdiv (v1.float_complex_matrix_value (),
72 v2.float_matrix_value (), typ); 72 v2.float_matrix_value (), typ);
73 73
81 error ("can't do A ^ B for A and B both matrices"); 81 error ("can't do A ^ B for A and B both matrices");
82 } 82 }
83 83
84 DEFBINOP (ldiv, float_complex_matrix, float_matrix) 84 DEFBINOP (ldiv, float_complex_matrix, float_matrix)
85 { 85 {
86 CAST_BINOP_ARGS (const octave_float_complex_matrix&, 86 const octave_float_complex_matrix& v1 = dynamic_cast<const octave_float_complex_matrix&> (a1);
87 const octave_float_matrix&); 87 const octave_float_matrix& v2 = dynamic_cast<const octave_float_matrix&> (a2);
88 MatrixType typ = v1.matrix_type (); 88 MatrixType typ = v1.matrix_type ();
89 89
90 FloatComplexMatrix ret = xleftdiv (v1.float_complex_matrix_value (), 90 FloatComplexMatrix ret = xleftdiv (v1.float_complex_matrix_value (),
91 v2.float_matrix_value (), typ); 91 v2.float_matrix_value (), typ);
92 92
114 DEFNDBINOP_FN (el_pow, float_complex_matrix, float_matrix, 114 DEFNDBINOP_FN (el_pow, float_complex_matrix, float_matrix,
115 float_complex_array, float_array, elem_xpow) 115 float_complex_array, float_array, elem_xpow)
116 116
117 DEFBINOP (el_ldiv, float_complex_matrix, float_matrix) 117 DEFBINOP (el_ldiv, float_complex_matrix, float_matrix)
118 { 118 {
119 CAST_BINOP_ARGS (const octave_float_complex_matrix&, 119 const octave_float_complex_matrix& v1 = dynamic_cast<const octave_float_complex_matrix&> (a1);
120 const octave_float_matrix&); 120 const octave_float_matrix& v2 = dynamic_cast<const octave_float_matrix&> (a2);
121 121
122 return quotient (v2.float_array_value (), v1.float_complex_array_value ()); 122 return quotient (v2.float_array_value (), v1.float_complex_array_value ());
123 } 123 }
124 124
125 DEFNDBINOP_FN (el_and, float_complex_matrix, float_matrix, 125 DEFNDBINOP_FN (el_and, float_complex_matrix, float_matrix,