Mercurial > octave
annotate src/ov-scalar.cc @ 9892:ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
| author | Kacper Kowalik <xarthisius.kk@gmail.com> |
|---|---|
| date | Tue, 01 Dec 2009 00:49:07 +0100 |
| parents | b3089dba88bf |
| children | cd96d29c5efa |
| rev | line source |
|---|---|
| 2376 | 1 /* |
| 2 | |
| 7017 | 3 Copyright (C) 1996, 1997, 1998, 2000, 2002, 2003, 2004, 2005, 2006, |
| 8920 | 4 2007, 2008 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 | |
| 3503 | 28 #include <iostream> |
| 2901 | 29 |
| 4944 | 30 #include "data-conv.h" |
| 31 #include "mach-info.h" | |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
32 #include "lo-specfun.h" |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
33 #include "lo-mappers.h" |
| 4944 | 34 |
| 2376 | 35 #include "defun.h" |
| 36 #include "gripes.h" | |
| 37 #include "oct-obj.h" | |
| 4944 | 38 #include "oct-stream.h" |
| 2376 | 39 #include "ov-scalar.h" |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
40 #include "ov-float.h" |
| 3223 | 41 #include "ov-base.h" |
| 42 #include "ov-base-scalar.h" | |
| 43 #include "ov-base-scalar.cc" | |
| 2423 | 44 #include "ov-re-mat.h" |
| 2376 | 45 #include "ov-typeinfo.h" |
| 46 #include "pr-output.h" | |
| 47 #include "xdiv.h" | |
| 48 #include "xpow.h" | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
49 #include "ops.h" |
| 2376 | 50 |
| 4687 | 51 #include "ls-oct-ascii.h" |
| 52 #include "ls-hdf5.h" | |
| 53 | |
| 3223 | 54 template class octave_base_scalar<double>; |
| 55 | |
| 3219 | 56 DEFINE_OCTAVE_ALLOCATOR (octave_scalar); |
| 2376 | 57 |
| 4612 | 58 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_scalar, "scalar", "double"); |
| 2376 | 59 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
60 static octave_base_value * |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
61 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
|
62 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
63 CAST_CONV_ARG (const octave_scalar&); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
64 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
65 return new octave_float_scalar (v.float_value ()); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
66 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
67 |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
68 octave_base_value::type_conv_info |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
69 octave_scalar::numeric_demotion_function (void) const |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
70 { |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
71 return octave_base_value::type_conv_info(default_numeric_demotion_function, |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
7885
diff
changeset
|
72 octave_float_scalar::static_type_id ()); |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
73 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7740
diff
changeset
|
74 |
| 2376 | 75 octave_value |
| 5885 | 76 octave_scalar::do_index_op (const octave_value_list& idx, bool resize_ok) |
| 2376 | 77 { |
|
8437
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
78 // FIXME -- this doesn't solve the problem of |
|
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
79 // |
|
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
80 // a = 1; a([1,1], [1,1], [1,1]) |
|
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
81 // |
|
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
82 // and similar constructions. Hmm... |
| 2376 | 83 |
|
8437
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
84 // FIXME -- using this constructor avoids narrowing the |
|
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
85 // 1x1 matrix back to a scalar value. Need a better solution |
|
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
86 // to this problem. |
| 2376 | 87 |
|
8437
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
88 octave_value tmp (new octave_matrix (matrix_value ())); |
| 2423 | 89 |
|
8437
f00578b495e9
remove valid_as_scalar_index
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
90 return tmp.do_index_op (idx, resize_ok); |
| 2376 | 91 } |
| 92 | |
| 5731 | 93 octave_value |
| 94 octave_scalar::resize (const dim_vector& dv, bool fill) const | |
| 95 { | |
| 96 if (fill) | |
| 97 { | |
| 98 NDArray retval (dv, NDArray::resize_fill_value()); | |
| 99 | |
| 100 if (dv.numel ()) | |
| 101 retval(0) = scalar; | |
| 102 | |
| 103 return retval; | |
| 104 } | |
| 105 else | |
| 106 { | |
| 107 NDArray retval (dv); | |
| 108 | |
| 109 if (dv.numel ()) | |
| 110 retval(0) = scalar; | |
| 111 | |
| 112 return retval; | |
| 113 } | |
| 114 } | |
| 115 | |
| 2376 | 116 octave_value |
| 5279 | 117 octave_scalar::convert_to_str_internal (bool, bool, char type) const |
| 2376 | 118 { |
| 119 octave_value retval; | |
| 120 | |
| 121 if (xisnan (scalar)) | |
| 122 ::error ("invalid conversion from NaN to character"); | |
| 123 else | |
| 124 { | |
| 4100 | 125 int ival = NINT (scalar); |
| 126 | |
| 127 if (ival < 0 || ival > UCHAR_MAX) | |
| 128 { | |
| 5775 | 129 // FIXME -- is there something better we could do? |
| 4100 | 130 |
| 131 ival = 0; | |
| 132 | |
| 133 ::warning ("range error for conversion to character value"); | |
| 134 } | |
| 135 | |
| 5279 | 136 retval = octave_value (std::string (1, static_cast<char> (ival)), type); |
| 2376 | 137 } |
| 138 | |
| 139 return retval; | |
| 140 } | |
| 141 | |
| 4687 | 142 bool |
| 6974 | 143 octave_scalar::save_ascii (std::ostream& os) |
| 4687 | 144 { |
| 145 double d = double_value (); | |
| 146 | |
| 5958 | 147 octave_write_double (os, d); |
| 148 | |
| 149 os << "\n"; | |
| 4687 | 150 |
| 151 return true; | |
| 152 } | |
| 153 | |
| 154 bool | |
| 155 octave_scalar::load_ascii (std::istream& is) | |
| 156 { | |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
157 scalar = octave_read_value<double> (is); |
| 4687 | 158 if (!is) |
| 159 { | |
| 160 error ("load: failed to load scalar constant"); | |
| 161 return false; | |
| 162 } | |
| 163 | |
| 164 return true; | |
| 165 } | |
| 166 | |
| 167 bool | |
| 168 octave_scalar::save_binary (std::ostream& os, bool& /* save_as_floats */) | |
| 169 { | |
| 5760 | 170 char tmp = LS_DOUBLE; |
| 171 os.write (reinterpret_cast<char *> (&tmp), 1); | |
| 4687 | 172 double dtmp = double_value (); |
| 5760 | 173 os.write (reinterpret_cast<char *> (&dtmp), 8); |
| 4687 | 174 |
| 175 return true; | |
| 176 } | |
| 177 | |
| 178 bool | |
| 179 octave_scalar::load_binary (std::istream& is, bool swap, | |
| 4815 | 180 oct_mach_info::float_format fmt) |
| 4687 | 181 { |
| 182 char tmp; | |
| 5760 | 183 if (! is.read (reinterpret_cast<char *> (&tmp), 1)) |
| 4687 | 184 return false; |
| 185 | |
| 186 double dtmp; | |
| 5760 | 187 read_doubles (is, &dtmp, static_cast<save_type> (tmp), 1, swap, fmt); |
| 4687 | 188 if (error_state || ! is) |
| 189 return false; | |
| 190 | |
| 191 scalar = dtmp; | |
| 192 return true; | |
| 193 } | |
| 194 | |
| 195 #if defined (HAVE_HDF5) | |
| 4944 | 196 |
| 4687 | 197 bool |
| 198 octave_scalar::save_hdf5 (hid_t loc_id, const char *name, | |
| 199 bool /* save_as_floats */) | |
| 200 { | |
| 201 hsize_t dimens[3]; | |
| 202 hid_t space_hid = -1, data_hid = -1; | |
| 203 bool retval = true; | |
| 204 | |
| 4815 | 205 space_hid = H5Screate_simple (0, dimens, 0); |
| 4687 | 206 if (space_hid < 0) return false; |
| 207 | |
|
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
|
208 #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
|
209 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, 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
|
210 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
|
211 #else |
| 4687 | 212 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, space_hid, |
| 213 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
|
214 #endif |
| 4687 | 215 if (data_hid < 0) |
| 216 { | |
| 217 H5Sclose (space_hid); | |
| 218 return false; | |
| 219 } | |
| 220 | |
| 221 double tmp = double_value (); | |
| 222 retval = H5Dwrite (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, | |
| 4815 | 223 H5P_DEFAULT, &tmp) >= 0; |
| 4687 | 224 |
| 225 H5Dclose (data_hid); | |
| 226 H5Sclose (space_hid); | |
| 4837 | 227 |
| 4687 | 228 return retval; |
| 229 } | |
| 230 | |
| 231 bool | |
|
9881
b3089dba88bf
Remove HDF5 cruft for older versions of HDF5
Kacper Kowalik
parents:
9835
diff
changeset
|
232 octave_scalar::load_hdf5 (hid_t loc_id, const char *name) |
| 4687 | 233 { |
|
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
|
234 #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
|
235 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
|
236 #else |
| 4687 | 237 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
|
238 #endif |
| 4687 | 239 hid_t space_id = H5Dget_space (data_hid); |
| 240 | |
| 241 hsize_t rank = H5Sget_simple_extent_ndims (space_id); | |
| 242 | |
| 243 if (rank != 0) | |
| 244 { | |
| 245 H5Dclose (data_hid); | |
| 246 return false; | |
| 247 } | |
| 248 | |
| 249 double dtmp; | |
| 250 if (H5Dread (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, | |
| 4815 | 251 H5P_DEFAULT, &dtmp) < 0) |
| 4687 | 252 { |
| 253 H5Dclose (data_hid); | |
| 254 return false; | |
| 255 } | |
| 256 | |
| 257 scalar = dtmp; | |
| 4837 | 258 |
| 4687 | 259 H5Dclose (data_hid); |
| 4837 | 260 |
| 4687 | 261 return true; |
| 262 } | |
| 4944 | 263 |
| 4687 | 264 #endif |
| 265 | |
| 5900 | 266 mxArray * |
| 267 octave_scalar::as_mxArray (void) const | |
| 268 { | |
| 269 mxArray *retval = new mxArray (mxDOUBLE_CLASS, 1, 1, mxREAL); | |
| 270 | |
| 271 double *pr = static_cast<double *> (retval->get_data ()); | |
| 272 | |
| 273 pr[0] = scalar; | |
| 274 | |
| 275 return retval; | |
| 276 } | |
| 277 | |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
278 octave_value |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
279 octave_scalar::map (unary_mapper_t umap) const |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
280 { |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
281 switch (umap) |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
282 { |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
283 case umap_imag: |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
284 return 0.0; |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
285 |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
286 case umap_real: |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
287 case umap_conj: |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
288 return scalar; |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
289 |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
290 #define SCALAR_MAPPER(UMAP, FCN) \ |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
291 case umap_ ## UMAP: \ |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
292 return octave_value (FCN (scalar)) |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
293 |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
294 SCALAR_MAPPER (abs, ::fabs); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
295 SCALAR_MAPPER (acos, rc_acos); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
296 SCALAR_MAPPER (acosh, rc_acosh); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
297 SCALAR_MAPPER (angle, ::arg); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
298 SCALAR_MAPPER (arg, ::arg); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
299 SCALAR_MAPPER (asin, rc_asin); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
300 SCALAR_MAPPER (asinh, ::asinh); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
301 SCALAR_MAPPER (atan, ::atan); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
302 SCALAR_MAPPER (atanh, rc_atanh); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
303 SCALAR_MAPPER (erf, ::erf); |
|
9835
1bb1ed717d2f
implement built-in erfinv
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
304 SCALAR_MAPPER (erfinv, ::erfinv); |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
305 SCALAR_MAPPER (erfc, ::erfc); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
306 SCALAR_MAPPER (gamma, xgamma); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
307 SCALAR_MAPPER (lgamma, rc_lgamma); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
308 SCALAR_MAPPER (ceil, ::ceil); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
309 SCALAR_MAPPER (cos, ::cos); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
310 SCALAR_MAPPER (cosh, ::cosh); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
311 SCALAR_MAPPER (exp, ::exp); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
312 SCALAR_MAPPER (expm1, ::expm1); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
313 SCALAR_MAPPER (fix, ::fix); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
314 SCALAR_MAPPER (floor, ::floor); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
315 SCALAR_MAPPER (log, rc_log); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
316 SCALAR_MAPPER (log2, rc_log2); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
317 SCALAR_MAPPER (log10, rc_log10); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
318 SCALAR_MAPPER (log1p, rc_log1p); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
319 SCALAR_MAPPER (round, xround); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
320 SCALAR_MAPPER (roundb, xroundb); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
321 SCALAR_MAPPER (signum, ::signum); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
322 SCALAR_MAPPER (sin, ::sin); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
323 SCALAR_MAPPER (sinh, ::sinh); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
324 SCALAR_MAPPER (sqrt, rc_sqrt); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
325 SCALAR_MAPPER (tan, ::tan); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
326 SCALAR_MAPPER (tanh, ::tanh); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
327 SCALAR_MAPPER (finite, xfinite); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
328 SCALAR_MAPPER (isinf, xisinf); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
329 SCALAR_MAPPER (isna, octave_is_NA); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
330 SCALAR_MAPPER (isnan, xisnan); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
331 |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
332 default: |
|
9813
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
333 if (umap >= umap_xisalnum && umap <= umap_xtoupper) |
|
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
334 { |
|
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
335 octave_value str_conv = convert_to_str (true, true); |
|
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
336 return error_state ? octave_value () : str_conv.map (umap); |
|
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
337 } |
|
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
338 else |
|
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
339 return octave_base_value::map (umap); |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
340 } |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9470
diff
changeset
|
341 } |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
342 |
| 2376 | 343 /* |
| 344 ;;; Local Variables: *** | |
| 345 ;;; mode: C++ *** | |
| 346 ;;; End: *** | |
| 347 */ |