Mercurial > octave

comparison libinterp/operators/op-b-sbm.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
45 DEFBINOP_FN (el_and, bool, sparse_bool_matrix, mx_el_and) 45 DEFBINOP_FN (el_and, bool, sparse_bool_matrix, mx_el_and)
46 DEFBINOP_FN (el_or, bool, sparse_bool_matrix, mx_el_or) 46 DEFBINOP_FN (el_or, bool, sparse_bool_matrix, mx_el_or)
47 47
48 DEFCATOP (b_sbm, bool, sparse_bool_matrix) 48 DEFCATOP (b_sbm, bool, sparse_bool_matrix)
49 { 49 {
50 CAST_BINOP_ARGS (octave_bool&, const octave_sparse_bool_matrix&); 50 octave_bool& v1 = dynamic_cast<octave_bool&> (a1);
51 const octave_sparse_bool_matrix& v2 = dynamic_cast<const octave_sparse_bool_matrix&> (a2);
51 SparseBoolMatrix tmp (1, 1, v1.bool_value ()); 52 SparseBoolMatrix tmp (1, 1, v1.bool_value ());
52 return octave_value (tmp. concat (v2.sparse_bool_matrix_value (), 53 return octave_value (tmp. concat (v2.sparse_bool_matrix_value (),
53 ra_idx)); 54 ra_idx));
54 } 55 }
55 56
56 DEFCATOP (b_sm, bool, sparse_matrix) 57 DEFCATOP (b_sm, bool, sparse_matrix)
57 { 58 {
58 CAST_BINOP_ARGS (octave_bool&, const octave_sparse_matrix&); 59 octave_bool& v1 = dynamic_cast<octave_bool&> (a1);
60 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2);
59 SparseMatrix tmp (1, 1, v1.scalar_value ()); 61 SparseMatrix tmp (1, 1, v1.scalar_value ());
60 return octave_value (tmp. concat (v2.sparse_matrix_value (), ra_idx)); 62 return octave_value (tmp. concat (v2.sparse_matrix_value (), ra_idx));
61 } 63 }
62 64
63 DEFCATOP (s_sbm, scalar, sparse_bool_matrix) 65 DEFCATOP (s_sbm, scalar, sparse_bool_matrix)
64 { 66 {
65 CAST_BINOP_ARGS (octave_scalar&, const octave_sparse_bool_matrix&); 67 octave_scalar& v1 = dynamic_cast<octave_scalar&> (a1);
68 const octave_sparse_bool_matrix& v2 = dynamic_cast<const octave_sparse_bool_matrix&> (a2);
66 SparseMatrix tmp (1, 1, v1.scalar_value ()); 69 SparseMatrix tmp (1, 1, v1.scalar_value ());
67 return octave_value(tmp. concat (v2.sparse_matrix_value (), ra_idx)); 70 return octave_value(tmp. concat (v2.sparse_matrix_value (), ra_idx));
68 } 71 }
69 72
70 DEFCONV (sparse_bool_matrix_conv, bool, sparse_bool_matrix) 73 DEFCONV (sparse_bool_matrix_conv, bool, sparse_bool_matrix)
71 { 74 {
72 CAST_CONV_ARG (const octave_bool&); 75 const octave_bool& v = dynamic_cast<const octave_bool&> (a);
73 76
74 return new octave_sparse_bool_matrix 77 return new octave_sparse_bool_matrix
75 (SparseBoolMatrix (1, 1, v.bool_value ())); 78 (SparseBoolMatrix (1, 1, v.bool_value ()));
76 } 79 }
77 80