Mercurial > octave

comparison libinterp/operators/op-sbm-bm.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
57 DEFBINOP_FN (el_and, sparse_bool_matrix, bool_matrix, mx_el_and) 57 DEFBINOP_FN (el_and, sparse_bool_matrix, bool_matrix, mx_el_and)
58 DEFBINOP_FN (el_or, sparse_bool_matrix, bool_matrix, mx_el_or) 58 DEFBINOP_FN (el_or, sparse_bool_matrix, bool_matrix, mx_el_or)
59 59
60 DEFCATOP (sbm_bm, sparse_bool_matrix, bool_matrix) 60 DEFCATOP (sbm_bm, sparse_bool_matrix, bool_matrix)
61 { 61 {
62 CAST_BINOP_ARGS (octave_sparse_bool_matrix&, const octave_bool_matrix&); 62 octave_sparse_bool_matrix& v1 = dynamic_cast<octave_sparse_bool_matrix&> (a1);
63 const octave_bool_matrix& v2 = dynamic_cast<const octave_bool_matrix&> (a2);
63 64
64 SparseBoolMatrix tmp (v2.bool_matrix_value ()); 65 SparseBoolMatrix tmp (v2.bool_matrix_value ());
65 return octave_value (v1.sparse_bool_matrix_value (). concat (tmp, ra_idx)); 66 return octave_value (v1.sparse_bool_matrix_value (). concat (tmp, ra_idx));
66 } 67 }
67 68
68 DEFCATOP (sbm_m, sparse_bool_matrix, matrix) 69 DEFCATOP (sbm_m, sparse_bool_matrix, matrix)
69 { 70 {
70 CAST_BINOP_ARGS (octave_sparse_bool_matrix&, const octave_matrix&); 71 octave_sparse_bool_matrix& v1 = dynamic_cast<octave_sparse_bool_matrix&> (a1);
72 const octave_matrix& v2 = dynamic_cast<const octave_matrix&> (a2);
71 73
72 SparseMatrix tmp (v2.matrix_value ()); 74 SparseMatrix tmp (v2.matrix_value ());
73 return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx)); 75 return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx));
74 } 76 }
75 77
76 DEFCATOP (sm_bm, sparse_matrix, bool_matrix) 78 DEFCATOP (sm_bm, sparse_matrix, bool_matrix)
77 { 79 {
78 CAST_BINOP_ARGS (octave_sparse_matrix&, const octave_bool_matrix&); 80 octave_sparse_matrix& v1 = dynamic_cast<octave_sparse_matrix&> (a1);
81 const octave_bool_matrix& v2 = dynamic_cast<const octave_bool_matrix&> (a2);
79 82
80 SparseMatrix tmp (v2.matrix_value ()); 83 SparseMatrix tmp (v2.matrix_value ());
81 return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx)); 84 return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx));
82 } 85 }
83 86
84 DEFASSIGNOP (assign, sparse_bool_matrix, bool_matrix) 87 DEFASSIGNOP (assign, sparse_bool_matrix, bool_matrix)
85 { 88 {
86 CAST_BINOP_ARGS (octave_sparse_bool_matrix&, const octave_bool_matrix&); 89 octave_sparse_bool_matrix& v1 = dynamic_cast<octave_sparse_bool_matrix&> (a1);
90 const octave_bool_matrix& v2 = dynamic_cast<const octave_bool_matrix&> (a2);
87 91
88 v1.assign (idx, SparseBoolMatrix (v2.bool_matrix_value ())); 92 v1.assign (idx, SparseBoolMatrix (v2.bool_matrix_value ()));
89 return octave_value (); 93 return octave_value ();
90 } 94 }
91 95