Mercurial > octave-nkf
annotate libinterp/operators/op-sbm-b.cc @ 20587:f90c8372b7ba
eliminate many more simple uses of error_state
* Cell.cc, __ichol__.cc, __ilu__.cc, balance.cc, bsxfun.cc, colloc.cc,
det.cc, dlmread.cc, dynamic-ld.cc, eig.cc, fft.cc, fft2.cc, fftn.cc,
gcd.cc, getgrent.cc, getpwent.cc, givens.cc, hess.cc, input.cc,
levenshtein.cc, load-path.cc, lookup.cc, ls-mat-ascii.cc, ls-mat4.cc,
lsode.cc, lu.cc, max.cc, md5sum.cc, mex.cc, pager.cc, pinv.cc,
pr-output.cc, qz.cc, schur.cc, sparse.cc, sqrtm.cc, str2double.cc,
strfns.cc, sub2ind.cc, sysdep.cc, time.cc, toplev.cc, tril.cc,
tsearch.cc, typecast.cc, __init_gnuplot__.cc, __magick_read__.cc,
__osmesa_print__.cc, amd.cc, audiodevinfo.cc, dmperm.cc, fftw.cc,
symrcm.cc, ov-base-diag.cc, ov-base-sparse.cc, ov-base.cc,
ov-bool-sparse.cc, ov-builtin.cc, ov-complex.cc, ov-cx-diag.cc,
ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-fcn-inline.cc,
ov-float.cc, ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc,
ov-flt-re-diag.cc, ov-flt-re-mat.cc, ov-lazy-idx.cc, ov-mex-fcn.cc,
ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-sparse.cc,
ov-scalar.cc, ov-str-mat.cc, op-bm-b.cc, op-bm-bm.cc, op-sbm-b.cc,
op-sbm-bm.cc, op-str-m.cc, op-str-s.cc, oct-parse.in.yy, pt-cbinop.cc,
pt-colon.cc, pt-decl.cc, pt-exp.cc, pt-id.cc, pt-misc.cc,
pt-select.cc, pt-unop.cc: Eliminate simple uses of error_state.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 05 Oct 2015 19:29:36 -0400 |
parents | 4197fc428c7d |
children |
rev | line source |
---|---|
5164 | 1 /* |
2 | |
19731
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
3 Copyright (C) 2004-2015 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 | |
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.h" | |
12757
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
33 #include "ov-int8.h" |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
34 #include "ov-int16.h" |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
35 #include "ov-int32.h" |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
36 #include "ov-int64.h" |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
37 #include "ov-uint8.h" |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
38 #include "ov-uint16.h" |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
39 #include "ov-uint32.h" |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
40 #include "ov-uint64.h" |
5164 | 41 #include "ov-scalar.h" |
42 #include "ops.h" | |
43 | |
44 #include "ov-re-sparse.h" | |
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
45 #include "ov-bool-sparse.h" |
5164 | 46 |
47 // sparse bool matrix by bool ops. | |
48 | |
49 DEFBINOP_FN (ne, sparse_bool_matrix, bool, mx_el_ne) | |
50 DEFBINOP_FN (eq, sparse_bool_matrix, bool, mx_el_eq) | |
51 | |
52 DEFBINOP_FN (el_and, sparse_bool_matrix, bool, mx_el_and) | |
53 DEFBINOP_FN (el_or, sparse_bool_matrix, bool, mx_el_or) | |
54 | |
55 DEFCATOP (sbm_b, sparse_bool_matrix, bool) | |
56 { | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
57 CAST_BINOP_ARGS (octave_sparse_bool_matrix&, const octave_bool&); |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
58 |
5164 | 59 SparseBoolMatrix tmp (1, 1, v2.bool_value ()); |
60 return octave_value (v1.sparse_bool_matrix_value (). concat (tmp, ra_idx)); | |
61 } | |
62 | |
63 DEFCATOP (sm_b, sparse_matrix, bool) | |
64 { | |
65 CAST_BINOP_ARGS (octave_sparse_matrix&, const octave_bool&); | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
66 |
5164 | 67 SparseMatrix tmp (1, 1, v2.scalar_value ()); |
68 return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx)); | |
69 } | |
70 | |
71 DEFCATOP (sbm_s, sparse_bool_matrix, scalar) | |
72 { | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
73 CAST_BINOP_ARGS (octave_sparse_bool_matrix&, const octave_scalar&); |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
74 |
5164 | 75 SparseMatrix tmp (1, 1, v2.scalar_value ()); |
76 return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx)); | |
77 } | |
78 | |
79 DEFASSIGNOP (assign, sparse_bool_matrix, bool) | |
80 { | |
81 CAST_BINOP_ARGS (octave_sparse_bool_matrix&, const octave_bool&); | |
82 | |
83 SparseBoolMatrix tmp (1, 1, v2.bool_value ()); | |
84 v1.assign (idx, tmp); | |
85 return octave_value (); | |
86 } | |
87 | |
12757
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
88 static octave_value |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
89 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
|
90 const octave_value_list& idx, |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
91 const octave_base_value& a2) |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
92 { |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
93 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
|
94 |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
95 // FIXME: perhaps add a warning for this conversion if the values |
12757
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
96 // 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
|
97 |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
98 SparseBoolMatrix v2 (1, 1, a2.bool_value ()); |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
99 |
20587
f90c8372b7ba
eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
19731
diff
changeset
|
100 v1.assign (idx, v2); |
12757
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
101 |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
102 return octave_value (); |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
103 } |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
104 |
5164 | 105 void |
106 install_sbm_b_ops (void) | |
107 { | |
108 INSTALL_BINOP (op_eq, octave_sparse_bool_matrix, octave_bool, eq); | |
109 INSTALL_BINOP (op_ne, octave_sparse_bool_matrix, octave_bool, ne); | |
110 | |
111 INSTALL_BINOP (op_el_and, octave_sparse_bool_matrix, octave_bool, el_and); | |
112 INSTALL_BINOP (op_el_or, octave_sparse_bool_matrix, octave_bool, el_or); | |
113 | |
114 INSTALL_CATOP (octave_sparse_bool_matrix, octave_bool, sbm_b); | |
115 INSTALL_CATOP (octave_sparse_bool_matrix, octave_scalar, sbm_s); | |
116 INSTALL_CATOP (octave_sparse_matrix, octave_bool, sm_b); | |
117 | |
118 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix, octave_bool, assign); | |
12757
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
119 |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
120 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix, octave_scalar, |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
121 conv_and_assign); |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
122 |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
123 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix, octave_int8_scalar, |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
124 conv_and_assign); |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
125 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix, octave_int16_scalar, |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
126 conv_and_assign); |
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_int32_scalar, |
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, octave_int64_scalar, |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
130 conv_and_assign); |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
131 |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
132 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix, octave_uint8_scalar, |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
133 conv_and_assign); |
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_uint16_scalar, |
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 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix, octave_uint32_scalar, |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
137 conv_and_assign); |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
138 INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix, octave_uint64_scalar, |
824c60c8f7b9
preserve type when assigning values to sparse logical
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
139 conv_and_assign); |
5164 | 140 } |