Mercurial > hg > octave-nkf
annotate src/ov-re-mat.cc @ 9892:ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
author | Kacper Kowalik <xarthisius.kk@gmail.com> |
---|---|
date | Tue, 01 Dec 2009 00:49:07 +0100 |
parents | b3089dba88bf |
children | 829e69ec3110 |
rev | line source |
---|---|
2376 | 1 /* |
2 | |
7017 | 3 Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, |
8920 | 4 2006, 2007, 2008, 2009 John W. Eaton |
2376 | 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. | |
2376 | 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/>. | |
2376 | 21 |
22 */ | |
23 | |
24 #ifdef HAVE_CONFIG_H | |
25 #include <config.h> | |
26 #endif | |
27 | |
4100 | 28 #include <climits> |
29 | |
3503 | 30 #include <iostream> |
4726 | 31 #include <vector> |
2901 | 32 |
4944 | 33 #include "data-conv.h" |
2376 | 34 #include "lo-ieee.h" |
35 #include "lo-utils.h" | |
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
36 #include "lo-specfun.h" |
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
37 #include "lo-mappers.h" |
4944 | 38 #include "mach-info.h" |
2376 | 39 #include "mx-base.h" |
4153 | 40 #include "quit.h" |
8377
25bc2d31e1bf
improve OCTAVE_LOCAL_BUFFER
Jaroslav Hajek <highegg@gmail.com>
parents:
8366
diff
changeset
|
41 #include "oct-locbuf.h" |
2376 | 42 |
4901 | 43 #include "defun.h" |
2376 | 44 #include "gripes.h" |
45 #include "oct-obj.h" | |
2979 | 46 #include "oct-lvalue.h" |
4944 | 47 #include "oct-stream.h" |
2410 | 48 #include "ops.h" |
3219 | 49 #include "ov-base.h" |
50 #include "ov-base-mat.h" | |
51 #include "ov-base-mat.cc" | |
2410 | 52 #include "ov-scalar.h" |
2376 | 53 #include "ov-re-mat.h" |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
54 #include "ov-flt-re-mat.h" |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
55 #include "ov-complex.h" |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
56 #include "ov-cx-mat.h" |
7004 | 57 #include "ov-re-sparse.h" |
8399
c1bada868690
alow single/double conversion of diag & perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
58 #include "ov-re-diag.h" |
c1bada868690
alow single/double conversion of diag & perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
59 #include "ov-cx-diag.h" |
c1bada868690
alow single/double conversion of diag & perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
60 #include "ov-perm.h" |
4901 | 61 #include "ov-type-conv.h" |
2376 | 62 #include "pr-output.h" |
2948 | 63 #include "variables.h" |
2376 | 64 |
4687 | 65 #include "byte-swap.h" |
66 #include "ls-oct-ascii.h" | |
67 #include "ls-utils.h" | |
4805 | 68 #include "ls-hdf5.h" |
4687 | 69 |
4100 | 70 #if ! defined (UCHAR_MAX) |
71 #define UCHAR_MAX 255 | |
72 #endif | |
73 | |
4513 | 74 template class octave_base_matrix<NDArray>; |
2376 | 75 |
3219 | 76 DEFINE_OCTAVE_ALLOCATOR (octave_matrix); |
2477 | 77 |
4612 | 78 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_matrix, "matrix", "double"); |
2376 | 79 |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
80 static octave_base_value * |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
81 default_numeric_demotion_function (const octave_base_value& a) |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
82 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
83 CAST_CONV_ARG (const octave_matrix&); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
84 |
8754
900a5bf52309
Fix invalid conversion error on implicit demotion of n-d arrays
Jaroslav Hajek <highegg@gmail.com>
parents:
8650
diff
changeset
|
85 return new octave_float_matrix (v.float_array_value ()); |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
86 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
87 |
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
7922
diff
changeset
|
88 octave_base_value::type_conv_info |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
89 octave_matrix::numeric_demotion_function (void) const |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
90 { |
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
7922
diff
changeset
|
91 return octave_base_value::type_conv_info(default_numeric_demotion_function, |
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
7922
diff
changeset
|
92 octave_float_matrix::static_type_id ()); |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
93 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
94 |
5759 | 95 octave_base_value * |
2410 | 96 octave_matrix::try_narrowing_conversion (void) |
97 { | |
5759 | 98 octave_base_value *retval = 0; |
2410 | 99 |
4513 | 100 if (matrix.nelem () == 1) |
101 retval = new octave_scalar (matrix (0)); | |
2410 | 102 |
103 return retval; | |
104 } | |
105 | |
2376 | 106 double |
107 octave_matrix::double_value (bool) const | |
108 { | |
4102 | 109 double retval = lo_ieee_nan_value (); |
2376 | 110 |
4645 | 111 if (numel () > 0) |
4455 | 112 { |
5781 | 113 gripe_implicit_conversion ("Octave:array-as-scalar", |
114 "real matrix", "real scalar"); | |
4455 | 115 |
116 retval = matrix (0, 0); | |
117 } | |
2376 | 118 else |
119 gripe_invalid_conversion ("real matrix", "real scalar"); | |
120 | |
121 return retval; | |
122 } | |
123 | |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
124 float |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
125 octave_matrix::float_value (bool) const |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
126 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
127 float retval = lo_ieee_float_nan_value (); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
128 |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
129 if (numel () > 0) |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
130 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
131 gripe_implicit_conversion ("Octave:array-as-scalar", |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
132 "real matrix", "real scalar"); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
133 |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
134 retval = matrix (0, 0); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
135 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
136 else |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
137 gripe_invalid_conversion ("real matrix", "real scalar"); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
138 |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
139 return retval; |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
140 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
141 |
5775 | 142 // FIXME |
4513 | 143 |
144 Matrix | |
145 octave_matrix::matrix_value (bool) const | |
146 { | |
147 return matrix.matrix_value (); | |
148 } | |
149 | |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
150 FloatMatrix |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
151 octave_matrix::float_matrix_value (bool) const |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
152 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
153 return FloatMatrix (matrix.matrix_value ()); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
154 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
155 |
2376 | 156 Complex |
157 octave_matrix::complex_value (bool) const | |
158 { | |
4102 | 159 double tmp = lo_ieee_nan_value (); |
160 | |
161 Complex retval (tmp, tmp); | |
2376 | 162 |
4455 | 163 if (rows () > 0 && columns () > 0) |
164 { | |
5781 | 165 gripe_implicit_conversion ("Octave:array-as-scalar", |
166 "real matrix", "complex scalar"); | |
4455 | 167 |
168 retval = matrix (0, 0); | |
169 } | |
2376 | 170 else |
171 gripe_invalid_conversion ("real matrix", "complex scalar"); | |
172 | |
173 return retval; | |
174 } | |
175 | |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
176 FloatComplex |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
177 octave_matrix::float_complex_value (bool) const |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
178 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
179 float tmp = lo_ieee_float_nan_value (); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
180 |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
181 FloatComplex retval (tmp, tmp); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
182 |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
183 if (rows () > 0 && columns () > 0) |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
184 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
185 gripe_implicit_conversion ("Octave:array-as-scalar", |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
186 "real matrix", "complex scalar"); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
187 |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
188 retval = matrix (0, 0); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
189 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
190 else |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
191 gripe_invalid_conversion ("real matrix", "complex scalar"); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
192 |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
193 return retval; |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
194 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
195 |
5775 | 196 // FIXME |
4513 | 197 |
198 ComplexMatrix | |
199 octave_matrix::complex_matrix_value (bool) const | |
200 { | |
201 return ComplexMatrix (matrix.matrix_value ()); | |
202 } | |
203 | |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
204 FloatComplexMatrix |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
205 octave_matrix::float_complex_matrix_value (bool) const |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
206 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
207 return FloatComplexMatrix (matrix.matrix_value ()); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
208 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
209 |
4699 | 210 ComplexNDArray |
211 octave_matrix::complex_array_value (bool) const | |
212 { | |
213 return ComplexNDArray (matrix); | |
214 } | |
215 | |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
216 FloatComplexNDArray |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
217 octave_matrix::float_complex_array_value (bool) const |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
218 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
219 return FloatComplexNDArray (matrix); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
220 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
221 |
5898 | 222 boolNDArray |
5943 | 223 octave_matrix::bool_array_value (bool warn) const |
5898 | 224 { |
7922
935be827eaf8
error for NaN values in & and | expressions
John W. Eaton <jwe@octave.org>
parents:
7885
diff
changeset
|
225 if (matrix.any_element_is_nan ()) |
935be827eaf8
error for NaN values in & and | expressions
John W. Eaton <jwe@octave.org>
parents:
7885
diff
changeset
|
226 error ("invalid conversion from NaN to logical"); |
935be827eaf8
error for NaN values in & and | expressions
John W. Eaton <jwe@octave.org>
parents:
7885
diff
changeset
|
227 else if (warn && matrix.any_element_not_one_or_zero ()) |
5943 | 228 gripe_logical_conversion (); |
229 | |
5898 | 230 return boolNDArray (matrix); |
231 } | |
232 | |
4758 | 233 charNDArray |
234 octave_matrix::char_array_value (bool) const | |
235 { | |
236 charNDArray retval (dims ()); | |
237 | |
5275 | 238 octave_idx_type nel = numel (); |
4758 | 239 |
5275 | 240 for (octave_idx_type i = 0; i < nel; i++) |
4758 | 241 retval.elem (i) = static_cast<char>(matrix.elem (i)); |
242 | |
243 return retval; | |
244 } | |
245 | |
5164 | 246 SparseMatrix |
247 octave_matrix::sparse_matrix_value (bool) const | |
248 { | |
249 return SparseMatrix (matrix.matrix_value ()); | |
250 } | |
251 | |
252 SparseComplexMatrix | |
253 octave_matrix::sparse_complex_matrix_value (bool) const | |
254 { | |
5775 | 255 // FIXME Need a SparseComplexMatrix (Matrix) constructor to make |
5164 | 256 // this function more efficient. Then this should become |
257 // return SparseComplexMatrix (matrix.matrix_value ()); | |
258 return SparseComplexMatrix (sparse_matrix_value ()); | |
259 } | |
260 | |
2376 | 261 octave_value |
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
262 octave_matrix::diag (octave_idx_type k) const |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
263 { |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
264 octave_value retval; |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
265 if (k == 0 && matrix.ndims () == 2 |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
266 && (matrix.rows () == 1 || matrix.columns () == 1)) |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
267 retval = DiagMatrix (DiagArray2<double> (matrix)); |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
268 else |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
269 retval = octave_base_matrix<NDArray>::diag (k); |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
270 |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
271 return retval; |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
272 } |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
273 |
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
274 octave_value |
5279 | 275 octave_matrix::convert_to_str_internal (bool, bool, char type) const |
2376 | 276 { |
277 octave_value retval; | |
4844 | 278 dim_vector dv = dims (); |
5862 | 279 octave_idx_type nel = dv.numel (); |
280 | |
281 charNDArray chm (dv); | |
2376 | 282 |
5862 | 283 bool warned = false; |
284 | |
285 for (octave_idx_type i = 0; i < nel; i++) | |
2376 | 286 { |
5862 | 287 OCTAVE_QUIT; |
288 | |
289 double d = matrix (i); | |
4844 | 290 |
5862 | 291 if (xisnan (d)) |
292 { | |
293 ::error ("invalid conversion from NaN to character"); | |
294 return retval; | |
295 } | |
296 else | |
4844 | 297 { |
5862 | 298 int ival = NINT (d); |
4844 | 299 |
5862 | 300 if (ival < 0 || ival > UCHAR_MAX) |
301 { | |
302 // FIXME -- is there something | |
303 // better we could do? | |
2376 | 304 |
5862 | 305 ival = 0; |
306 | |
307 if (! warned) | |
308 { | |
309 ::warning ("range error for conversion to character value"); | |
310 warned = true; | |
311 } | |
4844 | 312 } |
2376 | 313 |
5862 | 314 chm (i) = static_cast<char> (ival); |
315 } | |
316 } | |
2376 | 317 |
9689
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9470
diff
changeset
|
318 retval = octave_value (chm, type); |
2376 | 319 |
320 return retval; | |
321 } | |
322 | |
4687 | 323 bool |
6974 | 324 octave_matrix::save_ascii (std::ostream& os) |
4687 | 325 { |
326 dim_vector d = dims (); | |
5958 | 327 |
4687 | 328 if (d.length () > 2) |
329 { | |
330 NDArray tmp = array_value (); | |
331 | |
332 os << "# ndims: " << d.length () << "\n"; | |
333 | |
334 for (int i=0; i < d.length (); i++) | |
335 os << " " << d (i); | |
336 | |
337 os << "\n" << tmp; | |
338 } | |
339 else | |
340 { | |
341 // Keep this case, rather than use generic code above for backward | |
342 // compatiability. Makes load_ascii much more complex!! | |
343 os << "# rows: " << rows () << "\n" | |
344 << "# columns: " << columns () << "\n"; | |
345 | |
5958 | 346 os << matrix_value (); |
4687 | 347 } |
348 | |
349 return true; | |
350 } | |
351 | |
352 bool | |
353 octave_matrix::load_ascii (std::istream& is) | |
354 { | |
355 bool success = true; | |
5099 | 356 |
357 string_vector keywords(2); | |
358 | |
359 keywords[0] = "ndims"; | |
360 keywords[1] = "rows"; | |
4687 | 361 |
5099 | 362 std::string kw; |
5275 | 363 octave_idx_type val = 0; |
5099 | 364 |
365 if (extract_keyword (is, keywords, kw, val, true)) | |
4687 | 366 { |
5099 | 367 if (kw == "ndims") |
4687 | 368 { |
5275 | 369 int mdims = static_cast<int> (val); |
4687 | 370 |
5099 | 371 if (mdims >= 0) |
4687 | 372 { |
5099 | 373 dim_vector dv; |
374 dv.resize (mdims); | |
4687 | 375 |
5099 | 376 for (int i = 0; i < mdims; i++) |
377 is >> dv(i); | |
4687 | 378 |
6717 | 379 if (is) |
380 { | |
381 NDArray tmp(dv); | |
382 | |
8999
dc07bc4157b8
allow empty matrices in stream input operators
Jaroslav Hajek <highegg@gmail.com>
parents:
8998
diff
changeset
|
383 is >> tmp; |
5099 | 384 |
8999
dc07bc4157b8
allow empty matrices in stream input operators
Jaroslav Hajek <highegg@gmail.com>
parents:
8998
diff
changeset
|
385 if (is) |
dc07bc4157b8
allow empty matrices in stream input operators
Jaroslav Hajek <highegg@gmail.com>
parents:
8998
diff
changeset
|
386 matrix = tmp; |
dc07bc4157b8
allow empty matrices in stream input operators
Jaroslav Hajek <highegg@gmail.com>
parents:
8998
diff
changeset
|
387 else |
dc07bc4157b8
allow empty matrices in stream input operators
Jaroslav Hajek <highegg@gmail.com>
parents:
8998
diff
changeset
|
388 { |
dc07bc4157b8
allow empty matrices in stream input operators
Jaroslav Hajek <highegg@gmail.com>
parents:
8998
diff
changeset
|
389 error ("load: failed to load matrix constant"); |
dc07bc4157b8
allow empty matrices in stream input operators
Jaroslav Hajek <highegg@gmail.com>
parents:
8998
diff
changeset
|
390 success = false; |
dc07bc4157b8
allow empty matrices in stream input operators
Jaroslav Hajek <highegg@gmail.com>
parents:
8998
diff
changeset
|
391 } |
6717 | 392 } |
393 else | |
4687 | 394 { |
6717 | 395 error ("load: failed to read dimensions"); |
4687 | 396 success = false; |
397 } | |
398 } | |
399 else | |
5099 | 400 { |
6717 | 401 error ("load: failed to extract number of dimensions"); |
5099 | 402 success = false; |
403 } | |
4687 | 404 } |
5099 | 405 else if (kw == "rows") |
4687 | 406 { |
5275 | 407 octave_idx_type nr = val; |
408 octave_idx_type nc = 0; | |
5099 | 409 |
410 if (nr >= 0 && extract_keyword (is, "columns", nc) && nc >= 0) | |
411 { | |
412 if (nr > 0 && nc > 0) | |
413 { | |
414 Matrix tmp (nr, nc); | |
415 is >> tmp; | |
416 if (is) | |
417 matrix = tmp; | |
418 else | |
419 { | |
420 error ("load: failed to load matrix constant"); | |
421 success = false; | |
422 } | |
423 } | |
424 else if (nr == 0 || nc == 0) | |
425 matrix = Matrix (nr, nc); | |
426 else | |
427 panic_impossible (); | |
428 } | |
429 else | |
430 { | |
431 error ("load: failed to extract number of rows and columns"); | |
432 success = false; | |
433 } | |
4687 | 434 } |
5099 | 435 else |
436 panic_impossible (); | |
437 } | |
438 else | |
439 { | |
440 error ("load: failed to extract number of rows and columns"); | |
441 success = false; | |
4687 | 442 } |
443 | |
444 return success; | |
445 } | |
446 | |
447 bool | |
448 octave_matrix::save_binary (std::ostream& os, bool& save_as_floats) | |
449 { | |
450 | |
451 dim_vector d = dims (); | |
452 if (d.length() < 1) | |
453 return false; | |
454 | |
455 // Use negative value for ndims to differentiate with old format!! | |
5828 | 456 int32_t tmp = - d.length(); |
5760 | 457 os.write (reinterpret_cast<char *> (&tmp), 4); |
5275 | 458 for (int i = 0; i < d.length (); i++) |
4687 | 459 { |
460 tmp = d(i); | |
5760 | 461 os.write (reinterpret_cast<char *> (&tmp), 4); |
4687 | 462 } |
463 | |
464 NDArray m = array_value (); | |
465 save_type st = LS_DOUBLE; | |
466 if (save_as_floats) | |
467 { | |
468 if (m.too_large_for_float ()) | |
469 { | |
470 warning ("save: some values too large to save as floats --"); | |
471 warning ("save: saving as doubles instead"); | |
472 } | |
473 else | |
474 st = LS_FLOAT; | |
475 } | |
5775 | 476 else if (d.numel () > 8192) // FIXME -- make this configurable. |
4687 | 477 { |
478 double max_val, min_val; | |
479 if (m.all_integers (max_val, min_val)) | |
480 st = get_save_type (max_val, min_val); | |
481 } | |
482 | |
483 const double *mtmp = m.data (); | |
484 write_doubles (os, mtmp, st, d.numel ()); | |
485 | |
486 return true; | |
487 } | |
488 | |
489 bool | |
490 octave_matrix::load_binary (std::istream& is, bool swap, | |
491 oct_mach_info::float_format fmt) | |
492 { | |
493 char tmp; | |
5828 | 494 int32_t mdims; |
5760 | 495 if (! is.read (reinterpret_cast<char *> (&mdims), 4)) |
4687 | 496 return false; |
497 if (swap) | |
4944 | 498 swap_bytes<4> (&mdims); |
4687 | 499 if (mdims < 0) |
500 { | |
501 mdims = - mdims; | |
5828 | 502 int32_t di; |
4687 | 503 dim_vector dv; |
504 dv.resize (mdims); | |
505 | |
506 for (int i = 0; i < mdims; i++) | |
507 { | |
5760 | 508 if (! is.read (reinterpret_cast<char *> (&di), 4)) |
4687 | 509 return false; |
510 if (swap) | |
4944 | 511 swap_bytes<4> (&di); |
4687 | 512 dv(i) = di; |
513 } | |
514 | |
5157 | 515 // Convert an array with a single dimension to be a row vector. |
516 // Octave should never write files like this, other software | |
517 // might. | |
518 | |
519 if (mdims == 1) | |
520 { | |
521 mdims = 2; | |
522 dv.resize (mdims); | |
523 dv(1) = dv(0); | |
524 dv(0) = 1; | |
525 } | |
526 | |
5760 | 527 if (! is.read (reinterpret_cast<char *> (&tmp), 1)) |
4687 | 528 return false; |
529 | |
530 NDArray m(dv); | |
531 double *re = m.fortran_vec (); | |
5760 | 532 read_doubles (is, re, static_cast<save_type> (tmp), dv.numel (), swap, fmt); |
4687 | 533 if (error_state || ! is) |
534 return false; | |
535 matrix = m; | |
536 } | |
537 else | |
538 { | |
5828 | 539 int32_t nr, nc; |
4687 | 540 nr = mdims; |
5760 | 541 if (! is.read (reinterpret_cast<char *> (&nc), 4)) |
4687 | 542 return false; |
543 if (swap) | |
4944 | 544 swap_bytes<4> (&nc); |
5760 | 545 if (! is.read (reinterpret_cast<char *> (&tmp), 1)) |
4687 | 546 return false; |
547 Matrix m (nr, nc); | |
548 double *re = m.fortran_vec (); | |
5275 | 549 octave_idx_type len = nr * nc; |
5760 | 550 read_doubles (is, re, static_cast<save_type> (tmp), len, swap, fmt); |
4687 | 551 if (error_state || ! is) |
552 return false; | |
553 matrix = m; | |
554 } | |
555 return true; | |
556 } | |
557 | |
558 #if defined (HAVE_HDF5) | |
4944 | 559 |
4687 | 560 bool |
561 octave_matrix::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) | |
562 { | |
4837 | 563 dim_vector dv = dims (); |
564 int empty = save_hdf5_empty (loc_id, name, dv); | |
565 if (empty) | |
4805 | 566 return (empty > 0); |
567 | |
4837 | 568 int rank = dv.length (); |
4687 | 569 hid_t space_hid = -1, data_hid = -1; |
570 bool retval = true; | |
571 NDArray m = array_value (); | |
572 | |
4805 | 573 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank); |
574 | |
4687 | 575 // Octave uses column-major, while HDF5 uses row-major ordering |
4805 | 576 for (int i = 0; i < rank; i++) |
4837 | 577 hdims[i] = dv (rank-i-1); |
4805 | 578 |
4815 | 579 space_hid = H5Screate_simple (rank, hdims, 0); |
4687 | 580 |
581 if (space_hid < 0) return false; | |
582 | |
583 hid_t save_type_hid = H5T_NATIVE_DOUBLE; | |
584 | |
585 if (save_as_floats) | |
586 { | |
587 if (m.too_large_for_float ()) | |
588 { | |
589 warning ("save: some values too large to save as floats --"); | |
590 warning ("save: saving as doubles instead"); | |
591 } | |
592 else | |
593 save_type_hid = H5T_NATIVE_FLOAT; | |
594 } | |
595 #if HAVE_HDF5_INT2FLOAT_CONVERSIONS | |
596 // hdf5 currently doesn't support float/integer conversions | |
597 else | |
598 { | |
599 double max_val, min_val; | |
600 | |
601 if (m.all_integers (max_val, min_val)) | |
602 save_type_hid | |
603 = save_type_to_hdf5 (get_save_type (max_val, min_val)); | |
604 } | |
605 #endif /* HAVE_HDF5_INT2FLOAT_CONVERSIONS */ | |
9892
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
606 |
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
607 #if HAVE_HDF5_18 |
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
608 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, |
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
609 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); |
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
610 #else |
4687 | 611 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, |
612 H5P_DEFAULT); | |
9892
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
613 #endif |
4687 | 614 if (data_hid < 0) |
615 { | |
616 H5Sclose (space_hid); | |
617 return false; | |
618 } | |
619 | |
620 double *mtmp = m.fortran_vec (); | |
621 retval = H5Dwrite (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, | |
4815 | 622 H5P_DEFAULT, mtmp) >= 0; |
4687 | 623 |
624 H5Dclose (data_hid); | |
625 H5Sclose (space_hid); | |
4837 | 626 |
4687 | 627 return retval; |
628 } | |
629 | |
630 bool | |
9881
b3089dba88bf
Remove HDF5 cruft for older versions of HDF5
Kacper Kowalik
parents:
9835
diff
changeset
|
631 octave_matrix::load_hdf5 (hid_t loc_id, const char *name) |
4687 | 632 { |
4837 | 633 bool retval = false; |
634 | |
4805 | 635 dim_vector dv; |
636 int empty = load_hdf5_empty (loc_id, name, dv); | |
637 if (empty > 0) | |
638 matrix.resize(dv); | |
4837 | 639 if (empty) |
4805 | 640 return (empty > 0); |
641 | |
9892
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
642 #if HAVE_HDF5_18 |
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
643 hid_t data_hid = H5Dopen (loc_id, name, H5P_DEFAULT); |
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
644 #else |
4687 | 645 hid_t data_hid = H5Dopen (loc_id, name); |
9892
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
646 #endif |
4687 | 647 hid_t space_id = H5Dget_space (data_hid); |
648 | |
649 hsize_t rank = H5Sget_simple_extent_ndims (space_id); | |
650 | |
651 if (rank < 1) | |
652 { | |
653 H5Sclose (space_id); | |
654 H5Dclose (data_hid); | |
655 return false; | |
656 } | |
657 | |
658 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank); | |
659 OCTAVE_LOCAL_BUFFER (hsize_t, maxdims, rank); | |
660 | |
661 H5Sget_simple_extent_dims (space_id, hdims, maxdims); | |
662 | |
663 // Octave uses column-major, while HDF5 uses row-major ordering | |
664 if (rank == 1) | |
665 { | |
666 dv.resize (2); | |
667 dv(0) = 1; | |
668 dv(1) = hdims[0]; | |
669 } | |
670 else | |
671 { | |
672 dv.resize (rank); | |
4815 | 673 for (hsize_t i = 0, j = rank - 1; i < rank; i++, j--) |
4687 | 674 dv(j) = hdims[i]; |
675 } | |
676 | |
677 NDArray m (dv); | |
678 double *re = m.fortran_vec (); | |
679 if (H5Dread (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, | |
4815 | 680 H5P_DEFAULT, re) >= 0) |
4687 | 681 { |
682 retval = true; | |
683 matrix = m; | |
684 } | |
685 | |
686 H5Sclose (space_id); | |
687 H5Dclose (data_hid); | |
4837 | 688 |
4687 | 689 return retval; |
690 } | |
4944 | 691 |
4687 | 692 #endif |
693 | |
4643 | 694 void |
695 octave_matrix::print_raw (std::ostream& os, | |
696 bool pr_as_read_syntax) const | |
697 { | |
698 octave_print_internal (os, matrix, pr_as_read_syntax, | |
699 current_print_indent_level ()); | |
700 } | |
701 | |
5900 | 702 mxArray * |
703 octave_matrix::as_mxArray (void) const | |
704 { | |
705 mxArray *retval = new mxArray (mxDOUBLE_CLASS, dims (), mxREAL); | |
706 | |
707 double *pr = static_cast<double *> (retval->get_data ()); | |
708 | |
6686 | 709 mwSize nel = numel (); |
5900 | 710 |
711 const double *p = matrix.data (); | |
712 | |
6686 | 713 for (mwIndex i = 0; i < nel; i++) |
5900 | 714 pr[i] = p[i]; |
715 | |
716 return retval; | |
717 } | |
718 | |
9823
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
719 // This uses a smarter strategy for doing the complex->real mappers. We |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
720 // allocate an array for a real result and keep filling it until a complex |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
721 // result is produced. |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
722 static octave_value |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
723 do_rc_map (const NDArray& a, Complex (&fcn) (double)) |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
724 { |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
725 octave_idx_type n = a.numel (); |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
726 NoAlias<NDArray> rr (a.dims ()); |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
727 |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
728 for (octave_idx_type i = 0; i < n; i++) |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
729 { |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
730 OCTAVE_QUIT; |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
731 |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
732 Complex tmp = fcn (a(i)); |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
733 if (tmp.imag () == 0.0) |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
734 rr(i) = tmp.real (); |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
735 else |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
736 { |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
737 NoAlias<ComplexNDArray> rc (a.dims ()); |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
738 |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
739 for (octave_idx_type j = 0; j < i; j++) |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
740 rc(j) = rr(j); |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
741 |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
742 rc(i) = tmp; |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
743 |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
744 for (octave_idx_type j = i+1; j < n; j++) |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
745 { |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
746 OCTAVE_QUIT; |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
747 |
9824
6631c61a4a4e
fix typos in previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9823
diff
changeset
|
748 rc(j) = fcn (a(j)); |
9823
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
749 } |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
750 |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
751 return new octave_complex_matrix (rc); |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
752 } |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
753 } |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
754 |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
755 return rr; |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
756 } |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
757 |
8650
a1ae2aae903e
abs,real,imag,conj: use code from mx-inlines rather than the generic map
Jaroslav Hajek <highegg@gmail.com>
parents:
8437
diff
changeset
|
758 octave_value |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
759 octave_matrix::map (unary_mapper_t umap) const |
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
760 { |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
761 switch (umap) |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
762 { |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
763 case umap_imag: |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
764 return NDArray (matrix.dims (), 0.0); |
8650
a1ae2aae903e
abs,real,imag,conj: use code from mx-inlines rather than the generic map
Jaroslav Hajek <highegg@gmail.com>
parents:
8437
diff
changeset
|
765 |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
766 case umap_real: |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
767 case umap_conj: |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
768 return matrix; |
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
769 |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
770 // Mappers handled specially. |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
771 #define ARRAY_METHOD_MAPPER(UMAP, FCN) \ |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
772 case umap_ ## UMAP: \ |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
773 return octave_value (matrix.FCN ()) |
8998
a48fba01e4ac
optimize isnan/isinf/isfinite mappers
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
774 |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
775 ARRAY_METHOD_MAPPER (abs, abs); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
776 ARRAY_METHOD_MAPPER (isnan, isnan); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
777 ARRAY_METHOD_MAPPER (isinf, isinf); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
778 ARRAY_METHOD_MAPPER (finite, isfinite); |
8998
a48fba01e4ac
optimize isnan/isinf/isfinite mappers
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
779 |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
780 #define ARRAY_MAPPER(UMAP, TYPE, FCN) \ |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
781 case umap_ ## UMAP: \ |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
782 return octave_value (matrix.map<TYPE> (FCN)) |
8998
a48fba01e4ac
optimize isnan/isinf/isfinite mappers
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
783 |
9823
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
784 #define RC_ARRAY_MAPPER(UMAP, TYPE, FCN) \ |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
785 case umap_ ## UMAP: \ |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
786 return do_rc_map (matrix, FCN) |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
787 |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
788 RC_ARRAY_MAPPER (acos, Complex, rc_acos); |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
789 RC_ARRAY_MAPPER (acosh, Complex, rc_acosh); |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
790 ARRAY_MAPPER (angle, double, ::arg); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
791 ARRAY_MAPPER (arg, double, ::arg); |
9823
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
792 RC_ARRAY_MAPPER (asin, Complex, rc_asin); |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
793 ARRAY_MAPPER (asinh, double, ::asinh); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
794 ARRAY_MAPPER (atan, double, ::atan); |
9823
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
795 RC_ARRAY_MAPPER (atanh, Complex, rc_atanh); |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
796 ARRAY_MAPPER (erf, double, ::erf); |
9835
1bb1ed717d2f
implement built-in erfinv
Jaroslav Hajek <highegg@gmail.com>
parents:
9824
diff
changeset
|
797 ARRAY_MAPPER (erfinv, double, ::erfinv); |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
798 ARRAY_MAPPER (erfc, double, ::erfc); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
799 ARRAY_MAPPER (gamma, double, xgamma); |
9823
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
800 RC_ARRAY_MAPPER (lgamma, Complex, rc_lgamma); |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
801 ARRAY_MAPPER (ceil, double, ::ceil); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
802 ARRAY_MAPPER (cos, double, ::cos); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
803 ARRAY_MAPPER (cosh, double, ::cosh); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
804 ARRAY_MAPPER (exp, double, ::exp); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
805 ARRAY_MAPPER (expm1, double, ::expm1); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
806 ARRAY_MAPPER (fix, double, ::fix); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
807 ARRAY_MAPPER (floor, double, ::floor); |
9823
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
808 RC_ARRAY_MAPPER (log, Complex, rc_log); |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
809 RC_ARRAY_MAPPER (log2, Complex, rc_log2); |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
810 RC_ARRAY_MAPPER (log10, Complex, rc_log10); |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
811 RC_ARRAY_MAPPER (log1p, Complex, rc_log1p); |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
812 ARRAY_MAPPER (round, double, xround); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
813 ARRAY_MAPPER (roundb, double, xroundb); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
814 ARRAY_MAPPER (signum, double, ::signum); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
815 ARRAY_MAPPER (sin, double, ::sin); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
816 ARRAY_MAPPER (sinh, double, ::sinh); |
9823
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
817 RC_ARRAY_MAPPER (sqrt, Complex, rc_sqrt); |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
818 ARRAY_MAPPER (tan, double, ::tan); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
819 ARRAY_MAPPER (tanh, double, ::tanh); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
820 ARRAY_MAPPER (isna, bool, octave_is_NA); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
821 |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
822 default: |
9813
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
823 if (umap >= umap_xisalnum && umap <= umap_xtoupper) |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
824 { |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
825 octave_value str_conv = convert_to_str (true, true); |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
826 return error_state ? octave_value () : str_conv.map (umap); |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
827 } |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
828 else |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
829 return octave_base_value::map (umap); |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
830 } |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
831 } |
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
832 |
4901 | 833 DEFUN (double, args, , |
834 "-*- texinfo -*-\n\ | |
835 @deftypefn {Built-in Function} {} double (@var{x})\n\ | |
836 Convert @var{x} to double precision type.\n\ | |
9309
fb8b8589dd46
Expand documentation for 'complex' function
Rik <rdrider0-list@yahoo.com>
parents:
9184
diff
changeset
|
837 @seealso{single}\n\ |
4901 | 838 @end deftypefn") |
839 { | |
7004 | 840 // The OCTAVE_TYPE_CONV_BODY3 macro declares retval, so they go |
841 // inside their own scopes, and we don't declare retval here to | |
842 // avoid a shadowed declaration warning. | |
843 | |
9184 | 844 if (args.length () == 1) |
8399
c1bada868690
alow single/double conversion of diag & perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
845 { |
9184 | 846 if (args(0).is_perm_matrix ()) |
847 { | |
848 OCTAVE_TYPE_CONV_BODY3 (double, octave_perm_matrix, octave_scalar); | |
849 } | |
850 else if (args(0).is_diag_matrix ()) | |
8399
c1bada868690
alow single/double conversion of diag & perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
851 { |
c1bada868690
alow single/double conversion of diag & perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
852 if (args(0).is_complex_type ()) |
c1bada868690
alow single/double conversion of diag & perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
853 { |
c1bada868690
alow single/double conversion of diag & perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
854 OCTAVE_TYPE_CONV_BODY3 (double, octave_complex_diag_matrix, octave_complex); |
c1bada868690
alow single/double conversion of diag & perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
855 } |
c1bada868690
alow single/double conversion of diag & perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
856 else |
c1bada868690
alow single/double conversion of diag & perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
857 { |
c1bada868690
alow single/double conversion of diag & perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
858 OCTAVE_TYPE_CONV_BODY3 (double, octave_diag_matrix, octave_scalar); |
c1bada868690
alow single/double conversion of diag & perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
859 } |
c1bada868690
alow single/double conversion of diag & perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
860 } |
c1bada868690
alow single/double conversion of diag & perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
861 else if (args(0).is_sparse_type ()) |
7004 | 862 { |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
863 if (args(0).is_complex_type ()) |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
864 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
865 OCTAVE_TYPE_CONV_BODY3 (double, octave_sparse_complex_matrix, octave_complex); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
866 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
867 else |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
868 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
869 OCTAVE_TYPE_CONV_BODY3 (double, octave_sparse_matrix, octave_scalar); |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
870 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
871 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
872 else if (args(0).is_complex_type ()) |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
873 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
874 OCTAVE_TYPE_CONV_BODY3 (double, octave_complex_matrix, octave_complex); |
7004 | 875 } |
876 else | |
877 { | |
878 OCTAVE_TYPE_CONV_BODY3 (double, octave_matrix, octave_scalar); | |
879 } | |
880 } | |
881 else | |
882 print_usage (); | |
883 | |
884 return octave_value (); | |
4901 | 885 } |
886 | |
2376 | 887 /* |
888 ;;; Local Variables: *** | |
889 ;;; mode: C++ *** | |
890 ;;; End: *** | |
891 */ |