Mercurial > octave

comparison libinterp/operators/op-s-sm.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
43 DEFBINOP_OP (sub, scalar, sparse_matrix, -) 43 DEFBINOP_OP (sub, scalar, sparse_matrix, -)
44 DEFBINOP_OP (mul, scalar, sparse_matrix, *) 44 DEFBINOP_OP (mul, scalar, sparse_matrix, *)
45 45
46 DEFBINOP (div, scalar, sparse_matrix) 46 DEFBINOP (div, scalar, sparse_matrix)
47 { 47 {
48 CAST_BINOP_ARGS (const octave_scalar&, const octave_sparse_matrix&); 48 const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1);
49 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2);
49 50
50 if (v2.rows () == 1 && v2.columns () == 1) 51 if (v2.rows () == 1 && v2.columns () == 1)
51 { 52 {
52 double d = v2.scalar_value (); 53 double d = v2.scalar_value ();
53 54
67 } 68 }
68 } 69 }
69 70
70 DEFBINOP (pow, scalar, sparse_matrix) 71 DEFBINOP (pow, scalar, sparse_matrix)
71 { 72 {
72 CAST_BINOP_ARGS (const octave_scalar&, const octave_sparse_matrix&); 73 const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1);
74 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2);
73 return xpow (v1.scalar_value (), v2.matrix_value ()); 75 return xpow (v1.scalar_value (), v2.matrix_value ());
74 } 76 }
75 77
76 DEFBINOP (ldiv, scalar, sparse_matrix) 78 DEFBINOP (ldiv, scalar, sparse_matrix)
77 { 79 {
78 CAST_BINOP_ARGS (const octave_scalar&, const octave_sparse_matrix&); 80 const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1);
81 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2);
79 82
80 double d = v1.double_value (); 83 double d = v1.double_value ();
81 octave_value retval; 84 octave_value retval;
82 85
83 if (d == 0.0) 86 if (d == 0.0)
99 DEFBINOP_FN (el_div, scalar, sparse_matrix, x_el_div) 102 DEFBINOP_FN (el_div, scalar, sparse_matrix, x_el_div)
100 DEFBINOP_FN (el_pow, scalar, sparse_matrix, elem_xpow) 103 DEFBINOP_FN (el_pow, scalar, sparse_matrix, elem_xpow)
101 104
102 DEFBINOP (el_ldiv, scalar, sparse_matrix) 105 DEFBINOP (el_ldiv, scalar, sparse_matrix)
103 { 106 {
104 CAST_BINOP_ARGS (const octave_scalar&, const octave_sparse_matrix&); 107 const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1);
108 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2);
105 109
106 double d = v1.double_value (); 110 double d = v1.double_value ();
107 octave_value retval; 111 octave_value retval;
108 112
109 if (d == 0.0) 113 if (d == 0.0)
117 DEFBINOP_FN (el_and, scalar, sparse_matrix, mx_el_and) 121 DEFBINOP_FN (el_and, scalar, sparse_matrix, mx_el_and)
118 DEFBINOP_FN (el_or, scalar, sparse_matrix, mx_el_or) 122 DEFBINOP_FN (el_or, scalar, sparse_matrix, mx_el_or)
119 123
120 DEFCATOP (s_sm, scalar, sparse_matrix) 124 DEFCATOP (s_sm, scalar, sparse_matrix)
121 { 125 {
122 CAST_BINOP_ARGS (octave_scalar&, const octave_sparse_matrix&); 126 octave_scalar& v1 = dynamic_cast<octave_scalar&> (a1);
127 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2);
123 SparseMatrix tmp (1, 1, v1.scalar_value ()); 128 SparseMatrix tmp (1, 1, v1.scalar_value ());
124 return octave_value (tmp.concat (v2.sparse_matrix_value (), ra_idx)); 129 return octave_value (tmp.concat (v2.sparse_matrix_value (), ra_idx));
125 } 130 }
126 131
127 DEFCONV (sparse_matrix_conv, scalar, sparse_matrix) 132 DEFCONV (sparse_matrix_conv, scalar, sparse_matrix)
128 { 133 {
129 CAST_CONV_ARG (const octave_scalar&); 134 const octave_scalar& v = dynamic_cast<const octave_scalar&> (a);
130 135
131 return new octave_sparse_matrix (SparseMatrix (v.matrix_value ())); 136 return new octave_sparse_matrix (SparseMatrix (v.matrix_value ()));
132 } 137 }
133 138
134 void 139 void