Mercurial > octave

comparison libinterp/operators/op-sm-s.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, sparse_matrix, scalar, -) 43 DEFBINOP_OP (sub, sparse_matrix, scalar, -)
44 DEFBINOP_OP (mul, sparse_matrix, scalar, *) 44 DEFBINOP_OP (mul, sparse_matrix, scalar, *)
45 45
46 DEFBINOP (div, sparse_matrix, scalar) 46 DEFBINOP (div, sparse_matrix, scalar)
47 { 47 {
48 CAST_BINOP_ARGS (const octave_sparse_matrix&, const octave_scalar&); 48 const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1);
49 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);
49 50
50 double d = v2.double_value (); 51 double d = v2.double_value ();
51 octave_value retval; 52 octave_value retval;
52 53
53 if (d == 0.0) 54 if (d == 0.0)
58 return retval; 59 return retval;
59 } 60 }
60 61
61 DEFBINOP (pow, sparse_matrix, scalar) 62 DEFBINOP (pow, sparse_matrix, scalar)
62 { 63 {
63 CAST_BINOP_ARGS (const octave_sparse_matrix&, const octave_scalar&); 64 const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1);
65 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);
64 66
65 double tmp = v2.scalar_value (); 67 double tmp = v2.scalar_value ();
66 if (static_cast<int> (tmp) == tmp) 68 if (static_cast<int> (tmp) == tmp)
67 return xpow (v1.sparse_matrix_value (), tmp); 69 return xpow (v1.sparse_matrix_value (), tmp);
68 else 70 else
69 return xpow (v1.matrix_value (), tmp); 71 return xpow (v1.matrix_value (), tmp);
70 } 72 }
71 73
72 DEFBINOP (ldiv, sparse_matrix, scalar) 74 DEFBINOP (ldiv, sparse_matrix, scalar)
73 { 75 {
74 CAST_BINOP_ARGS (const octave_sparse_matrix&, const octave_scalar&); 76 const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1);
77 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);
75 78
76 if (v1.rows () == 1 && v1.columns () == 1) 79 if (v1.rows () == 1 && v1.columns () == 1)
77 { 80 {
78 double d = v1.scalar_value (); 81 double d = v1.scalar_value ();
79 82
102 105
103 DEFBINOP_OP (el_mul, sparse_matrix, scalar, *) 106 DEFBINOP_OP (el_mul, sparse_matrix, scalar, *)
104 107
105 DEFBINOP (el_div, sparse_matrix, scalar) 108 DEFBINOP (el_div, sparse_matrix, scalar)
106 { 109 {
107 CAST_BINOP_ARGS (const octave_sparse_matrix&, const octave_scalar&); 110 const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1);
111 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);
108 112
109 double d = v2.double_value (); 113 double d = v2.double_value ();
110 octave_value retval; 114 octave_value retval;
111 115
112 if (d == 0.0) 116 if (d == 0.0)
119 123
120 DEFBINOP_FN (el_pow, sparse_matrix, scalar, elem_xpow) 124 DEFBINOP_FN (el_pow, sparse_matrix, scalar, elem_xpow)
121 125
122 DEFBINOP (el_ldiv, sparse_matrix, scalar) 126 DEFBINOP (el_ldiv, sparse_matrix, scalar)
123 { 127 {
124 CAST_BINOP_ARGS (const octave_sparse_matrix&, const octave_scalar&); 128 const octave_sparse_matrix& v1 = dynamic_cast<const octave_sparse_matrix&> (a1);
129 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);
125 130
126 return octave_value 131 return octave_value
127 (x_el_div (v2.complex_value (), v1.sparse_matrix_value ())); 132 (x_el_div (v2.complex_value (), v1.sparse_matrix_value ()));
128 } 133 }
129 134
130 DEFBINOP_FN (el_and, sparse_matrix, scalar, mx_el_and) 135 DEFBINOP_FN (el_and, sparse_matrix, scalar, mx_el_and)
131 DEFBINOP_FN (el_or, sparse_matrix, scalar, mx_el_or) 136 DEFBINOP_FN (el_or, sparse_matrix, scalar, mx_el_or)
132 137
133 DEFCATOP (sm_s, sparse_matrix, scalar) 138 DEFCATOP (sm_s, sparse_matrix, scalar)
134 { 139 {
135 CAST_BINOP_ARGS (octave_sparse_matrix&, const octave_scalar&); 140 octave_sparse_matrix& v1 = dynamic_cast<octave_sparse_matrix&> (a1);
141 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);
136 SparseMatrix tmp (1, 1, v2.scalar_value ()); 142 SparseMatrix tmp (1, 1, v2.scalar_value ());
137 return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx)); 143 return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx));
138 } 144 }
139 145
140 DEFASSIGNOP (assign, sparse_matrix, scalar) 146 DEFASSIGNOP (assign, sparse_matrix, scalar)
141 { 147 {
142 CAST_BINOP_ARGS (octave_sparse_matrix&, const octave_scalar&); 148 octave_sparse_matrix& v1 = dynamic_cast<octave_sparse_matrix&> (a1);
149 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2);
143 150
144 SparseMatrix tmp (1, 1, v2.scalar_value ()); 151 SparseMatrix tmp (1, 1, v2.scalar_value ());
145 v1.assign (idx, tmp); 152 v1.assign (idx, tmp);
146 return octave_value (); 153 return octave_value ();
147 } 154 }