Mercurial > hg > octave-nkf
annotate src/ov-re-mat.cc @ 10293:ba373aea03d9
remove islist
author | Jaroslav Hajek <highegg@gmail.com> |
---|---|
date | Wed, 10 Feb 2010 07:57:43 +0100 |
parents | 3a8c13b71612 |
children | 57a59eae83cc |
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 |
10273
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
274 octave_value |
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
275 octave_matrix::sort (octave_idx_type dim, sortmode mode) const |
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
276 { |
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
277 // If this matrix is known to be a valid index, and we're doing a vector sort, |
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
278 // sort via idx_vector which may be more efficient occassionally. |
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
279 if (idx_cache && mode == ASCENDING && ndims () == 2 |
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
280 && ((dim == 0 && matrix.columns () == 1) || (dim == 1 && matrix.rows () == 1))) |
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
281 { |
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
282 return index_vector ().sorted (); |
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
283 } |
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
284 else |
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
285 return octave_base_matrix<NDArray>::sort (dim, mode); |
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
286 } |
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
287 |
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
288 octave_value |
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
289 octave_matrix::sort (Array<octave_idx_type> &sidx, octave_idx_type dim, |
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
290 sortmode mode) const |
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
291 { |
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
292 // If this matrix is known to be a valid index, and we're doing a vector sort, |
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
293 // sort via idx_vector which may be more efficient occassionally. |
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
294 if (idx_cache && mode == ASCENDING && ndims () == 2 |
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
295 && ((dim == 0 && matrix.columns () == 1) || (dim == 1 && matrix.rows () == 1))) |
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
296 { |
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
297 return index_vector ().sorted (sidx); |
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
298 } |
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
299 else |
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
300 return octave_base_matrix<NDArray>::sort (sidx, dim, mode); |
3a8c13b71612
implement special-case optimization for sort of index vectors
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
301 } |
8366
8b1a2555c4e2
implement diagonal matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
302 octave_value |
5279 | 303 octave_matrix::convert_to_str_internal (bool, bool, char type) const |
2376 | 304 { |
305 octave_value retval; | |
4844 | 306 dim_vector dv = dims (); |
5862 | 307 octave_idx_type nel = dv.numel (); |
308 | |
309 charNDArray chm (dv); | |
2376 | 310 |
5862 | 311 bool warned = false; |
312 | |
313 for (octave_idx_type i = 0; i < nel; i++) | |
2376 | 314 { |
10142
829e69ec3110
make OCTAVE_QUIT a function
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
315 octave_quit (); |
5862 | 316 |
317 double d = matrix (i); | |
4844 | 318 |
5862 | 319 if (xisnan (d)) |
320 { | |
321 ::error ("invalid conversion from NaN to character"); | |
322 return retval; | |
323 } | |
324 else | |
4844 | 325 { |
5862 | 326 int ival = NINT (d); |
4844 | 327 |
5862 | 328 if (ival < 0 || ival > UCHAR_MAX) |
329 { | |
330 // FIXME -- is there something | |
331 // better we could do? | |
2376 | 332 |
5862 | 333 ival = 0; |
334 | |
335 if (! warned) | |
336 { | |
337 ::warning ("range error for conversion to character value"); | |
338 warned = true; | |
339 } | |
4844 | 340 } |
2376 | 341 |
5862 | 342 chm (i) = static_cast<char> (ival); |
343 } | |
344 } | |
2376 | 345 |
9689
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9470
diff
changeset
|
346 retval = octave_value (chm, type); |
2376 | 347 |
348 return retval; | |
349 } | |
350 | |
4687 | 351 bool |
6974 | 352 octave_matrix::save_ascii (std::ostream& os) |
4687 | 353 { |
354 dim_vector d = dims (); | |
5958 | 355 |
4687 | 356 if (d.length () > 2) |
357 { | |
358 NDArray tmp = array_value (); | |
359 | |
360 os << "# ndims: " << d.length () << "\n"; | |
361 | |
362 for (int i=0; i < d.length (); i++) | |
363 os << " " << d (i); | |
364 | |
365 os << "\n" << tmp; | |
366 } | |
367 else | |
368 { | |
369 // Keep this case, rather than use generic code above for backward | |
370 // compatiability. Makes load_ascii much more complex!! | |
371 os << "# rows: " << rows () << "\n" | |
372 << "# columns: " << columns () << "\n"; | |
373 | |
5958 | 374 os << matrix_value (); |
4687 | 375 } |
376 | |
377 return true; | |
378 } | |
379 | |
380 bool | |
381 octave_matrix::load_ascii (std::istream& is) | |
382 { | |
383 bool success = true; | |
5099 | 384 |
385 string_vector keywords(2); | |
386 | |
387 keywords[0] = "ndims"; | |
388 keywords[1] = "rows"; | |
4687 | 389 |
5099 | 390 std::string kw; |
5275 | 391 octave_idx_type val = 0; |
5099 | 392 |
393 if (extract_keyword (is, keywords, kw, val, true)) | |
4687 | 394 { |
5099 | 395 if (kw == "ndims") |
4687 | 396 { |
5275 | 397 int mdims = static_cast<int> (val); |
4687 | 398 |
5099 | 399 if (mdims >= 0) |
4687 | 400 { |
5099 | 401 dim_vector dv; |
402 dv.resize (mdims); | |
4687 | 403 |
5099 | 404 for (int i = 0; i < mdims; i++) |
405 is >> dv(i); | |
4687 | 406 |
6717 | 407 if (is) |
408 { | |
409 NDArray tmp(dv); | |
410 | |
8999
dc07bc4157b8
allow empty matrices in stream input operators
Jaroslav Hajek <highegg@gmail.com>
parents:
8998
diff
changeset
|
411 is >> tmp; |
5099 | 412 |
8999
dc07bc4157b8
allow empty matrices in stream input operators
Jaroslav Hajek <highegg@gmail.com>
parents:
8998
diff
changeset
|
413 if (is) |
dc07bc4157b8
allow empty matrices in stream input operators
Jaroslav Hajek <highegg@gmail.com>
parents:
8998
diff
changeset
|
414 matrix = tmp; |
dc07bc4157b8
allow empty matrices in stream input operators
Jaroslav Hajek <highegg@gmail.com>
parents:
8998
diff
changeset
|
415 else |
dc07bc4157b8
allow empty matrices in stream input operators
Jaroslav Hajek <highegg@gmail.com>
parents:
8998
diff
changeset
|
416 { |
dc07bc4157b8
allow empty matrices in stream input operators
Jaroslav Hajek <highegg@gmail.com>
parents:
8998
diff
changeset
|
417 error ("load: failed to load matrix constant"); |
dc07bc4157b8
allow empty matrices in stream input operators
Jaroslav Hajek <highegg@gmail.com>
parents:
8998
diff
changeset
|
418 success = false; |
dc07bc4157b8
allow empty matrices in stream input operators
Jaroslav Hajek <highegg@gmail.com>
parents:
8998
diff
changeset
|
419 } |
6717 | 420 } |
421 else | |
4687 | 422 { |
6717 | 423 error ("load: failed to read dimensions"); |
4687 | 424 success = false; |
425 } | |
426 } | |
427 else | |
5099 | 428 { |
6717 | 429 error ("load: failed to extract number of dimensions"); |
5099 | 430 success = false; |
431 } | |
4687 | 432 } |
5099 | 433 else if (kw == "rows") |
4687 | 434 { |
5275 | 435 octave_idx_type nr = val; |
436 octave_idx_type nc = 0; | |
5099 | 437 |
438 if (nr >= 0 && extract_keyword (is, "columns", nc) && nc >= 0) | |
439 { | |
440 if (nr > 0 && nc > 0) | |
441 { | |
442 Matrix tmp (nr, nc); | |
443 is >> tmp; | |
444 if (is) | |
445 matrix = tmp; | |
446 else | |
447 { | |
448 error ("load: failed to load matrix constant"); | |
449 success = false; | |
450 } | |
451 } | |
452 else if (nr == 0 || nc == 0) | |
453 matrix = Matrix (nr, nc); | |
454 else | |
455 panic_impossible (); | |
456 } | |
457 else | |
458 { | |
459 error ("load: failed to extract number of rows and columns"); | |
460 success = false; | |
461 } | |
4687 | 462 } |
5099 | 463 else |
464 panic_impossible (); | |
465 } | |
466 else | |
467 { | |
468 error ("load: failed to extract number of rows and columns"); | |
469 success = false; | |
4687 | 470 } |
471 | |
472 return success; | |
473 } | |
474 | |
475 bool | |
476 octave_matrix::save_binary (std::ostream& os, bool& save_as_floats) | |
477 { | |
478 | |
479 dim_vector d = dims (); | |
480 if (d.length() < 1) | |
481 return false; | |
482 | |
483 // Use negative value for ndims to differentiate with old format!! | |
5828 | 484 int32_t tmp = - d.length(); |
5760 | 485 os.write (reinterpret_cast<char *> (&tmp), 4); |
5275 | 486 for (int i = 0; i < d.length (); i++) |
4687 | 487 { |
488 tmp = d(i); | |
5760 | 489 os.write (reinterpret_cast<char *> (&tmp), 4); |
4687 | 490 } |
491 | |
492 NDArray m = array_value (); | |
493 save_type st = LS_DOUBLE; | |
494 if (save_as_floats) | |
495 { | |
496 if (m.too_large_for_float ()) | |
497 { | |
498 warning ("save: some values too large to save as floats --"); | |
499 warning ("save: saving as doubles instead"); | |
500 } | |
501 else | |
502 st = LS_FLOAT; | |
503 } | |
5775 | 504 else if (d.numel () > 8192) // FIXME -- make this configurable. |
4687 | 505 { |
506 double max_val, min_val; | |
507 if (m.all_integers (max_val, min_val)) | |
508 st = get_save_type (max_val, min_val); | |
509 } | |
510 | |
511 const double *mtmp = m.data (); | |
512 write_doubles (os, mtmp, st, d.numel ()); | |
513 | |
514 return true; | |
515 } | |
516 | |
517 bool | |
518 octave_matrix::load_binary (std::istream& is, bool swap, | |
519 oct_mach_info::float_format fmt) | |
520 { | |
521 char tmp; | |
5828 | 522 int32_t mdims; |
5760 | 523 if (! is.read (reinterpret_cast<char *> (&mdims), 4)) |
4687 | 524 return false; |
525 if (swap) | |
4944 | 526 swap_bytes<4> (&mdims); |
4687 | 527 if (mdims < 0) |
528 { | |
529 mdims = - mdims; | |
5828 | 530 int32_t di; |
4687 | 531 dim_vector dv; |
532 dv.resize (mdims); | |
533 | |
534 for (int i = 0; i < mdims; i++) | |
535 { | |
5760 | 536 if (! is.read (reinterpret_cast<char *> (&di), 4)) |
4687 | 537 return false; |
538 if (swap) | |
4944 | 539 swap_bytes<4> (&di); |
4687 | 540 dv(i) = di; |
541 } | |
542 | |
5157 | 543 // Convert an array with a single dimension to be a row vector. |
544 // Octave should never write files like this, other software | |
545 // might. | |
546 | |
547 if (mdims == 1) | |
548 { | |
549 mdims = 2; | |
550 dv.resize (mdims); | |
551 dv(1) = dv(0); | |
552 dv(0) = 1; | |
553 } | |
554 | |
5760 | 555 if (! is.read (reinterpret_cast<char *> (&tmp), 1)) |
4687 | 556 return false; |
557 | |
558 NDArray m(dv); | |
559 double *re = m.fortran_vec (); | |
5760 | 560 read_doubles (is, re, static_cast<save_type> (tmp), dv.numel (), swap, fmt); |
4687 | 561 if (error_state || ! is) |
562 return false; | |
563 matrix = m; | |
564 } | |
565 else | |
566 { | |
5828 | 567 int32_t nr, nc; |
4687 | 568 nr = mdims; |
5760 | 569 if (! is.read (reinterpret_cast<char *> (&nc), 4)) |
4687 | 570 return false; |
571 if (swap) | |
4944 | 572 swap_bytes<4> (&nc); |
5760 | 573 if (! is.read (reinterpret_cast<char *> (&tmp), 1)) |
4687 | 574 return false; |
575 Matrix m (nr, nc); | |
576 double *re = m.fortran_vec (); | |
5275 | 577 octave_idx_type len = nr * nc; |
5760 | 578 read_doubles (is, re, static_cast<save_type> (tmp), len, swap, fmt); |
4687 | 579 if (error_state || ! is) |
580 return false; | |
581 matrix = m; | |
582 } | |
583 return true; | |
584 } | |
585 | |
586 #if defined (HAVE_HDF5) | |
4944 | 587 |
4687 | 588 bool |
589 octave_matrix::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) | |
590 { | |
4837 | 591 dim_vector dv = dims (); |
592 int empty = save_hdf5_empty (loc_id, name, dv); | |
593 if (empty) | |
4805 | 594 return (empty > 0); |
595 | |
4837 | 596 int rank = dv.length (); |
4687 | 597 hid_t space_hid = -1, data_hid = -1; |
598 bool retval = true; | |
599 NDArray m = array_value (); | |
600 | |
4805 | 601 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank); |
602 | |
4687 | 603 // Octave uses column-major, while HDF5 uses row-major ordering |
4805 | 604 for (int i = 0; i < rank; i++) |
4837 | 605 hdims[i] = dv (rank-i-1); |
4805 | 606 |
4815 | 607 space_hid = H5Screate_simple (rank, hdims, 0); |
4687 | 608 |
609 if (space_hid < 0) return false; | |
610 | |
611 hid_t save_type_hid = H5T_NATIVE_DOUBLE; | |
612 | |
613 if (save_as_floats) | |
614 { | |
615 if (m.too_large_for_float ()) | |
616 { | |
617 warning ("save: some values too large to save as floats --"); | |
618 warning ("save: saving as doubles instead"); | |
619 } | |
620 else | |
621 save_type_hid = H5T_NATIVE_FLOAT; | |
622 } | |
623 #if HAVE_HDF5_INT2FLOAT_CONVERSIONS | |
624 // hdf5 currently doesn't support float/integer conversions | |
625 else | |
626 { | |
627 double max_val, min_val; | |
628 | |
629 if (m.all_integers (max_val, min_val)) | |
630 save_type_hid | |
631 = save_type_to_hdf5 (get_save_type (max_val, min_val)); | |
632 } | |
633 #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
|
634 |
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
635 #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
|
636 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
|
637 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
|
638 #else |
4687 | 639 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, |
640 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
|
641 #endif |
4687 | 642 if (data_hid < 0) |
643 { | |
644 H5Sclose (space_hid); | |
645 return false; | |
646 } | |
647 | |
648 double *mtmp = m.fortran_vec (); | |
649 retval = H5Dwrite (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, | |
4815 | 650 H5P_DEFAULT, mtmp) >= 0; |
4687 | 651 |
652 H5Dclose (data_hid); | |
653 H5Sclose (space_hid); | |
4837 | 654 |
4687 | 655 return retval; |
656 } | |
657 | |
658 bool | |
9881
b3089dba88bf
Remove HDF5 cruft for older versions of HDF5
Kacper Kowalik
parents:
9835
diff
changeset
|
659 octave_matrix::load_hdf5 (hid_t loc_id, const char *name) |
4687 | 660 { |
4837 | 661 bool retval = false; |
662 | |
4805 | 663 dim_vector dv; |
664 int empty = load_hdf5_empty (loc_id, name, dv); | |
665 if (empty > 0) | |
666 matrix.resize(dv); | |
4837 | 667 if (empty) |
4805 | 668 return (empty > 0); |
669 | |
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
|
670 #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
|
671 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
|
672 #else |
4687 | 673 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
|
674 #endif |
4687 | 675 hid_t space_id = H5Dget_space (data_hid); |
676 | |
677 hsize_t rank = H5Sget_simple_extent_ndims (space_id); | |
678 | |
679 if (rank < 1) | |
680 { | |
681 H5Sclose (space_id); | |
682 H5Dclose (data_hid); | |
683 return false; | |
684 } | |
685 | |
686 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank); | |
687 OCTAVE_LOCAL_BUFFER (hsize_t, maxdims, rank); | |
688 | |
689 H5Sget_simple_extent_dims (space_id, hdims, maxdims); | |
690 | |
691 // Octave uses column-major, while HDF5 uses row-major ordering | |
692 if (rank == 1) | |
693 { | |
694 dv.resize (2); | |
695 dv(0) = 1; | |
696 dv(1) = hdims[0]; | |
697 } | |
698 else | |
699 { | |
700 dv.resize (rank); | |
4815 | 701 for (hsize_t i = 0, j = rank - 1; i < rank; i++, j--) |
4687 | 702 dv(j) = hdims[i]; |
703 } | |
704 | |
705 NDArray m (dv); | |
706 double *re = m.fortran_vec (); | |
707 if (H5Dread (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, | |
4815 | 708 H5P_DEFAULT, re) >= 0) |
4687 | 709 { |
710 retval = true; | |
711 matrix = m; | |
712 } | |
713 | |
714 H5Sclose (space_id); | |
715 H5Dclose (data_hid); | |
4837 | 716 |
4687 | 717 return retval; |
718 } | |
4944 | 719 |
4687 | 720 #endif |
721 | |
4643 | 722 void |
723 octave_matrix::print_raw (std::ostream& os, | |
724 bool pr_as_read_syntax) const | |
725 { | |
726 octave_print_internal (os, matrix, pr_as_read_syntax, | |
727 current_print_indent_level ()); | |
728 } | |
729 | |
5900 | 730 mxArray * |
731 octave_matrix::as_mxArray (void) const | |
732 { | |
733 mxArray *retval = new mxArray (mxDOUBLE_CLASS, dims (), mxREAL); | |
734 | |
735 double *pr = static_cast<double *> (retval->get_data ()); | |
736 | |
6686 | 737 mwSize nel = numel (); |
5900 | 738 |
739 const double *p = matrix.data (); | |
740 | |
6686 | 741 for (mwIndex i = 0; i < nel; i++) |
5900 | 742 pr[i] = p[i]; |
743 | |
744 return retval; | |
745 } | |
746 | |
9823
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
747 // 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
|
748 // 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
|
749 // result is produced. |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
750 static octave_value |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
751 do_rc_map (const NDArray& a, Complex (&fcn) (double)) |
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 octave_idx_type n = a.numel (); |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
754 NoAlias<NDArray> rr (a.dims ()); |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
755 |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
756 for (octave_idx_type i = 0; i < n; i++) |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
757 { |
10142
829e69ec3110
make OCTAVE_QUIT a function
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
758 octave_quit (); |
9823
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
759 |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
760 Complex tmp = fcn (a(i)); |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
761 if (tmp.imag () == 0.0) |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
762 rr(i) = tmp.real (); |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
763 else |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
764 { |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
765 NoAlias<ComplexNDArray> rc (a.dims ()); |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
766 |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
767 for (octave_idx_type j = 0; j < i; j++) |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
768 rc(j) = rr(j); |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
769 |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
770 rc(i) = tmp; |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
771 |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
772 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
|
773 { |
10142
829e69ec3110
make OCTAVE_QUIT a function
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
774 octave_quit (); |
9823
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
775 |
9824
6631c61a4a4e
fix typos in previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9823
diff
changeset
|
776 rc(j) = fcn (a(j)); |
9823
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
777 } |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
778 |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
779 return new octave_complex_matrix (rc); |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
780 } |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
781 } |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
782 |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
783 return rr; |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
784 } |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
785 |
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
|
786 octave_value |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
787 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
|
788 { |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
789 switch (umap) |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
790 { |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
791 case umap_imag: |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
792 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
|
793 |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
794 case umap_real: |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
795 case umap_conj: |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
796 return matrix; |
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
797 |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
798 // Mappers handled specially. |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
799 #define ARRAY_METHOD_MAPPER(UMAP, FCN) \ |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
800 case umap_ ## UMAP: \ |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
801 return octave_value (matrix.FCN ()) |
8998
a48fba01e4ac
optimize isnan/isinf/isfinite mappers
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
802 |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
803 ARRAY_METHOD_MAPPER (abs, abs); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
804 ARRAY_METHOD_MAPPER (isnan, isnan); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
805 ARRAY_METHOD_MAPPER (isinf, isinf); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
806 ARRAY_METHOD_MAPPER (finite, isfinite); |
8998
a48fba01e4ac
optimize isnan/isinf/isfinite mappers
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
807 |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
808 #define ARRAY_MAPPER(UMAP, TYPE, FCN) \ |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
809 case umap_ ## UMAP: \ |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
810 return octave_value (matrix.map<TYPE> (FCN)) |
8998
a48fba01e4ac
optimize isnan/isinf/isfinite mappers
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
811 |
9823
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
812 #define RC_ARRAY_MAPPER(UMAP, TYPE, FCN) \ |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
813 case umap_ ## UMAP: \ |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
814 return do_rc_map (matrix, FCN) |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
815 |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
816 RC_ARRAY_MAPPER (acos, Complex, rc_acos); |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
817 RC_ARRAY_MAPPER (acosh, Complex, rc_acosh); |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
818 ARRAY_MAPPER (angle, double, ::arg); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
819 ARRAY_MAPPER (arg, double, ::arg); |
9823
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
820 RC_ARRAY_MAPPER (asin, Complex, rc_asin); |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
821 ARRAY_MAPPER (asinh, double, ::asinh); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
822 ARRAY_MAPPER (atan, double, ::atan); |
9823
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
823 RC_ARRAY_MAPPER (atanh, Complex, rc_atanh); |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
824 ARRAY_MAPPER (erf, double, ::erf); |
9835
1bb1ed717d2f
implement built-in erfinv
Jaroslav Hajek <highegg@gmail.com>
parents:
9824
diff
changeset
|
825 ARRAY_MAPPER (erfinv, double, ::erfinv); |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
826 ARRAY_MAPPER (erfc, double, ::erfc); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
827 ARRAY_MAPPER (gamma, double, xgamma); |
9823
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
828 RC_ARRAY_MAPPER (lgamma, Complex, rc_lgamma); |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
829 ARRAY_MAPPER (ceil, double, ::ceil); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
830 ARRAY_MAPPER (cos, double, ::cos); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
831 ARRAY_MAPPER (cosh, double, ::cosh); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
832 ARRAY_MAPPER (exp, double, ::exp); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
833 ARRAY_MAPPER (expm1, double, ::expm1); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
834 ARRAY_MAPPER (fix, double, ::fix); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
835 ARRAY_MAPPER (floor, double, ::floor); |
9823
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
836 RC_ARRAY_MAPPER (log, Complex, rc_log); |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
837 RC_ARRAY_MAPPER (log2, Complex, rc_log2); |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
838 RC_ARRAY_MAPPER (log10, Complex, rc_log10); |
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
839 RC_ARRAY_MAPPER (log1p, Complex, rc_log1p); |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
840 ARRAY_MAPPER (round, double, xround); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
841 ARRAY_MAPPER (roundb, double, xroundb); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
842 ARRAY_MAPPER (signum, double, ::signum); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
843 ARRAY_MAPPER (sin, double, ::sin); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
844 ARRAY_MAPPER (sinh, double, ::sinh); |
9823
9b62f2d8de6d
improve r->c mapper strategy
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
845 RC_ARRAY_MAPPER (sqrt, Complex, rc_sqrt); |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
846 ARRAY_MAPPER (tan, double, ::tan); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
847 ARRAY_MAPPER (tanh, double, ::tanh); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
848 ARRAY_MAPPER (isna, bool, octave_is_NA); |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
849 |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
850 default: |
9813
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
851 if (umap >= umap_xisalnum && umap <= umap_xtoupper) |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
852 { |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
853 octave_value str_conv = convert_to_str (true, true); |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
854 return error_state ? octave_value () : str_conv.map (umap); |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
855 } |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
856 else |
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
857 return octave_base_value::map (umap); |
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
858 } |
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
859 } |
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
860 |
4901 | 861 DEFUN (double, args, , |
862 "-*- texinfo -*-\n\ | |
863 @deftypefn {Built-in Function} {} double (@var{x})\n\ | |
864 Convert @var{x} to double precision type.\n\ | |
9309
fb8b8589dd46
Expand documentation for 'complex' function
Rik <rdrider0-list@yahoo.com>
parents:
9184
diff
changeset
|
865 @seealso{single}\n\ |
4901 | 866 @end deftypefn") |
867 { | |
7004 | 868 // The OCTAVE_TYPE_CONV_BODY3 macro declares retval, so they go |
869 // inside their own scopes, and we don't declare retval here to | |
870 // avoid a shadowed declaration warning. | |
871 | |
9184 | 872 if (args.length () == 1) |
8399
c1bada868690
alow single/double conversion of diag & perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
873 { |
9184 | 874 if (args(0).is_perm_matrix ()) |
875 { | |
876 OCTAVE_TYPE_CONV_BODY3 (double, octave_perm_matrix, octave_scalar); | |
877 } | |
878 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
|
879 { |
c1bada868690
alow single/double conversion of diag & perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
880 if (args(0).is_complex_type ()) |
c1bada868690
alow single/double conversion of diag & perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
881 { |
c1bada868690
alow single/double conversion of diag & perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
882 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
|
883 } |
c1bada868690
alow single/double conversion of diag & perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
884 else |
c1bada868690
alow single/double conversion of diag & perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
885 { |
c1bada868690
alow single/double conversion of diag & perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
886 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
|
887 } |
c1bada868690
alow single/double conversion of diag & perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
888 } |
c1bada868690
alow single/double conversion of diag & perm matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
889 else if (args(0).is_sparse_type ()) |
7004 | 890 { |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
891 if (args(0).is_complex_type ()) |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
892 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
893 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
|
894 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
895 else |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
896 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
897 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
|
898 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
899 } |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
900 else if (args(0).is_complex_type ()) |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
901 { |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
902 OCTAVE_TYPE_CONV_BODY3 (double, octave_complex_matrix, octave_complex); |
7004 | 903 } |
904 else | |
905 { | |
906 OCTAVE_TYPE_CONV_BODY3 (double, octave_matrix, octave_scalar); | |
907 } | |
908 } | |
909 else | |
910 print_usage (); | |
911 | |
912 return octave_value (); | |
4901 | 913 } |