Mercurial > octave

comparison libinterp/operators/op-cs-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
46 DEFBINOP_OP (sub, complex, sparse_matrix, -) 46 DEFBINOP_OP (sub, complex, sparse_matrix, -)
47 DEFBINOP_OP (mul, complex, sparse_matrix, *) 47 DEFBINOP_OP (mul, complex, sparse_matrix, *)
48 48
49 DEFBINOP (div, complex, sparse_matrix) 49 DEFBINOP (div, complex, sparse_matrix)
50 { 50 {
51 CAST_BINOP_ARGS (const octave_complex&, const octave_sparse_matrix&); 51 const octave_complex& v1 = dynamic_cast<const octave_complex&> (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
70 } 71 }
71 } 72 }
72 73
73 DEFBINOP (pow, complex, sparse_matrix) 74 DEFBINOP (pow, complex, sparse_matrix)
74 { 75 {
75 CAST_BINOP_ARGS (const octave_complex&, const octave_sparse_matrix&); 76 const octave_complex& v1 = dynamic_cast<const octave_complex&> (a1);
77 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2);
76 return xpow (v1.complex_value (), v2.matrix_value ()); 78 return xpow (v1.complex_value (), v2.matrix_value ());
77 } 79 }
78 80
79 DEFBINOP (ldiv, complex, sparse_matrix) 81 DEFBINOP (ldiv, complex, sparse_matrix)
80 { 82 {
81 CAST_BINOP_ARGS (const octave_complex&, const octave_sparse_matrix&); 83 const octave_complex& v1 = dynamic_cast<const octave_complex&> (a1);
84 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2);
82 85
83 Complex d = v1.complex_value (); 86 Complex d = v1.complex_value ();
84 octave_value retval; 87 octave_value retval;
85 88
86 if (d == 0.0) 89 if (d == 0.0)
102 DEFBINOP_FN (el_div, complex, sparse_matrix, x_el_div) 105 DEFBINOP_FN (el_div, complex, sparse_matrix, x_el_div)
103 DEFBINOP_FN (el_pow, complex, sparse_matrix, elem_xpow) 106 DEFBINOP_FN (el_pow, complex, sparse_matrix, elem_xpow)
104 107
105 DEFBINOP (el_ldiv, complex, sparse_matrix) 108 DEFBINOP (el_ldiv, complex, sparse_matrix)
106 { 109 {
107 CAST_BINOP_ARGS (const octave_complex&, const octave_sparse_matrix&); 110 const octave_complex& v1 = dynamic_cast<const octave_complex&> (a1);
111 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2);
108 112
109 Complex d = v1.complex_value (); 113 Complex d = v1.complex_value ();
110 octave_value retval; 114 octave_value retval;
111 115
112 if (d == 0.0) 116 if (d == 0.0)
120 DEFBINOP_FN (el_and, complex, sparse_matrix, mx_el_and) 124 DEFBINOP_FN (el_and, complex, sparse_matrix, mx_el_and)
121 DEFBINOP_FN (el_or, complex, sparse_matrix, mx_el_or) 125 DEFBINOP_FN (el_or, complex, sparse_matrix, mx_el_or)
122 126
123 DEFCATOP (cs_sm, sparse_matrix, complex) 127 DEFCATOP (cs_sm, sparse_matrix, complex)
124 { 128 {
125 CAST_BINOP_ARGS (octave_complex&, const octave_sparse_matrix&); 129 octave_complex& v1 = dynamic_cast<octave_complex&> (a1);
130 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2);
126 SparseComplexMatrix tmp (1, 1, v1.complex_value ()); 131 SparseComplexMatrix tmp (1, 1, v1.complex_value ());
127 return octave_value (tmp. concat (v2.sparse_matrix_value (), ra_idx)); 132 return octave_value (tmp. concat (v2.sparse_matrix_value (), ra_idx));
128 } 133 }
129 134
130 DEFCONV (sparse_matrix_conv, complex, sparse_matrix) 135 DEFCONV (sparse_matrix_conv, complex, sparse_matrix)
131 { 136 {
132 CAST_CONV_ARG (const octave_complex&); 137 const octave_complex& v = dynamic_cast<const octave_complex&> (a);
133 138
134 return new octave_sparse_matrix 139 return new octave_sparse_matrix
135 (SparseMatrix (v.matrix_value ())); 140 (SparseMatrix (v.matrix_value ()));
136 } 141 }
137 142