Mercurial > octave-nkf
annotate src/OPERATORS/op-sbm-bm.cc @ 12757:824c60c8f7b9 stable
preserve type when assigning values to sparse logical
* op-sbm-b.cc (oct_assignop_conv_and_assign): New assignment
operator function.
(install_sbm_b_ops): Install it for various RHS types.
* op-sbm-bm.cc (oct_assignop_conv_and_assign): New assignment
operator function.
(install_sbm_bm_ops): Install it for various RHS types.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 20 Jun 2011 11:03:21 -0400 |
parents | 12df7854fa7c |
children | ecd1364a2700 |
rev | line source |
---|---|
5164 | 1 /* |
2 | |
11523 | 3 Copyright (C) 2004-2011 David Bateman |
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 | |
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. | |
5164 | 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/>. | |
5164 | 21 |
22 */ | |
23 | |
24 #ifdef HAVE_CONFIG_H | |
25 #include <config.h> | |
26 #endif | |
27 | |
28 #include "gripes.h" | |
29 #include "oct-obj.h" | |
30 #include "ov.h" | |
31 #include "ov-typeinfo.h" | |
32 #include "ov-bool-mat.h" | |
33 #include "boolMatrix.h" | |
12757
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
34 #include "ov-int8.h" |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
35 #include "ov-int16.h" |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
36 #include "ov-int32.h" |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
37 #include "ov-int64.h" |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
38 #include "ov-uint8.h" |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
39 #include "ov-uint16.h" |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
40 #include "ov-uint32.h" |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
41 #include "ov-uint64.h" |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
42 #include "ov-range.h" |
5164 | 43 #include "ov-scalar.h" |
12757
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
44 #include "ov-str-mat.h" |
5164 | 45 #include "ops.h" |
46 #include "ov-re-sparse.h" | |
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
47 #include "ov-bool-sparse.h" |
5164 | 48 #include "smx-bm-sbm.h" |
49 #include "smx-sbm-bm.h" | |
50 | |
51 // sparse bool matrix by bool matrix ops. | |
52 | |
53 DEFBINOP_FN (eq, sparse_bool_matrix, bool_matrix, mx_el_eq) | |
54 DEFBINOP_FN (ne, sparse_bool_matrix, bool_matrix, mx_el_ne) | |
55 | |
56 DEFBINOP_FN (el_and, sparse_bool_matrix, bool_matrix, mx_el_and) | |
57 DEFBINOP_FN (el_or, sparse_bool_matrix, bool_matrix, mx_el_or) | |
58 | |
59 DEFCATOP (sbm_bm, sparse_bool_matrix, bool_matrix) | |
60 { | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
61 CAST_BINOP_ARGS (octave_sparse_bool_matrix&, const octave_bool_matrix&); |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
62 |
5164 | 63 SparseBoolMatrix tmp (v2.bool_matrix_value ()); |
64 return octave_value (v1.sparse_bool_matrix_value (). concat (tmp, ra_idx)); | |
65 } | |
66 | |
67 DEFCATOP (sbm_m, sparse_bool_matrix, matrix) | |
68 { | |
69 CAST_BINOP_ARGS (octave_sparse_bool_matrix&, const octave_matrix&); | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
70 |
5164 | 71 SparseMatrix tmp (v2.matrix_value ()); |
72 return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx)); | |
73 } | |
74 | |
75 DEFCATOP (sm_bm, sparse_matrix, bool_matrix) | |
76 { | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
77 CAST_BINOP_ARGS (octave_sparse_matrix&, const octave_bool_matrix&); |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
78 |
5164 | 79 SparseMatrix tmp (v2.matrix_value ()); |
80 return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx)); | |
81 } | |
82 | |
83 DEFASSIGNOP (assign, sparse_bool_matrix, bool_matrix) | |
84 { | |
85 CAST_BINOP_ARGS (octave_sparse_bool_matrix&, const octave_bool_matrix&); | |
86 | |
87 v1.assign (idx, SparseBoolMatrix (v2.bool_matrix_value ())); | |
88 return octave_value (); | |
89 } | |
90 | |
12757
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
91 static octave_value |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
92 oct_assignop_conv_and_assign (octave_base_value& a1, |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
93 const octave_value_list& idx, |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
94 const octave_base_value& a2) |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
95 { |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
96 octave_sparse_bool_matrix& v1 = dynamic_cast<octave_sparse_bool_matrix&> (a1); |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
97 |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
98 // FIXME -- perhaps add a warning for this conversion if the values |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
99 // are not all 0 or 1? |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
100 |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
101 SparseBoolMatrix v2 (a2.bool_array_value ()); |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
102 |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
103 if (! error_state) |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
104 v1.assign (idx, v2); |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
105 |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
106 return octave_value (); |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
107 } |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
108 |
5164 | 109 void |
110 install_sbm_bm_ops (void) | |
111 { | |
112 INSTALL_BINOP (op_eq, octave_sparse_bool_matrix, octave_bool_matrix, eq); | |
113 INSTALL_BINOP (op_ne, octave_sparse_bool_matrix, octave_bool_matrix, ne); | |
114 | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
115 INSTALL_BINOP (op_el_and, octave_sparse_bool_matrix, octave_bool_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
116 el_and); |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
117 INSTALL_BINOP (op_el_or, octave_sparse_bool_matrix, octave_bool_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
118 el_or); |
5164 | 119 |
120 INSTALL_CATOP (octave_sparse_bool_matrix, octave_bool_matrix, sbm_bm); | |
121 INSTALL_CATOP (octave_sparse_matrix, octave_bool_matrix, sm_bm); | |
122 INSTALL_CATOP (octave_sparse_bool_matrix, octave_matrix, sbm_m); | |
123 | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
124 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix, |
9931
fb6b6fcafa62
untabify files in src/OPERATORS directory
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
125 octave_bool_matrix, assign); |
12757
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
126 |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
127 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix, octave_matrix, |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
128 conv_and_assign); |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
129 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix, |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
130 octave_char_matrix_str, conv_and_assign); |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
131 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix, |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
132 octave_char_matrix_sq_str, conv_and_assign); |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
133 |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
134 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix, octave_range, |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
135 conv_and_assign); |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
136 |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
137 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix, octave_sparse_matrix, |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
138 conv_and_assign); |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
139 |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
140 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix, octave_int8_matrix, |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
141 conv_and_assign); |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
142 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix, octave_int16_matrix, |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
143 conv_and_assign); |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
144 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix, octave_int32_matrix, |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
145 conv_and_assign); |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
146 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix, octave_int64_matrix, |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
147 conv_and_assign); |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
148 |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
149 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix, octave_uint8_matrix, |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
150 conv_and_assign); |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
151 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix, octave_uint16_matrix, |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
152 conv_and_assign); |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
153 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix, octave_uint32_matrix, |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
154 conv_and_assign); |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
155 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix, octave_uint64_matrix, |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
156 conv_and_assign); |
5164 | 157 } |