Mercurial > octave

comparison libinterp/operators/op-sm-scm.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
45 45
46 DEFBINOP_OP (mul, sparse_matrix, sparse_complex_matrix, *) 46 DEFBINOP_OP (mul, sparse_matrix, sparse_complex_matrix, *)
47 47
48 DEFBINOP (div, sparse_matrix, sparse_complex_matrix) 48 DEFBINOP (div, sparse_matrix, sparse_complex_matrix)
49 { 49 {
50 CAST_BINOP_ARGS (const octave_sparse_matrix&, 50 const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1);
51 const octave_sparse_complex_matrix&); 51 const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
52 52
53 if (v2.rows () == 1 && v2.columns () == 1) 53 if (v2.rows () == 1 && v2.columns () == 1)
54 { 54 {
55 Complex d = v2.complex_value (); 55 Complex d = v2.complex_value ();
56 56
75 error ("can't do A ^ B for A and B both matrices"); 75 error ("can't do A ^ B for A and B both matrices");
76 } 76 }
77 77
78 DEFBINOP (ldiv, sparse_matrix, sparse_complex_matrix) 78 DEFBINOP (ldiv, sparse_matrix, sparse_complex_matrix)
79 { 79 {
80 CAST_BINOP_ARGS (const octave_sparse_matrix&, 80 const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1);
81 const octave_sparse_complex_matrix&); 81 const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
82 82
83 if (v1.rows () == 1 && v1.columns () == 1) 83 if (v1.rows () == 1 && v1.columns () == 1)
84 { 84 {
85 double d = v1.scalar_value (); 85 double d = v1.scalar_value ();
86 86
113 DEFBINOP_FN (el_div, sparse_matrix, sparse_complex_matrix, quotient) 113 DEFBINOP_FN (el_div, sparse_matrix, sparse_complex_matrix, quotient)
114 DEFBINOP_FN (el_pow, sparse_matrix, sparse_complex_matrix, elem_xpow) 114 DEFBINOP_FN (el_pow, sparse_matrix, sparse_complex_matrix, elem_xpow)
115 115
116 DEFBINOP (el_ldiv, sparse_matrix, sparse_complex_matrix) 116 DEFBINOP (el_ldiv, sparse_matrix, sparse_complex_matrix)
117 { 117 {
118 CAST_BINOP_ARGS (const octave_sparse_matrix&, 118 const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_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.sparse_matrix_value ())); 122 v1.sparse_matrix_value ()));
123 } 123 }
124 124
127 127
128 DEFCATOP_FN (sm_scm, sparse_matrix, sparse_complex_matrix, concat) 128 DEFCATOP_FN (sm_scm, sparse_matrix, sparse_complex_matrix, concat)
129 129
130 DEFCONV (sparse_complex_matrix_conv, sparse_matrix, sparse_complex_matrix) 130 DEFCONV (sparse_complex_matrix_conv, sparse_matrix, sparse_complex_matrix)
131 { 131 {
132 CAST_CONV_ARG (const octave_sparse_matrix&); 132 const octave_sparse_matrix& v = dynamic_cast<const octave_sparse_matrix&> (a);
133 return new octave_sparse_complex_matrix (v.sparse_complex_matrix_value ()); 133 return new octave_sparse_complex_matrix (v.sparse_complex_matrix_value ());
134 } 134 }
135 135
136 void 136 void
137 install_sm_scm_ops (void) 137 install_sm_scm_ops (void)