octave: liboctave/array/MDiagArray2.cc annotate

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

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

rev	line source
1988 7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	1 /*
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	2
19697 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 18084 diff changeset	3 Copyright (C) 1996-2015 John W. Eaton
10521 4d1fc073fbb7 add some missing copyright stmts Jaroslav Hajek <highegg@gmail.com> parents: 10362 diff changeset	4 Copyright (C) 2010 VZLU Prague
1988 7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	5
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	6 This file is part of Octave.
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	7
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	8 Octave is free software; you can redistribute it and/or modify it
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	9 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 5307 diff changeset	10 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 5307 diff changeset	11 option) any later version.
1988 7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	12
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	13 Octave is distributed in the hope that it will be useful, but WITHOUT
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	16 for more details.
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	17
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	18 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 5307 diff changeset	19 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 5307 diff changeset	20 <http://www.gnu.org/licenses/>.
1988 7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	21
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	22 */
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	23
21690 b6a686543080 Only include config.h in files that are compiled separately. John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	24 // This file should not include config.h. It is only included in other
b6a686543080 Only include config.h in files that are compiled separately. John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	25 // C++ source files that should have included config.h before including
b6a686543080 Only include config.h in files that are compiled separately. John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	26 // this file.
1988 7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	27
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	28 #include "MDiagArray2.h"
4669 334a27c8f453 [project @ 2003-11-26 07:02:42 by jwe] jwe parents: 4646 diff changeset	29 #include "Array-util.h"
1988 7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	30 #include "lo-error.h"
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	31
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	32 template <typename T>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	33 bool
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	34 MDiagArray2<T>::is_multiple_of_identity (T val) const
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	35 {
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	36 bool retval = this->rows () == this->cols ();
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	37 if (retval)
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	38 {
18084 8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 17769 diff changeset	39 octave_idx_type len = this->length ();
8e056300994b Follow coding convention of defining and initializing only 1 variable per line in liboctave. Rik <rik@octave.org> parents: 17769 diff changeset	40 octave_idx_type i = 0;
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	41 for (; i < len; i++)
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	42 if (DiagArray2<T>::elem (i, i) != val) break;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	43 retval = i == len;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	44 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	45
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	46 return retval;
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	47 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 7017 diff changeset	48
1988 7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	49 // Two dimensional diagonal array with math ops.
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	50
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	51 // Element by element MDiagArray2 by MDiagArray2 ops.
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	52
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	53 // Element by element MDiagArray2 by scalar ops.
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	54
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	55 #define MARRAY_DAS_OP(OP, FN) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	56 template <typename T> \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	57 MDiagArray2<T> \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	58 operator OP (const MDiagArray2<T>& a, const T& s) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	59 { \
10362 b47ab50a6aa8 simplify appliers in mx-inlines.cc Jaroslav Hajek <highegg@gmail.com> parents: 10158 diff changeset	60 return MDiagArray2<T> (do_ms_binary_op<T, T, T> (a, s, FN), a.d1, a.d2); \
1988 7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	61 }
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	62
9612 66970dd627f6 further liboctave design improvements Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	63 MARRAY_DAS_OP (*, mx_inline_mul)
66970dd627f6 further liboctave design improvements Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	64 MARRAY_DAS_OP (/, mx_inline_div)
1988 7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	65
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	66 // Element by element scalar by MDiagArray2 ops.
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	67
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	68 template <typename T>
1988 7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	69 MDiagArray2<T>
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	70 operator * (const T& s, const MDiagArray2<T>& a)
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	71 {
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	72 return MDiagArray2<T> (do_sm_binary_op<T, T, T> (s, a, mx_inline_mul),
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	73 a.d1, a.d2);
1988 7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	74 }
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	75
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	76 // Element by element MDiagArray2 by MDiagArray2 ops.
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	77
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	78 #define MARRAY_DADA_OP(FCN, OP, FN) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	79 template <typename T> \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	80 MDiagArray2<T> \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	81 FCN (const MDiagArray2<T>& a, const MDiagArray2<T>& b) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	82 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	83 if (a.d1 != b.d1 \|\| a.d2 != b.d2) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	84 err_nonconformant (#FCN, a.d1, a.d2, b.d1, b.d2); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21690 diff changeset	85 \
13004 d9d65c3017c3 Make bsxfun automatic for most binary operators. Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	86 return MDiagArray2<T> (do_mm_binary_op<T, T, T> (a, b, FN, FN, FN, #FCN), a.d1, a.d2); \
1988 7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	87 }
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	88
9612 66970dd627f6 further liboctave design improvements Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	89 MARRAY_DADA_OP (operator +, +, mx_inline_add)
66970dd627f6 further liboctave design improvements Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	90 MARRAY_DADA_OP (operator -, -, mx_inline_sub)
66970dd627f6 further liboctave design improvements Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	91 MARRAY_DADA_OP (product, *, mx_inline_mul)
1988 7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	92
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	93 // Unary MDiagArray2 ops.
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	94
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	95 template <typename T>
1988 7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	96 MDiagArray2<T>
3580 2923f52d8fda [project @ 2000-02-05 07:14:21 by jwe] jwe parents: 3504 diff changeset	97 operator + (const MDiagArray2<T>& a)
2923f52d8fda [project @ 2000-02-05 07:14:21 by jwe] jwe parents: 3504 diff changeset	98 {
2923f52d8fda [project @ 2000-02-05 07:14:21 by jwe] jwe parents: 3504 diff changeset	99 return a;
2923f52d8fda [project @ 2000-02-05 07:14:21 by jwe] jwe parents: 3504 diff changeset	100 }
2923f52d8fda [project @ 2000-02-05 07:14:21 by jwe] jwe parents: 3504 diff changeset	101
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	102 template <typename T>
3580 2923f52d8fda [project @ 2000-02-05 07:14:21 by jwe] jwe parents: 3504 diff changeset	103 MDiagArray2<T>
1988 7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	104 operator - (const MDiagArray2<T>& a)
7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	105 {
17769 49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	106 return MDiagArray2<T> (do_mx_unary_op<T, T> (a, mx_inline_uminus),
49a5a4be04a1 maint: Use GNU style coding conventions for code in liboctave/ Rik <rik@octave.org> parents: 17744 diff changeset	107 a.d1, a.d2);
1988 7b56630a1e05 [project @ 1996-03-02 00:33:22 by jwe] jwe parents: diff changeset	108 }

Mercurial > octave

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