Mercurial > octave
comparison libinterp/operators/op-cm-sm.cc @ 21647:66cae7a6dc47
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, sparse_matrix, *) | 47 DEFBINOP_OP (mul, complex_matrix, sparse_matrix, *) |
48 | 48 |
49 DEFBINOP (div, complex_matrix, sparse_matrix) | 49 DEFBINOP (div, complex_matrix, sparse_matrix) |
50 { | 50 { |
51 CAST_BINOP_ARGS (const octave_complex_matrix&, const octave_sparse_matrix&); | 51 const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1); |
52 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); | |
52 | 53 |
53 if (v2.rows () == 1 && v2.columns () == 1) | 54 if (v2.rows () == 1 && v2.columns () == 1) |
54 { | 55 { |
55 double d = v2.scalar_value (); | 56 double d = v2.scalar_value (); |
56 | 57 |
76 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"); |
77 } | 78 } |
78 | 79 |
79 DEFBINOP (ldiv, complex_matrix, sparse_matrix) | 80 DEFBINOP (ldiv, complex_matrix, sparse_matrix) |
80 { | 81 { |
81 CAST_BINOP_ARGS (const octave_complex_matrix&, | 82 const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1); |
82 const octave_sparse_matrix&); | 83 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); |
83 MatrixType typ = v1.matrix_type (); | 84 MatrixType typ = v1.matrix_type (); |
84 | 85 |
85 ComplexMatrix ret = xleftdiv (v1.complex_matrix_value (), | 86 ComplexMatrix ret = xleftdiv (v1.complex_matrix_value (), |
86 v2.matrix_value (), typ); | 87 v2.matrix_value (), typ); |
87 | 88 |
99 DEFBINOP_FN (el_mul, complex_matrix, sparse_matrix, product) | 100 DEFBINOP_FN (el_mul, complex_matrix, sparse_matrix, product) |
100 DEFBINOP_FN (el_div, complex_matrix, sparse_matrix, quotient) | 101 DEFBINOP_FN (el_div, complex_matrix, sparse_matrix, quotient) |
101 | 102 |
102 DEFBINOP (el_pow, complex_matrix, sparse_matrix) | 103 DEFBINOP (el_pow, complex_matrix, sparse_matrix) |
103 { | 104 { |
104 CAST_BINOP_ARGS (const octave_complex_matrix&, | 105 const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1); |
105 const octave_sparse_matrix&); | 106 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); |
106 | 107 |
107 return octave_value | 108 return octave_value |
108 (elem_xpow (SparseComplexMatrix (v1.complex_matrix_value ()), | 109 (elem_xpow (SparseComplexMatrix (v1.complex_matrix_value ()), |
109 v2.sparse_matrix_value ())); | 110 v2.sparse_matrix_value ())); |
110 } | 111 } |
111 | 112 |
112 DEFBINOP (el_ldiv, complex_matrix, sparse_matrix) | 113 DEFBINOP (el_ldiv, complex_matrix, sparse_matrix) |
113 { | 114 { |
114 CAST_BINOP_ARGS (const octave_complex_matrix&, | 115 const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1); |
115 const octave_sparse_matrix&); | 116 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); |
116 return octave_value | 117 return octave_value |
117 (quotient (v2.sparse_matrix_value (), v1.complex_matrix_value ())); | 118 (quotient (v2.sparse_matrix_value (), v1.complex_matrix_value ())); |
118 } | 119 } |
119 | 120 |
120 DEFBINOP_FN (el_and, complex_matrix, sparse_matrix, mx_el_and) | 121 DEFBINOP_FN (el_and, complex_matrix, sparse_matrix, mx_el_and) |
121 DEFBINOP_FN (el_or, complex_matrix, sparse_matrix, mx_el_or) | 122 DEFBINOP_FN (el_or, complex_matrix, sparse_matrix, mx_el_or) |
122 | 123 |
123 DEFCATOP (cm_sm, complex_matrix, sparse_matrix) | 124 DEFCATOP (cm_sm, complex_matrix, sparse_matrix) |
124 { | 125 { |
125 CAST_BINOP_ARGS (octave_complex_matrix&, const octave_sparse_matrix&); | 126 octave_complex_matrix& v1 = dynamic_cast<octave_complex_matrix&> (a1); |
127 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); | |
126 SparseComplexMatrix tmp (v1.complex_matrix_value ()); | 128 SparseComplexMatrix tmp (v1.complex_matrix_value ()); |
127 return octave_value (tmp. concat (v2.sparse_matrix_value (), ra_idx)); | 129 return octave_value (tmp. concat (v2.sparse_matrix_value (), ra_idx)); |
128 } | 130 } |
129 | 131 |
130 DEFNDASSIGNOP_FN (assign, complex_matrix, sparse_matrix, complex_array, assign) | 132 DEFNDASSIGNOP_FN (assign, complex_matrix, sparse_matrix, complex_array, assign) |