Mercurial > octave

comparison libinterp/operators/op-cm-m.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
46 46
47 DEFBINOP_OP (mul, complex_matrix, matrix, *) 47 DEFBINOP_OP (mul, complex_matrix, matrix, *)
48 48
49 DEFBINOP (mul_trans, complex_matrix, matrix) 49 DEFBINOP (mul_trans, complex_matrix, matrix)
50 { 50 {
51 CAST_BINOP_ARGS (const octave_complex_matrix&, const octave_matrix&); 51 const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
52 const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2);
52 53
53 ComplexMatrix m1 = v1.complex_matrix_value (); 54 ComplexMatrix m1 = v1.complex_matrix_value ();
54 Matrix m2 = v2.matrix_value (); 55 Matrix m2 = v2.matrix_value ();
55 56
56 return ComplexMatrix (xgemm (real (m1), m2, blas_no_trans, blas_trans), 57 return ComplexMatrix (xgemm (real (m1), m2, blas_no_trans, blas_trans),
57 xgemm (imag (m1), m2, blas_no_trans, blas_trans)); 58 xgemm (imag (m1), m2, blas_no_trans, blas_trans));
58 } 59 }
59 60
60 DEFBINOP (div, complex_matrix, matrix) 61 DEFBINOP (div, complex_matrix, matrix)
61 { 62 {
62 CAST_BINOP_ARGS (const octave_complex_matrix&, const octave_matrix&); 63 const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
64 const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2);
63 MatrixType typ = v2.matrix_type (); 65 MatrixType typ = v2.matrix_type ();
64 66
65 ComplexMatrix ret = xdiv (v1.complex_matrix_value (), 67 ComplexMatrix ret = xdiv (v1.complex_matrix_value (),
66 v2.matrix_value (), typ); 68 v2.matrix_value (), typ);
67 69
75 error ("can't do A ^ B for A and B both matrices"); 77 error ("can't do A ^ B for A and B both matrices");
76 } 78 }
77 79
78 DEFBINOP (ldiv, complex_matrix, matrix) 80 DEFBINOP (ldiv, complex_matrix, matrix)
79 { 81 {
80 CAST_BINOP_ARGS (const octave_complex_matrix&, const octave_matrix&); 82 const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
83 const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2);
81 MatrixType typ = v1.matrix_type (); 84 MatrixType typ = v1.matrix_type ();
82 85
83 ComplexMatrix ret = xleftdiv (v1.complex_matrix_value (), 86 ComplexMatrix ret = xleftdiv (v1.complex_matrix_value (),
84 v2.matrix_value (), typ); 87 v2.matrix_value (), typ);
85 88
98 DEFNDBINOP_FN (el_div, complex_matrix, matrix, complex_array, array, quotient) 101 DEFNDBINOP_FN (el_div, complex_matrix, matrix, complex_array, array, quotient)
99 DEFNDBINOP_FN (el_pow, complex_matrix, matrix, complex_array, array, elem_xpow) 102 DEFNDBINOP_FN (el_pow, complex_matrix, matrix, complex_array, array, elem_xpow)
100 103
101 DEFBINOP (el_ldiv, complex_matrix, matrix) 104 DEFBINOP (el_ldiv, complex_matrix, matrix)
102 { 105 {
103 CAST_BINOP_ARGS (const octave_complex_matrix&, const octave_matrix&); 106 const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1);
107 const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2);
104 108
105 return quotient (v2.array_value (), v1.complex_array_value ()); 109 return quotient (v2.array_value (), v1.complex_array_value ());
106 } 110 }
107 111
108 DEFNDBINOP_FN (el_and, complex_matrix, matrix, complex_array, array, mx_el_and) 112 DEFNDBINOP_FN (el_and, complex_matrix, matrix, complex_array, array, mx_el_and)