Mercurial > octave

comparison libinterp/operators/op-pm-scm.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
35 35
36 // permutation matrix by sparse matrix ops 36 // permutation matrix by sparse matrix ops
37 37
38 DEFBINOP (mul_pm_scm, perm_matrix, sparse_complex_matrix) 38 DEFBINOP (mul_pm_scm, perm_matrix, sparse_complex_matrix)
39 { 39 {
40 CAST_BINOP_ARGS (const octave_perm_matrix&, 40 const octave_perm_matrix& v1 = dynamic_cast<const octave_perm_matrix&> (a1);
41 const octave_sparse_complex_matrix&); 41 const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
42 42
43 if (v2.rows () == 1 && v2.columns () == 1) 43 if (v2.rows () == 1 && v2.columns () == 1)
44 { 44 {
45 std::complex<double> d = v2.complex_value (); 45 std::complex<double> d = v2.complex_value ();
46 46
52 return v1.perm_matrix_value () * v2.sparse_complex_matrix_value (); 52 return v1.perm_matrix_value () * v2.sparse_complex_matrix_value ();
53 } 53 }
54 54
55 DEFBINOP (ldiv_pm_scm, perm_matrix, sparse_complex_matrix) 55 DEFBINOP (ldiv_pm_scm, perm_matrix, sparse_complex_matrix)
56 { 56 {
57 CAST_BINOP_ARGS (const octave_perm_matrix&, 57 const octave_perm_matrix& v1 = dynamic_cast<const octave_perm_matrix&> (a1);
58 const octave_sparse_complex_matrix&); 58 const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
59 59
60 return v1.perm_matrix_value ().inverse () * v2.sparse_complex_matrix_value (); 60 return v1.perm_matrix_value ().inverse () * v2.sparse_complex_matrix_value ();
61 } 61 }
62 62
63 // sparse matrix by diagonal matrix ops 63 // sparse matrix by diagonal matrix ops
64 64
65 DEFBINOP (mul_scm_pm, sparse_complex_matrix, perm_matrix) 65 DEFBINOP (mul_scm_pm, sparse_complex_matrix, perm_matrix)
66 { 66 {
67 CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, 67 const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
68 const octave_perm_matrix&); 68 const octave_perm_matrix& v2 = dynamic_cast<const octave_perm_matrix&> (a2);
69 69
70 if (v1.rows () == 1 && v1.columns () == 1) 70 if (v1.rows () == 1 && v1.columns () == 1)
71 { 71 {
72 std::complex<double> d = v1.scalar_value (); 72 std::complex<double> d = v1.scalar_value ();
73 73
79 return v1.sparse_complex_matrix_value () * v2.perm_matrix_value (); 79 return v1.sparse_complex_matrix_value () * v2.perm_matrix_value ();
80 } 80 }
81 81
82 DEFBINOP (div_scm_pm, sparse_complex_matrix, perm_matrix) 82 DEFBINOP (div_scm_pm, sparse_complex_matrix, perm_matrix)
83 { 83 {
84 CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, 84 const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
85 const octave_perm_matrix&); 85 const octave_perm_matrix& v2 = dynamic_cast<const octave_perm_matrix&> (a2);
86 86
87 return v1.sparse_complex_matrix_value () * v2.perm_matrix_value ().inverse (); 87 return v1.sparse_complex_matrix_value () * v2.perm_matrix_value ().inverse ();
88 } 88 }
89 89
90 void 90 void