Mercurial > octave

comparison libinterp/operators/op-fcdm-fcdm.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
40 DEFUNOP_OP (uplus, float_complex_diag_matrix, /* no-op */) 40 DEFUNOP_OP (uplus, float_complex_diag_matrix, /* no-op */)
41 DEFUNOP_OP (uminus, float_complex_diag_matrix, -) 41 DEFUNOP_OP (uminus, float_complex_diag_matrix, -)
42 42
43 DEFUNOP (transpose, float_complex_diag_matrix) 43 DEFUNOP (transpose, float_complex_diag_matrix)
44 { 44 {
45 CAST_UNOP_ARG (const octave_float_complex_diag_matrix&); 45 const octave_float_complex_diag_matrix& v = dynamic_cast<const octave_float_complex_diag_matrix&> (a);
46 return octave_value (v.float_complex_diag_matrix_value ().transpose ()); 46 return octave_value (v.float_complex_diag_matrix_value ().transpose ());
47 } 47 }
48 48
49 DEFUNOP (hermitian, float_complex_diag_matrix) 49 DEFUNOP (hermitian, float_complex_diag_matrix)
50 { 50 {
51 CAST_UNOP_ARG (const octave_float_complex_diag_matrix&); 51 const octave_float_complex_diag_matrix& v = dynamic_cast<const octave_float_complex_diag_matrix&> (a);
52 return octave_value (v.float_complex_diag_matrix_value ().hermitian ()); 52 return octave_value (v.float_complex_diag_matrix_value ().hermitian ());
53 } 53 }
54 54
55 // matrix by matrix ops. 55 // matrix by matrix ops.
56 56
58 DEFBINOP_OP (sub, float_complex_diag_matrix, float_complex_diag_matrix, -) 58 DEFBINOP_OP (sub, float_complex_diag_matrix, float_complex_diag_matrix, -)
59 DEFBINOP_OP (mul, float_complex_diag_matrix, float_complex_diag_matrix, *) 59 DEFBINOP_OP (mul, float_complex_diag_matrix, float_complex_diag_matrix, *)
60 60
61 DEFBINOP (div, float_complex_diag_matrix, float_complex_diag_matrix) 61 DEFBINOP (div, float_complex_diag_matrix, float_complex_diag_matrix)
62 { 62 {
63 CAST_BINOP_ARGS (const octave_float_complex_diag_matrix&, 63 const octave_float_complex_diag_matrix& v1 = dynamic_cast<const octave_float_complex_diag_matrix&> (a1);
64 const octave_float_complex_diag_matrix&); 64 const octave_float_complex_diag_matrix& v2 = dynamic_cast<const octave_float_complex_diag_matrix&> (a2);
65 65
66 return xdiv (v1.float_complex_diag_matrix_value (), 66 return xdiv (v1.float_complex_diag_matrix_value (),
67 v2.float_complex_diag_matrix_value ()); 67 v2.float_complex_diag_matrix_value ());
68 } 68 }
69 69
70 DEFBINOP (ldiv, float_complex_diag_matrix, float_complex_diag_matrix) 70 DEFBINOP (ldiv, float_complex_diag_matrix, float_complex_diag_matrix)
71 { 71 {
72 CAST_BINOP_ARGS (const octave_float_complex_diag_matrix&, 72 const octave_float_complex_diag_matrix& v1 = dynamic_cast<const octave_float_complex_diag_matrix&> (a1);
73 const octave_float_complex_diag_matrix&); 73 const octave_float_complex_diag_matrix& v2 = dynamic_cast<const octave_float_complex_diag_matrix&> (a2);
74 74
75 return xleftdiv (v1.float_complex_diag_matrix_value (), 75 return xleftdiv (v1.float_complex_diag_matrix_value (),
76 v2.float_complex_diag_matrix_value ()); 76 v2.float_complex_diag_matrix_value ());
77 } 77 }
78 78
79 CONVDECL (float_complex_diag_matrix_to_float_complex_matrix) 79 CONVDECL (float_complex_diag_matrix_to_float_complex_matrix)
80 { 80 {
81 CAST_CONV_ARG (const octave_float_complex_diag_matrix&); 81 const octave_float_complex_diag_matrix& v = dynamic_cast<const octave_float_complex_diag_matrix&> (a);
82 82
83 return new octave_float_complex_matrix (v.float_complex_matrix_value ()); 83 return new octave_float_complex_matrix (v.float_complex_matrix_value ());
84 } 84 }
85 85
86 CONVDECL (float_complex_diag_matrix_to_complex_diag_matrix) 86 CONVDECL (float_complex_diag_matrix_to_complex_diag_matrix)
87 { 87 {
88 CAST_CONV_ARG (const octave_float_complex_diag_matrix&); 88 const octave_float_complex_diag_matrix& v = dynamic_cast<const octave_float_complex_diag_matrix&> (a);
89 89
90 return new octave_complex_diag_matrix (v.complex_diag_matrix_value ()); 90 return new octave_complex_diag_matrix (v.complex_diag_matrix_value ());
91 } 91 }
92 92
93 void 93 void