Mercurial > octave
annotate libinterp/operators/op-bm-sbm.cc @ 23220:092078913d54
maint: Merge stable to default.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 22 Feb 2017 12:58:07 -0500 |
parents | ef4d915df748 3ac9f9ecfae5 |
children | 194eb4bd202b |
rev | line source |
---|---|
5164 | 1 /* |
2 | |
23219
3ac9f9ecfae5
maint: Update copyright dates.
John W. Eaton <jwe@octave.org>
parents:
23083
diff
changeset
|
3 Copyright (C) 2004-2017 David Bateman |
11523 | 4 Copyright (C) 1998-2004 Andy Adler |
7016 | 5 |
6 This file is part of Octave. | |
5164 | 7 |
8 Octave is free software; you can redistribute it and/or modify it | |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
9 under the terms of the GNU General Public License as published by |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
10 the Free Software Foundation; either version 3 of the License, or |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
11 (at your option) any later version. |
5164 | 12 |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
13 Octave is distributed in the hope that it will be useful, but |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
14 WITHOUT ANY WARRANTY; without even the implied warranty of |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22407
diff
changeset
|
16 GNU General Public License for more details. |
5164 | 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/>. | |
5164 | 21 |
22 */ | |
23 | |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21647
diff
changeset
|
24 #if defined (HAVE_CONFIG_H) |
21301
40de9f8f23a6
Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents:
21200
diff
changeset
|
25 # include "config.h" |
5164 | 26 #endif |
27 | |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
20940
diff
changeset
|
28 #include "errwarn.h" |
20940
48b2ad5ee801
maint: Rename oct-obj.[cc|h] to ovl.[cc|h] for clarity.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
29 #include "ovl.h" |
5164 | 30 #include "ov.h" |
31 #include "ov-typeinfo.h" | |
32 #include "ov-bool-mat.h" | |
33 #include "boolMatrix.h" | |
34 #include "ov-scalar.h" | |
35 #include "ops.h" | |
36 | |
37 #include "ov-re-sparse.h" | |
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7289
diff
changeset
|
38 #include "ov-bool-sparse.h" |
5164 | 39 #include "smx-bm-sbm.h" |
40 #include "smx-sbm-bm.h" | |
41 | |
42 // bool matrix by sparse bool matrix ops. | |
43 | |
44 DEFBINOP_FN (eq, bool_matrix, sparse_bool_matrix, mx_el_eq) | |
45 DEFBINOP_FN (ne, bool_matrix, sparse_bool_matrix, mx_el_ne) | |
46 | |
47 DEFBINOP_FN (el_and, bool_matrix, sparse_bool_matrix, mx_el_and) | |
48 DEFBINOP_FN (el_or, bool_matrix, sparse_bool_matrix, mx_el_or) | |
49 | |
50 DEFCATOP (bm_sbm, bool_matrix, sparse_bool_matrix) | |
51 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
52 octave_bool_matrix& v1 = dynamic_cast<octave_bool_matrix&> (a1); |
22407
34ce5be04942
maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents:
22323
diff
changeset
|
53 const octave_sparse_bool_matrix& v2 = |
34ce5be04942
maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents:
22323
diff
changeset
|
54 dynamic_cast<const octave_sparse_bool_matrix&> (a2); |
5164 | 55 SparseBoolMatrix tmp (v1.bool_matrix_value ()); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
56 return octave_value (tmp. concat (v2.sparse_bool_matrix_value (), |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
57 ra_idx)); |
5164 | 58 } |
59 | |
60 DEFCATOP (m_sbm, matrix, sparse_bool_matrix) | |
61 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
62 octave_matrix& v1 = dynamic_cast<octave_matrix&> (a1); |
22407
34ce5be04942
maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents:
22323
diff
changeset
|
63 const octave_sparse_bool_matrix& v2 = |
34ce5be04942
maint: Style check C++ code in libinterp/.
Rik <rik@octave.org>
parents:
22323
diff
changeset
|
64 dynamic_cast<const octave_sparse_bool_matrix&> (a2); |
5164 | 65 SparseMatrix tmp (v1.matrix_value ()); |
66 return octave_value (tmp. concat (v2.sparse_matrix_value (), ra_idx)); | |
67 } | |
68 | |
69 DEFCATOP (bm_sm, bool_matrix, sparse_matrix) | |
70 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
71 octave_bool_matrix& v1 = dynamic_cast<octave_bool_matrix&> (a1); |
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
72 const octave_sparse_matrix& v2 = dynamic_cast<const octave_sparse_matrix&> (a2); |
5164 | 73 SparseMatrix tmp (v1.matrix_value ()); |
74 return octave_value (tmp. concat (v2.sparse_matrix_value (), ra_idx)); | |
75 } | |
76 | |
77 DEFCONV (sparse_bool_matrix_conv, bool_matrix, sparse_bool_matrix) | |
78 { | |
21647
66cae7a6dc47
eliminate some macros for operator definitions
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
79 const octave_bool_matrix& v = dynamic_cast<const octave_bool_matrix&> (a); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
80 return new octave_sparse_bool_matrix |
5164 | 81 (SparseBoolMatrix (v.bool_matrix_value ())); |
82 } | |
83 | |
7289 | 84 DEFNDASSIGNOP_FN (assign, bool_matrix, sparse_bool_matrix, bool_array, assign) |
85 | |
5164 | 86 void |
87 install_bm_sbm_ops (void) | |
88 { | |
89 INSTALL_BINOP (op_eq, octave_bool_matrix, octave_sparse_bool_matrix, eq); | |
90 INSTALL_BINOP (op_ne, octave_bool_matrix, octave_sparse_bool_matrix, ne); | |
91 | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
92 INSTALL_BINOP (op_el_and, octave_bool_matrix, octave_sparse_bool_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
93 el_and); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
94 INSTALL_BINOP (op_el_or, octave_bool_matrix, octave_sparse_bool_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
95 el_or); |
5164 | 96 |
97 INSTALL_CATOP (octave_bool_matrix, octave_sparse_bool_matrix, bm_sbm); | |
98 INSTALL_CATOP (octave_bool_matrix, octave_sparse_matrix, bm_sm); | |
99 INSTALL_CATOP (octave_matrix, octave_sparse_bool_matrix, m_sbm); | |
100 | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
101 INSTALL_ASSIGNOP (op_asn_eq, octave_bool_matrix, octave_sparse_bool_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
102 assign) |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
103 INSTALL_ASSIGNCONV (octave_bool_matrix, octave_sparse_bool_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
104 octave_bool_matrix); |
5164 | 105 |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
106 INSTALL_WIDENOP (octave_bool_matrix, octave_sparse_bool_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
107 sparse_bool_matrix_conv); |
5164 | 108 } |