Mercurial > octave

comparison liboctave/array/MDiagArray2.cc @ 22197:e43d83253e28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refill multi-line macro definitions Use the Emacs C++ mode style for line continuation markers in multi-line macro definitions. * make_int.cc, __dsearchn__.cc, __magick_read__.cc, besselj.cc, bitfcns.cc, bsxfun.cc, cellfun.cc, data.cc, defun-dld.h, defun-int.h, defun.h, det.cc, error.h, find.cc, gcd.cc, graphics.cc, interpreter.h, jit-ir.h, jit-typeinfo.h, lookup.cc, ls-mat5.cc, max.cc, mexproto.h, mxarray.in.h, oct-stream.cc, ordschur.cc, pr-output.cc, profiler.h, psi.cc, regexp.cc, sparse-xdiv.cc, sparse-xpow.cc, tril.cc, txt-eng.h, utils.cc, variables.cc, variables.h, xdiv.cc, xpow.cc, __glpk__.cc, ov-base.cc, ov-base.h, ov-cell.cc, ov-ch-mat.cc, ov-classdef.cc, ov-complex.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-float.cc, ov-float.h, ov-flt-complex.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-int-traits.h, ov-lazy-idx.h, ov-perm.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc, ov-type-conv.h, ov.cc, ov.h, op-class.cc, op-int-conv.cc, op-int.h, op-str-str.cc, ops.h, lex.ll, Array.cc, CMatrix.cc, CSparse.cc, MArray.cc, MArray.h, MDiagArray2.cc, MDiagArray2.h, MSparse.h, Sparse.cc, dMatrix.cc, dSparse.cc, fCMatrix.cc, fMatrix.cc, idx-vector.cc, f77-fcn.h, quit.h, bsxfun-decl.h, bsxfun-defs.cc, lo-specfun.cc, oct-convn.cc, oct-convn.h, oct-norm.cc, oct-norm.h, oct-rand.cc, Sparse-op-decls.h, Sparse-op-defs.h, mx-inlines.cc, mx-op-decl.h, mx-op-defs.h, mach-info.cc, oct-group.cc, oct-passwd.cc, oct-syscalls.cc, oct-time.cc, data-conv.cc, kpse.cc, lo-ieee.h, lo-macros.h, oct-cmplx.h, oct-glob.cc, oct-inttypes.cc, oct-inttypes.h, oct-locbuf.h, oct-sparse.h, url-transfer.cc, oct-conf-post.in.h, shared-fcns.h: Refill macro definitions.
author John W. Eaton <jwe@octave.org>
date Mon, 01 Aug 2016 12:40:18 -0400
parents b6a686543080
children bac0d6f07a3e
comparison
equal deleted inserted replaced
22196:dd992fd74fce 22197:e43d83253e28
50 50
51 // Element by element MDiagArray2 by MDiagArray2 ops. 51 // Element by element MDiagArray2 by MDiagArray2 ops.
52 52
53 // Element by element MDiagArray2 by scalar ops. 53 // Element by element MDiagArray2 by scalar ops.
54 54
55 #define MARRAY_DAS_OP(OP, FN) \ 55 #define MARRAY_DAS_OP(OP, FN) \
56 template <typename T> \ 56 template <typename T> \
57 MDiagArray2<T> \ 57 MDiagArray2<T> \
58 operator OP (const MDiagArray2<T>& a, const T& s) \ 58 operator OP (const MDiagArray2<T>& a, const T& s) \
59 { \ 59 { \
60 return MDiagArray2<T> (do_ms_binary_op<T, T, T> (a, s, FN), a.d1, a.d2); \ 60 return MDiagArray2<T> (do_ms_binary_op<T, T, T> (a, s, FN), a.d1, a.d2); \
61 } 61 }
62 62
63 MARRAY_DAS_OP (*, mx_inline_mul) 63 MARRAY_DAS_OP (*, mx_inline_mul)
64 MARRAY_DAS_OP (/, mx_inline_div) 64 MARRAY_DAS_OP (/, mx_inline_div)
73 a.d1, a.d2); 73 a.d1, a.d2);
74 } 74 }
75 75
76 // Element by element MDiagArray2 by MDiagArray2 ops. 76 // Element by element MDiagArray2 by MDiagArray2 ops.
77 77
78 #define MARRAY_DADA_OP(FCN, OP, FN) \ 78 #define MARRAY_DADA_OP(FCN, OP, FN) \
79 template <typename T> \ 79 template <typename T> \
80 MDiagArray2<T> \ 80 MDiagArray2<T> \
81 FCN (const MDiagArray2<T>& a, const MDiagArray2<T>& b) \ 81 FCN (const MDiagArray2<T>& a, const MDiagArray2<T>& b) \
82 { \ 82 { \
83 if (a.d1 != b.d1 || a.d2 != b.d2) \ 83 if (a.d1 != b.d1 || a.d2 != b.d2) \
84 err_nonconformant (#FCN, a.d1, a.d2, b.d1, b.d2); \ 84 err_nonconformant (#FCN, a.d1, a.d2, b.d1, b.d2); \
85 \ 85 \
86 return MDiagArray2<T> (do_mm_binary_op<T, T, T> (a, b, FN, FN, FN, #FCN), a.d1, a.d2); \ 86 return MDiagArray2<T> (do_mm_binary_op<T, T, T> (a, b, FN, FN, FN, #FCN), a.d1, a.d2); \
87 } 87 }
88 88
89 MARRAY_DADA_OP (operator +, +, mx_inline_add) 89 MARRAY_DADA_OP (operator +, +, mx_inline_add)
90 MARRAY_DADA_OP (operator -, -, mx_inline_sub) 90 MARRAY_DADA_OP (operator -, -, mx_inline_sub)