Mercurial > octave
comparison libinterp/operators/op-cm-scm.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_complex_matrix, *) | 47 DEFBINOP_OP (mul, complex_matrix, sparse_complex_matrix, *) |
| 48 | 48 |
| 49 DEFBINOP (div, complex_matrix, sparse_complex_matrix) | 49 DEFBINOP (div, complex_matrix, sparse_complex_matrix) |
| 50 { | 50 { |
| 51 CAST_BINOP_ARGS (const octave_complex_matrix&, | 51 const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1); |
| 52 const octave_sparse_complex_matrix&); | 52 const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2); |
| 53 | 53 |
| 54 if (v2.rows () == 1 && v2.columns () == 1) | 54 if (v2.rows () == 1 && v2.columns () == 1) |
| 55 { | 55 { |
| 56 Complex d = v2.complex_value (); | 56 Complex d = v2.complex_value (); |
| 57 | 57 |
| 77 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"); |
| 78 } | 78 } |
| 79 | 79 |
| 80 DEFBINOP (ldiv, complex_matrix, sparse_complex_matrix) | 80 DEFBINOP (ldiv, complex_matrix, sparse_complex_matrix) |
| 81 { | 81 { |
| 82 CAST_BINOP_ARGS (const octave_complex_matrix&, | 82 const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1); |
| 83 const octave_sparse_complex_matrix&); | 83 const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2); |
| 84 MatrixType typ = v1.matrix_type (); | 84 MatrixType typ = v1.matrix_type (); |
| 85 | 85 |
| 86 ComplexMatrix ret = xleftdiv (v1.complex_matrix_value (), | 86 ComplexMatrix ret = xleftdiv (v1.complex_matrix_value (), |
| 87 v2.complex_matrix_value (), typ); | 87 v2.complex_matrix_value (), typ); |
| 88 | 88 |
| 103 DEFBINOP_FN (el_mul, complex_matrix, sparse_complex_matrix, product) | 103 DEFBINOP_FN (el_mul, complex_matrix, sparse_complex_matrix, product) |
| 104 DEFBINOP_FN (el_div, complex_matrix, sparse_complex_matrix, quotient) | 104 DEFBINOP_FN (el_div, complex_matrix, sparse_complex_matrix, quotient) |
| 105 | 105 |
| 106 DEFBINOP (el_pow, complex_matrix, sparse_complex_matrix) | 106 DEFBINOP (el_pow, complex_matrix, sparse_complex_matrix) |
| 107 { | 107 { |
| 108 CAST_BINOP_ARGS (const octave_complex_matrix&, | 108 const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1); |
| 109 const octave_sparse_complex_matrix&); | 109 const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2); |
| 110 | 110 |
| 111 return octave_value | 111 return octave_value |
| 112 (elem_xpow (SparseComplexMatrix (v1.complex_matrix_value ()), | 112 (elem_xpow (SparseComplexMatrix (v1.complex_matrix_value ()), |
| 113 v2.sparse_complex_matrix_value ())); | 113 v2.sparse_complex_matrix_value ())); |
| 114 } | 114 } |
| 115 | 115 |
| 116 DEFBINOP (el_ldiv, sparse_complex_matrix, matrix) | 116 DEFBINOP (el_ldiv, sparse_complex_matrix, matrix) |
| 117 { | 117 { |
| 118 CAST_BINOP_ARGS (const octave_complex_matrix&, | 118 const octave_complex_matrix& v1 = dynamic_cast<const octave_complex_matrix&> (a1); |
| 119 const octave_sparse_complex_matrix&); | 119 const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2); |
| 120 | 120 |
| 121 return octave_value (quotient (v2.sparse_complex_matrix_value (), | 121 return octave_value (quotient (v2.sparse_complex_matrix_value (), |
| 122 v1.complex_matrix_value ())); | 122 v1.complex_matrix_value ())); |
| 123 } | 123 } |
| 124 | 124 |
| 125 DEFBINOP_FN (el_and, complex_matrix, sparse_complex_matrix, mx_el_and) | 125 DEFBINOP_FN (el_and, complex_matrix, sparse_complex_matrix, mx_el_and) |
| 126 DEFBINOP_FN (el_or, complex_matrix, sparse_complex_matrix, mx_el_or) | 126 DEFBINOP_FN (el_or, complex_matrix, sparse_complex_matrix, mx_el_or) |
| 127 | 127 |
| 128 DEFCATOP (cm_scm, complex_matrix, sparse_complex_matrix) | 128 DEFCATOP (cm_scm, complex_matrix, sparse_complex_matrix) |
| 129 { | 129 { |
| 130 CAST_BINOP_ARGS (octave_complex_matrix&, | 130 octave_complex_matrix& v1 = dynamic_cast<octave_complex_matrix&> (a1); |
| 131 const octave_sparse_complex_matrix&); | 131 const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2); |
| 132 SparseComplexMatrix tmp (v1.complex_matrix_value ()); | 132 SparseComplexMatrix tmp (v1.complex_matrix_value ()); |
| 133 return octave_value (tmp. concat (v2.sparse_complex_matrix_value (), | 133 return octave_value (tmp. concat (v2.sparse_complex_matrix_value (), |
| 134 ra_idx)); | 134 ra_idx)); |
| 135 } | 135 } |
| 136 | 136 |
| 137 DEFCONV (sparse_complex_matrix_conv, complex_matrix, | 137 DEFCONV (sparse_complex_matrix_conv, complex_matrix, |
| 138 sparse_complex_matrix) | 138 sparse_complex_matrix) |
| 139 { | 139 { |
| 140 CAST_CONV_ARG (const octave_complex_matrix&); | 140 const octave_complex_matrix& v = dynamic_cast<const octave_complex_matrix&> (a); |
| 141 return new octave_sparse_complex_matrix | 141 return new octave_sparse_complex_matrix |
| 142 (SparseComplexMatrix (v.complex_matrix_value ())); | 142 (SparseComplexMatrix (v.complex_matrix_value ())); |
| 143 } | 143 } |
| 144 | 144 |
| 145 DEFNDASSIGNOP_FN (assign, complex_matrix, sparse_complex_matrix, | 145 DEFNDASSIGNOP_FN (assign, complex_matrix, sparse_complex_matrix, |