Mercurial > octave-nkf
annotate libinterp/octave-value/ov-bool-mat.h @ 19632:76478d2da117
unconditionally disable the octave_allocator class
* configure.ac: Delete the --enable-octave-allocator option.
* oct-alloc.h: Delete octave_allocator class. Warn if file is
included. Unconditionally define macros to be empty.
* NEWS: Make note of these changes.
* oct-alloc.cc: Delete.
* liboctave/util/module.mk (UTIL_SRC): Remove it from the list.
* make_int.cc, Cell.h, oct-obj.cc, oct-obj.h, audiodevinfo.cc,
ov-base-int.h, ov-base-scalar.h, ov-bool-mat.cc, ov-bool-mat.h,
ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc, ov-bool.h,
ov-builtin.cc, ov-builtin.h, ov-cell.cc, ov-cell.h, ov-ch-mat.h,
ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-complex.cc,
ov-complex.h, ov-cs-list.cc, ov-cs-list.h, ov-cx-diag.cc,
ov-cx-diag.h, ov-cx-mat.cc, ov-cx-mat.h, ov-cx-sparse.cc,
ov-cx-sparse.h, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc,
ov-fcn-handle.h, ov-fcn-inline.cc, ov-fcn-inline.h, ov-fcn.cc,
ov-fcn.h, ov-float.cc, ov-float.h, ov-flt-complex.cc,
ov-flt-complex.h, ov-flt-cx-diag.cc, ov-flt-cx-diag.h,
ov-flt-cx-mat.cc, ov-flt-cx-mat.h, ov-flt-re-diag.cc,
ov-flt-re-diag.h, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-int16.cc,
ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-intx.h, ov-java.cc,
ov-java.h, ov-mex-fcn.cc, ov-mex-fcn.h, ov-perm.cc, ov-perm.h,
ov-range.cc, ov-range.h, ov-re-diag.cc, ov-re-diag.h, ov-re-mat.cc,
ov-re-mat.h, ov-re-sparse.cc, ov-re-sparse.h, ov-scalar.cc,
ov-scalar.h, ov-str-mat.cc, ov-str-mat.h, ov-struct.cc, ov-struct.h,
ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc, ov-usr-fcn.cc,
ov-usr-fcn.h, ov.cc, ov.h, pt-const.cc, pt-const.h, idx-vector.cc,
idx-vector.h: Delete uses of oct-alloc.h and OCTAVE_ALLOCATOR macros.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 20 Jan 2015 13:43:29 -0500 |
| parents | 25f535b90e52 |
| children | 4197fc428c7d |
| rev | line source |
|---|---|
| 2871 | 1 /* |
| 2 | |
|
17744
d63878346099
maint: Update copyright notices for release.
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
3 Copyright (C) 1996-2013 John W. Eaton |
| 11523 | 4 Copyright (C) 2009-2010 VZLU Prague |
| 2871 | 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. | |
| 2871 | 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/>. | |
| 2871 | 21 |
| 22 */ | |
| 23 | |
|
17822
ebb3ef964372
maint: Use common #define syntax "octave_filename_h" in h_files.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
24 #if !defined (octave_ov_bool_mat_h) |
|
ebb3ef964372
maint: Use common #define syntax "octave_filename_h" in h_files.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
25 #define octave_ov_bool_mat_h 1 |
| 2871 | 26 |
| 27 #include <cstdlib> | |
| 28 | |
|
8950
d865363208d6
include <iosfwd> instead of <iostream> in header files
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
29 #include <iosfwd> |
| 2871 | 30 #include <string> |
| 31 | |
| 32 #include "mx-base.h" | |
| 33 | |
| 34 #include "error.h" | |
| 4970 | 35 #include "oct-stream.h" |
| 2871 | 36 #include "ov-base.h" |
| 3219 | 37 #include "ov-base-mat.h" |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
38 #include "ov-re-mat.h" |
| 2871 | 39 #include "ov-typeinfo.h" |
| 40 | |
| 5785 | 41 #include "MatrixType.h" |
| 42 | |
| 2871 | 43 class octave_value_list; |
| 44 | |
| 45 class tree_walker; | |
| 46 | |
| 47 // Character matrix values. | |
| 48 | |
| 49 class | |
| 4513 | 50 octave_bool_matrix : public octave_base_matrix<boolNDArray> |
| 2871 | 51 { |
| 52 public: | |
| 53 | |
| 54 octave_bool_matrix (void) | |
| 4513 | 55 : octave_base_matrix<boolNDArray> () { } |
| 56 | |
| 57 octave_bool_matrix (const boolNDArray& bnda) | |
| 58 : octave_base_matrix<boolNDArray> (bnda) { } | |
| 2871 | 59 |
|
10351
5150ceb4dbb4
base charMatrix and boolMatrix on Array<char>
Jaroslav Hajek <highegg@gmail.com>
parents:
10313
diff
changeset
|
60 octave_bool_matrix (const Array<bool>& bnda) |
|
5150ceb4dbb4
base charMatrix and boolMatrix on Array<char>
Jaroslav Hajek <highegg@gmail.com>
parents:
10313
diff
changeset
|
61 : octave_base_matrix<boolNDArray> (bnda) { } |
|
5150ceb4dbb4
base charMatrix and boolMatrix on Array<char>
Jaroslav Hajek <highegg@gmail.com>
parents:
10313
diff
changeset
|
62 |
| 2871 | 63 octave_bool_matrix (const boolMatrix& bm) |
| 4513 | 64 : octave_base_matrix<boolNDArray> (bm) { } |
| 2871 | 65 |
| 5785 | 66 octave_bool_matrix (const boolMatrix& bm, const MatrixType& t) |
| 67 : octave_base_matrix<boolNDArray> (bm, t) { } | |
| 68 | |
|
9894
83bd7f34f9da
improve idx_vector->octave_value conversion
Jaroslav Hajek <highegg@gmail.com>
parents:
9881
diff
changeset
|
69 octave_bool_matrix (const boolNDArray& bm, const idx_vector& cache) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
70 : octave_base_matrix<boolNDArray> (bm) |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
71 { |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
72 set_idx_cache (cache); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
73 } |
|
9894
83bd7f34f9da
improve idx_vector->octave_value conversion
Jaroslav Hajek <highegg@gmail.com>
parents:
9881
diff
changeset
|
74 |
| 2871 | 75 octave_bool_matrix (const octave_bool_matrix& bm) |
| 4513 | 76 : octave_base_matrix<boolNDArray> (bm) { } |
| 2871 | 77 |
| 78 ~octave_bool_matrix (void) { } | |
| 79 | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
80 octave_base_value *clone (void) const |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
81 { return new octave_bool_matrix (*this); } |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
82 |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
83 octave_base_value *empty_clone (void) const |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
84 { return new octave_bool_matrix (); } |
| 2871 | 85 |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
86 type_conv_info numeric_conversion_function (void) const; |
| 2871 | 87 |
| 5759 | 88 octave_base_value *try_narrowing_conversion (void); |
| 2871 | 89 |
|
18129
e473c4853afc
enable non-integer ranges as indices by default and deprecate preference
John W. Eaton <jwe@octave.org>
parents:
17822
diff
changeset
|
90 idx_vector index_vector (bool /* require_integers */ = false) const |
|
e473c4853afc
enable non-integer ranges as indices by default and deprecate preference
John W. Eaton <jwe@octave.org>
parents:
17822
diff
changeset
|
91 { |
|
e473c4853afc
enable non-integer ranges as indices by default and deprecate preference
John W. Eaton <jwe@octave.org>
parents:
17822
diff
changeset
|
92 return idx_cache ? *idx_cache : set_idx_cache (idx_vector (matrix)); |
|
e473c4853afc
enable non-integer ranges as indices by default and deprecate preference
John W. Eaton <jwe@octave.org>
parents:
17822
diff
changeset
|
93 } |
| 2871 | 94 |
| 9685 | 95 builtin_type_t builtin_type (void) const { return btyp_bool; } |
| 96 | |
| 2871 | 97 bool is_bool_matrix (void) const { return true; } |
| 98 | |
| 3209 | 99 bool is_bool_type (void) const { return true; } |
| 100 | |
| 2871 | 101 bool is_real_type (void) const { return true; } |
| 102 | |
|
9841
6f1ea8241c99
make isnumeric yield false on logicals
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
103 bool is_numeric_type (void) const { return false; } |
|
6f1ea8241c99
make isnumeric yield false on logicals
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
104 |
| 5533 | 105 int8NDArray |
| 106 int8_array_value (void) const { return int8NDArray (matrix); } | |
| 107 | |
| 108 int16NDArray | |
| 109 int16_array_value (void) const { return int16NDArray (matrix); } | |
| 110 | |
| 111 int32NDArray | |
| 112 int32_array_value (void) const { return int32NDArray (matrix); } | |
| 113 | |
| 114 int64NDArray | |
| 115 int64_array_value (void) const { return int64NDArray (matrix); } | |
| 116 | |
| 117 uint8NDArray | |
| 118 uint8_array_value (void) const { return uint8NDArray (matrix); } | |
| 119 | |
| 120 uint16NDArray | |
| 121 uint16_array_value (void) const { return uint16NDArray (matrix); } | |
| 122 | |
| 123 uint32NDArray | |
| 124 uint32_array_value (void) const { return uint32NDArray (matrix); } | |
| 125 | |
| 126 uint64NDArray | |
| 127 uint64_array_value (void) const { return uint64NDArray (matrix); } | |
| 128 | |
| 2871 | 129 double double_value (bool = false) const; |
| 130 | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
131 float float_value (bool = false) const; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
132 |
| 3145 | 133 double scalar_value (bool frc_str_conv = false) const |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
134 { return double_value (frc_str_conv); } |
| 2916 | 135 |
| 4513 | 136 Matrix matrix_value (bool = false) const |
|
19349
25f535b90e52
Change boolMatrix to subclass boolNDArray rather than be another Array<bool>.
Carnë Draug <carandraug@octave.org>
parents:
18712
diff
changeset
|
137 { return Matrix (boolMatrix (matrix)); } |
| 2871 | 138 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
139 FloatMatrix float_matrix_value (bool = false) const |
|
19349
25f535b90e52
Change boolMatrix to subclass boolNDArray rather than be another Array<bool>.
Carnë Draug <carandraug@octave.org>
parents:
18712
diff
changeset
|
140 { return FloatMatrix (boolMatrix (matrix)); } |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
141 |
| 4569 | 142 NDArray array_value (bool = false) const |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
143 { return NDArray (matrix); } |
| 4569 | 144 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
145 FloatNDArray float_array_value (bool = false) const |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
146 { return FloatNDArray (matrix); } |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
147 |
| 2871 | 148 Complex complex_value (bool = false) const; |
| 149 | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
150 FloatComplex float_complex_value (bool = false) const; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
151 |
| 3145 | 152 ComplexMatrix complex_matrix_value (bool = false) const |
|
19349
25f535b90e52
Change boolMatrix to subclass boolNDArray rather than be another Array<bool>.
Carnë Draug <carandraug@octave.org>
parents:
18712
diff
changeset
|
153 { return ComplexMatrix (boolMatrix (matrix)); } |
| 2871 | 154 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
155 FloatComplexMatrix float_complex_matrix_value (bool = false) const |
|
19349
25f535b90e52
Change boolMatrix to subclass boolNDArray rather than be another Array<bool>.
Carnë Draug <carandraug@octave.org>
parents:
18712
diff
changeset
|
156 { return FloatComplexMatrix (boolMatrix (matrix)); } |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
157 |
| 4569 | 158 ComplexNDArray complex_array_value (bool = false) const |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
159 { return ComplexNDArray (matrix); } |
| 4569 | 160 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
161 FloatComplexNDArray float_complex_array_value (bool = false) const |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
162 { return FloatComplexNDArray (matrix); } |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
163 |
| 5533 | 164 charNDArray |
| 165 char_array_value (bool = false) const | |
| 166 { | |
| 167 charNDArray retval (dims ()); | |
| 168 | |
| 169 octave_idx_type nel = numel (); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
170 |
| 5533 | 171 for (octave_idx_type i = 0; i < nel; i++) |
| 172 retval(i) = static_cast<char>(matrix(i)); | |
| 173 | |
| 174 return retval; | |
| 175 } | |
| 176 | |
| 5944 | 177 boolMatrix bool_matrix_value (bool = false) const |
|
19349
25f535b90e52
Change boolMatrix to subclass boolNDArray rather than be another Array<bool>.
Carnë Draug <carandraug@octave.org>
parents:
18712
diff
changeset
|
178 { return boolMatrix (matrix); } |
| 2871 | 179 |
| 5944 | 180 boolNDArray bool_array_value (bool = false) const |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
181 { return matrix; } |
| 4543 | 182 |
| 5164 | 183 SparseMatrix sparse_matrix_value (bool = false) const |
|
19349
25f535b90e52
Change boolMatrix to subclass boolNDArray rather than be another Array<bool>.
Carnë Draug <carandraug@octave.org>
parents:
18712
diff
changeset
|
184 { return SparseMatrix (Matrix (boolMatrix (matrix))); } |
| 5164 | 185 |
| 186 SparseComplexMatrix sparse_complex_matrix_value (bool = false) const | |
|
19349
25f535b90e52
Change boolMatrix to subclass boolNDArray rather than be another Array<bool>.
Carnë Draug <carandraug@octave.org>
parents:
18712
diff
changeset
|
187 { return SparseComplexMatrix (ComplexMatrix (boolMatrix (matrix))); } |
| 5164 | 188 |
| 189 SparseBoolMatrix sparse_bool_matrix_value (bool = false) const | |
|
19349
25f535b90e52
Change boolMatrix to subclass boolNDArray rather than be another Array<bool>.
Carnë Draug <carandraug@octave.org>
parents:
18712
diff
changeset
|
190 { return SparseBoolMatrix (boolMatrix (matrix)); } |
| 5164 | 191 |
| 5279 | 192 octave_value convert_to_str_internal (bool pad, bool force, char type) const; |
| 2871 | 193 |
|
9607
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9358
diff
changeset
|
194 // Use matrix_ref here to clear index cache. |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9358
diff
changeset
|
195 void invert (void) { matrix_ref ().invert (); } |
|
1be3c73ed7b5
reuse temporary arrays in nested expressions
Jaroslav Hajek <highegg@gmail.com>
parents:
9358
diff
changeset
|
196 |
| 4643 | 197 void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; |
| 198 | |
| 6974 | 199 bool save_ascii (std::ostream& os); |
| 4687 | 200 |
| 201 bool load_ascii (std::istream& is); | |
| 202 | |
| 203 bool save_binary (std::ostream& os, bool& save_as_floats); | |
| 204 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
205 bool load_binary (std::istream& is, bool swap, |
| 10313 | 206 oct_mach_info::float_format fmt); |
| 4687 | 207 |
| 208 #if defined (HAVE_HDF5) | |
| 209 bool save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats); | |
| 210 | |
|
9881
b3089dba88bf
Remove HDF5 cruft for older versions of HDF5
Kacper Kowalik
parents:
9841
diff
changeset
|
211 bool load_hdf5 (hid_t loc_id, const char *name); |
| 4687 | 212 #endif |
| 213 | |
| 4970 | 214 int write (octave_stream& os, int block_size, |
| 10313 | 215 oct_data_conv::data_type output_type, int skip, |
| 216 oct_mach_info::float_format flt_fmt) const | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
217 { return os.write (matrix, block_size, output_type, skip, flt_fmt); } |
| 4970 | 218 |
|
9358
d4b1314a7c31
mex.cc (mxArray_octave_value::get_data): avoid enumerating types that can be handled as foreign
John W. Eaton <jwe@octave.org>
parents:
9350
diff
changeset
|
219 // Unsafe. This function exists to support the MEX interface. |
|
d4b1314a7c31
mex.cc (mxArray_octave_value::get_data): avoid enumerating types that can be handled as foreign
John W. Eaton <jwe@octave.org>
parents:
9350
diff
changeset
|
220 // You should not use it anywhere else. |
|
d4b1314a7c31
mex.cc (mxArray_octave_value::get_data): avoid enumerating types that can be handled as foreign
John W. Eaton <jwe@octave.org>
parents:
9350
diff
changeset
|
221 void *mex_get_data (void) const { return matrix.mex_get_data (); } |
|
d4b1314a7c31
mex.cc (mxArray_octave_value::get_data): avoid enumerating types that can be handled as foreign
John W. Eaton <jwe@octave.org>
parents:
9350
diff
changeset
|
222 |
| 5900 | 223 mxArray *as_mxArray (void) const; |
| 224 | |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
225 // Mapper functions are converted to double for treatment |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9685
diff
changeset
|
226 octave_value map (unary_mapper_t umap) const |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
227 { |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
228 octave_matrix m (array_value ()); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
229 return m.map (umap); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
230 } |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
231 |
| 2871 | 232 protected: |
| 233 | |
| 234 | |
| 3219 | 235 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA |
| 2871 | 236 }; |
| 237 | |
| 238 #endif |