Mercurial > octave
annotate liboctave/array/MDiagArray2.cc @ 20960:2a99b8b250cd
MArray macro removal without loss of functionality to improve maintainability.
* boolNDArray.cc: removed unnecessary header inclusion.
* CNDArray.cc: removed unnecessary header inclusion.
* fCNDArray.cc: removed unnecessary header inclusion.
* MArray.cc: removed unnecessary header inclusion.
* MDiagArray2.cc: removed unnecessary header inclusion.
* MArray.h: partially expanded macros and left three meaningful one alive.
* MDiagArray2.h: partially expanded macros and left a meaningful one alive.
* MArray-decl.h: removed preprocessor abuse.
* MArray-defs.h: removed preprocessor abuse.
* module.mk: removed MArray-{decl/defs}.h from build system.
author | Kai T. Ohlhus <k.ohlhus@gmail.com> |
---|---|
date | Tue, 22 Dec 2015 01:34:05 +0100 |
parents | 4197fc428c7d |
children | e39e05d90788 |
rev | line source |
---|---|
1988 | 1 /* |
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 | 5 |
6 This file is part of Octave. | |
7 | |
8 Octave is free software; you can redistribute it and/or modify it | |
9 under the terms of the GNU General Public License as published by the | |
7016 | 10 Free Software Foundation; either version 3 of the License, or (at your |
11 option) any later version. | |
1988 | 12 |
13 Octave is distributed in the hope that it will be useful, but WITHOUT | |
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
16 for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
7016 | 19 along with Octave; see the file COPYING. If not, see |
20 <http://www.gnu.org/licenses/>. | |
1988 | 21 |
22 */ | |
23 | |
24 #ifdef HAVE_CONFIG_H | |
25 #include <config.h> | |
26 #endif | |
27 | |
28 #include "MDiagArray2.h" | |
4669 | 29 #include "Array-util.h" |
1988 | 30 #include "lo-error.h" |
31 | |
8367
445d27d79f4e
support permutation matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
32 template <class 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 | 49 // Two dimensional diagonal array with math ops. |
50 | |
51 // Element by element MDiagArray2 by MDiagArray2 ops. | |
52 | |
53 // Element by element MDiagArray2 by scalar ops. | |
54 | |
9612
66970dd627f6
further liboctave design improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
55 #define MARRAY_DAS_OP(OP, FN) \ |
1988 | 56 template <class T> \ |
57 MDiagArray2<T> \ | |
58 operator OP (const MDiagArray2<T>& a, const T& s) \ | |
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 | 61 } |
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 | 65 |
66 // Element by element scalar by MDiagArray2 ops. | |
67 | |
68 template <class T> | |
69 MDiagArray2<T> | |
70 operator * (const T& s, const MDiagArray2<T>& a) | |
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 | 74 } |
75 | |
76 // Element by element MDiagArray2 by MDiagArray2 ops. | |
77 | |
9612
66970dd627f6
further liboctave design improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
78 #define MARRAY_DADA_OP(FCN, OP, FN) \ |
1988 | 79 template <class T> \ |
80 MDiagArray2<T> \ | |
81 FCN (const MDiagArray2<T>& a, const MDiagArray2<T>& b) \ | |
82 { \ | |
10362
b47ab50a6aa8
simplify appliers in mx-inlines.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
10158
diff
changeset
|
83 if (a.d1 != b.d1 || a.d2 != b.d2) \ |
b47ab50a6aa8
simplify appliers in mx-inlines.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
10158
diff
changeset
|
84 gripe_nonconformant (#FCN, a.d1, a.d2, b.d1, b.d2); \ |
13004
d9d65c3017c3
Make bsxfun automatic for most binary operators.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
85 return MDiagArray2<T> (do_mm_binary_op<T, T, T> (a, b, FN, FN, FN, #FCN), a.d1, a.d2); \ |
1988 | 86 } |
87 | |
9612
66970dd627f6
further liboctave design improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
88 MARRAY_DADA_OP (operator +, +, mx_inline_add) |
66970dd627f6
further liboctave design improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
89 MARRAY_DADA_OP (operator -, -, mx_inline_sub) |
66970dd627f6
further liboctave design improvements
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
90 MARRAY_DADA_OP (product, *, mx_inline_mul) |
1988 | 91 |
92 // Unary MDiagArray2 ops. | |
93 | |
94 template <class T> | |
95 MDiagArray2<T> | |
3580 | 96 operator + (const MDiagArray2<T>& a) |
97 { | |
98 return a; | |
99 } | |
100 | |
101 template <class T> | |
102 MDiagArray2<T> | |
1988 | 103 operator - (const MDiagArray2<T>& a) |
104 { | |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
105 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
|
106 a.d1, a.d2); |
1988 | 107 } |