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