Mercurial > octave

comparison libinterp/operators/op-m-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 46
47 DEFBINOP_OP (mul, matrix, sparse_matrix, *) 47 DEFBINOP_OP (mul, matrix, sparse_matrix, *)
48 48
49 DEFBINOP (div, matrix, sparse_matrix) 49 DEFBINOP (div, matrix, sparse_matrix)
50 { 50 {
51 CAST_BINOP_ARGS (const octave_matrix&, const octave_sparse_matrix&); 51 const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (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
75 error ("can't do A ^ B for A and B both matrices"); 76 error ("can't do A ^ B for A and B both matrices");
76 } 77 }
77 78
78 DEFBINOP (ldiv, matrix, sparse_matrix) 79 DEFBINOP (ldiv, matrix, sparse_matrix)
79 { 80 {
80 CAST_BINOP_ARGS (const octave_matrix&, const octave_sparse_matrix&); 81 const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1);
82 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2);
81 MatrixType typ = v1.matrix_type (); 83 MatrixType typ = v1.matrix_type ();
82 84
83 Matrix ret = xleftdiv (v1.matrix_value (), v2.matrix_value (), typ); 85 Matrix ret = xleftdiv (v1.matrix_value (), v2.matrix_value (), typ);
84 86
85 v1.matrix_type (typ); 87 v1.matrix_type (typ);
98 DEFBINOP_FN (el_mul, matrix, sparse_matrix, product) 100 DEFBINOP_FN (el_mul, matrix, sparse_matrix, product)
99 DEFBINOP_FN (el_div, matrix, sparse_matrix, quotient) 101 DEFBINOP_FN (el_div, matrix, sparse_matrix, quotient)
100 102
101 DEFBINOP (el_pow, matrix, sparse_matrix) 103 DEFBINOP (el_pow, matrix, sparse_matrix)
102 { 104 {
103 CAST_BINOP_ARGS (const octave_matrix&, const octave_sparse_matrix&); 105 const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1);
106 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2);
104 107
105 return octave_value (elem_xpow (SparseMatrix (v1.matrix_value ()), 108 return octave_value (elem_xpow (SparseMatrix (v1.matrix_value ()),
106 v2.sparse_matrix_value ())); 109 v2.sparse_matrix_value ()));
107 } 110 }
108 111
109 DEFBINOP (el_ldiv, matrix, sparse_matrix) 112 DEFBINOP (el_ldiv, matrix, sparse_matrix)
110 { 113 {
111 CAST_BINOP_ARGS (const octave_matrix&, const octave_sparse_matrix&); 114 const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1);
115 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2);
112 116
113 return octave_value 117 return octave_value
114 (quotient (v2.sparse_matrix_value (), v1.matrix_value ())); 118 (quotient (v2.sparse_matrix_value (), v1.matrix_value ()));
115 } 119 }
116 120
117 DEFBINOP_FN (el_and, matrix, sparse_matrix, mx_el_and) 121 DEFBINOP_FN (el_and, matrix, sparse_matrix, mx_el_and)
118 DEFBINOP_FN (el_or, matrix, sparse_matrix, mx_el_or) 122 DEFBINOP_FN (el_or, matrix, sparse_matrix, mx_el_or)
119 123
120 DEFCATOP (m_sm, matrix, sparse_matrix) 124 DEFCATOP (m_sm, matrix, sparse_matrix)
121 { 125 {
122 CAST_BINOP_ARGS (octave_matrix&, const octave_sparse_matrix&); 126 octave_matrix& v1 = dynamic_cast<octave_matrix&> (a1);
127 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2);
123 SparseMatrix tmp (v1.matrix_value ()); 128 SparseMatrix tmp (v1.matrix_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, matrix, sparse_matrix) 132 DEFCONV (sparse_matrix_conv, matrix, sparse_matrix)
128 { 133 {
129 CAST_CONV_ARG (const octave_matrix&); 134 const octave_matrix& v = dynamic_cast<const octave_matrix&> (a);
130 return new octave_sparse_matrix (SparseMatrix (v.matrix_value ())); 135 return new octave_sparse_matrix (SparseMatrix (v.matrix_value ()));
131 } 136 }
132 137
133 DEFNDASSIGNOP_FN (assign, matrix, sparse_matrix, array, assign) 138 DEFNDASSIGNOP_FN (assign, matrix, sparse_matrix, array, assign)
134 139