Mercurial > hg > octave-nkf
annotate src/ov-re-sparse.cc @ 7601:8a939b217863
Treat negative values to lgamma and beta correctly
| author | David Bateman <dbateman@free.fr> |
|---|---|
| date | Tue, 18 Mar 2008 21:32:48 -0400 |
| parents | 8c32f95c2639 |
| children | 99c410f7f0b0 |
| rev | line source |
|---|---|
| 5164 | 1 /* |
| 2 | |
| 7017 | 3 Copyright (C) 2004, 2005, 2006, 2007 David Bateman |
| 7016 | 4 Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Andy Adler |
| 5 | |
| 6 This file is part of Octave. | |
| 5164 | 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. | |
| 5164 | 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/>. | |
| 5164 | 21 |
| 22 */ | |
| 23 | |
| 24 #ifdef HAVE_CONFIG_H | |
| 25 #include <config.h> | |
| 26 #endif | |
| 27 | |
| 28 #include <climits> | |
| 29 | |
| 30 #include <iostream> | |
| 31 #include <vector> | |
| 32 | |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
33 #include "lo-specfun.h" |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
34 #include "lo-mappers.h" |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
35 |
| 5164 | 36 #include "ov-base.h" |
| 37 #include "ov-scalar.h" | |
| 38 #include "gripes.h" | |
| 39 | |
| 40 #include "ls-hdf5.h" | |
| 41 | |
| 42 #include "ov-re-sparse.h" | |
| 43 | |
| 44 #include "ov-base-sparse.h" | |
| 45 #include "ov-base-sparse.cc" | |
| 46 | |
| 47 #include "ov-bool-sparse.h" | |
| 48 | |
| 6109 | 49 template class OCTINTERP_API octave_base_sparse<SparseMatrix>; |
| 5164 | 50 |
| 51 DEFINE_OCTAVE_ALLOCATOR (octave_sparse_matrix); | |
| 52 | |
| 6823 | 53 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_sparse_matrix, "sparse matrix", "double"); |
| 5164 | 54 |
| 5282 | 55 idx_vector |
| 56 octave_sparse_matrix::index_vector (void) const | |
| 57 { | |
| 5604 | 58 if (matrix.numel () == matrix.nnz ()) |
| 5282 | 59 return idx_vector (array_value ()); |
| 60 else | |
| 61 { | |
| 62 std::string nm = type_name (); | |
| 63 error ("%s type invalid as index value", nm.c_str ()); | |
| 64 return idx_vector (); | |
| 65 } | |
| 66 } | |
| 67 | |
| 5759 | 68 octave_base_value * |
| 5164 | 69 octave_sparse_matrix::try_narrowing_conversion (void) |
| 70 { | |
| 5759 | 71 octave_base_value *retval = 0; |
| 5164 | 72 |
| 7193 | 73 if (Vsparse_auto_mutate) |
| 5164 | 74 { |
| 7193 | 75 // Don't use numel, since it can overflow for very large matrices |
| 76 // Note that for the second test, this means it becomes approximative | |
| 77 // since it involves a cast to double to avoid issues of overflow | |
| 78 if (matrix.rows () == 1 && matrix.cols () == 1) | |
| 79 { | |
| 80 // Const copy of the matrix, so the right version of () operator used | |
| 81 const SparseMatrix tmp (matrix); | |
| 5164 | 82 |
| 7193 | 83 retval = new octave_scalar (tmp (0)); |
| 84 } | |
| 85 else if (matrix.cols () > 0 && matrix.rows () > 0 && | |
| 86 double (matrix.byte_size ()) > double (matrix.rows ()) * | |
| 87 double (matrix.cols ()) * sizeof (double)) | |
| 88 retval = new octave_matrix (matrix.matrix_value ()); | |
| 5164 | 89 } |
| 90 | |
| 91 return retval; | |
| 92 } | |
| 93 | |
| 94 bool | |
| 95 octave_sparse_matrix::valid_as_scalar_index (void) const | |
| 96 { | |
| 5775 | 97 // FIXME |
| 5164 | 98 return false; |
| 99 } | |
| 100 | |
| 101 double | |
| 102 octave_sparse_matrix::double_value (bool) const | |
| 103 { | |
| 104 double retval = lo_ieee_nan_value (); | |
| 105 | |
| 106 if (numel () > 0) | |
| 107 { | |
| 6221 | 108 if (numel () > 1) |
| 109 gripe_implicit_conversion ("Octave:array-as-scalar", | |
| 110 "real sparse matrix", "real scalar"); | |
| 5164 | 111 |
| 112 retval = matrix (0, 0); | |
| 113 } | |
| 114 else | |
| 115 gripe_invalid_conversion ("real sparse matrix", "real scalar"); | |
| 116 | |
| 117 return retval; | |
| 118 } | |
| 119 | |
| 120 Complex | |
| 121 octave_sparse_matrix::complex_value (bool) const | |
| 122 { | |
| 123 double tmp = lo_ieee_nan_value (); | |
| 124 | |
| 125 Complex retval (tmp, tmp); | |
| 126 | |
| 5775 | 127 // FIXME -- maybe this should be a function, valid_as_scalar() |
| 5164 | 128 if (rows () > 0 && columns () > 0) |
| 129 { | |
| 6221 | 130 if (numel () > 1) |
| 131 gripe_implicit_conversion ("Octave:array-as-scalar", | |
| 132 "real sparse matrix", "complex scalar"); | |
| 5164 | 133 |
| 134 retval = matrix (0, 0); | |
| 135 } | |
| 136 else | |
| 137 gripe_invalid_conversion ("real sparse matrix", "complex scalar"); | |
| 138 | |
| 139 return retval; | |
| 140 } | |
| 141 | |
| 142 Matrix | |
| 143 octave_sparse_matrix::matrix_value (bool) const | |
| 144 { | |
| 145 return matrix.matrix_value (); | |
| 146 } | |
| 147 | |
| 5898 | 148 boolNDArray |
| 5943 | 149 octave_sparse_matrix::bool_array_value (bool warn) const |
| 5898 | 150 { |
| 5943 | 151 NDArray m = matrix.matrix_value (); |
| 152 | |
| 153 if (warn && m.any_element_not_one_or_zero ()) | |
| 154 gripe_logical_conversion (); | |
| 155 | |
| 156 return boolNDArray (m); | |
| 5898 | 157 } |
| 158 | |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
159 charNDArray |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
160 octave_sparse_matrix::char_array_value (bool) const |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
161 { |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
162 charNDArray retval (dims (), 0); |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
163 octave_idx_type nc = matrix.cols (); |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
164 octave_idx_type nr = matrix.rows (); |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
165 |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
166 for (octave_idx_type j = 0; j < nc; j++) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
167 for (octave_idx_type i = matrix.cidx(j); i < matrix.cidx(j+1); i++) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
168 retval(matrix.ridx(i) + nr * j) = static_cast<char>(matrix.data (i)); |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
169 |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
170 return retval; |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
171 } |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
172 |
| 5164 | 173 ComplexMatrix |
| 174 octave_sparse_matrix::complex_matrix_value (bool) const | |
| 175 { | |
| 176 return ComplexMatrix (matrix.matrix_value ()); | |
| 177 } | |
| 178 | |
| 179 ComplexNDArray | |
| 180 octave_sparse_matrix::complex_array_value (bool) const | |
| 181 { | |
| 182 return ComplexNDArray (ComplexMatrix (matrix.matrix_value ())); | |
| 183 } | |
| 184 | |
| 185 NDArray | |
| 186 octave_sparse_matrix::array_value (bool) const | |
| 187 { | |
| 188 return NDArray (matrix.matrix_value ()); | |
| 189 } | |
| 190 | |
| 191 streamoff_array | |
| 192 octave_sparse_matrix::streamoff_array_value (void) const | |
| 193 { | |
| 194 streamoff_array retval (dims ()); | |
| 5282 | 195 octave_idx_type nc = matrix.cols (); |
| 196 octave_idx_type nr = matrix.rows (); | |
| 5164 | 197 |
| 5282 | 198 for (octave_idx_type j = 0; j < nc; j++) |
| 199 for (octave_idx_type i = matrix.cidx(j); i < matrix.cidx(j+1); i++) | |
| 5164 | 200 { |
| 201 double d = matrix.data(i); | |
| 202 | |
| 203 if (D_NINT (d) == d) | |
| 204 { | |
| 205 retval(matrix.ridx(i) + nr * j) = | |
| 206 std::streamoff (static_cast<long> (d)); | |
| 207 } | |
| 208 else | |
| 209 { | |
| 210 error ("conversion to streamoff_array value failed"); | |
| 211 break; | |
| 212 } | |
| 213 } | |
| 214 | |
| 215 return retval; | |
| 216 } | |
| 217 | |
| 5282 | 218 octave_value |
| 5322 | 219 octave_sparse_matrix::convert_to_str_internal (bool, bool, char type) const |
| 5282 | 220 { |
| 221 octave_value retval; | |
| 222 dim_vector dv = dims (); | |
| 223 octave_idx_type nel = dv.numel (); | |
| 224 | |
| 225 if (nel == 0) | |
| 226 { | |
| 227 char s = '\0'; | |
| 5322 | 228 retval = octave_value (&s, type); |
| 5282 | 229 } |
| 230 else | |
| 231 { | |
| 232 octave_idx_type nr = matrix.rows (); | |
| 233 octave_idx_type nc = matrix.cols (); | |
| 234 charNDArray chm (dv, static_cast<char> (0)); | |
| 235 | |
| 236 bool warned = false; | |
| 237 | |
| 238 for (octave_idx_type j = 0; j < nc; j++) | |
| 239 for (octave_idx_type i = matrix.cidx(j); | |
| 240 i < matrix.cidx(j+1); i++) | |
| 241 { | |
| 242 OCTAVE_QUIT; | |
| 243 | |
| 244 double d = matrix.data (i); | |
| 245 | |
| 246 if (xisnan (d)) | |
| 247 { | |
| 248 ::error ("invalid conversion from NaN to character"); | |
| 249 return retval; | |
| 250 } | |
| 251 else | |
| 252 { | |
| 253 int ival = NINT (d); | |
| 254 | |
| 255 if (ival < 0 || ival > UCHAR_MAX) | |
| 256 { | |
| 5775 | 257 // FIXME -- is there something |
| 5282 | 258 // better we could do? |
| 259 | |
| 260 ival = 0; | |
| 261 | |
| 262 if (! warned) | |
| 263 { | |
| 264 ::warning ("range error for conversion to character value"); | |
| 265 warned = true; | |
| 266 } | |
| 267 } | |
| 268 | |
| 269 chm (matrix.ridx(i) + j * nr) = | |
| 270 static_cast<char> (ival); | |
| 271 } | |
| 272 } | |
| 5322 | 273 retval = octave_value (chm, true, type); |
| 5282 | 274 } |
| 275 | |
| 276 return retval; | |
| 277 } | |
| 278 | |
| 5164 | 279 bool |
| 280 octave_sparse_matrix::save_binary (std::ostream& os, bool&save_as_floats) | |
| 281 { | |
| 282 dim_vector d = this->dims (); | |
| 283 if (d.length() < 1) | |
| 284 return false; | |
| 285 | |
| 286 // Ensure that additional memory is deallocated | |
| 287 matrix.maybe_compress (); | |
| 288 | |
| 289 int nr = d(0); | |
| 290 int nc = d(1); | |
| 5604 | 291 int nz = nzmax (); |
| 5164 | 292 |
| 5828 | 293 int32_t itmp; |
| 5164 | 294 // Use negative value for ndims to be consistent with other formats |
| 295 itmp= -2; | |
| 5760 | 296 os.write (reinterpret_cast<char *> (&itmp), 4); |
| 5164 | 297 |
| 298 itmp= nr; | |
| 5760 | 299 os.write (reinterpret_cast<char *> (&itmp), 4); |
| 5164 | 300 |
| 301 itmp= nc; | |
| 5760 | 302 os.write (reinterpret_cast<char *> (&itmp), 4); |
| 5164 | 303 |
| 304 itmp= nz; | |
| 5760 | 305 os.write (reinterpret_cast<char *> (&itmp), 4); |
| 5164 | 306 |
| 307 save_type st = LS_DOUBLE; | |
| 308 if (save_as_floats) | |
| 309 { | |
| 310 if (matrix.too_large_for_float ()) | |
| 311 { | |
| 312 warning ("save: some values too large to save as floats --"); | |
| 313 warning ("save: saving as doubles instead"); | |
| 314 } | |
| 315 else | |
| 316 st = LS_FLOAT; | |
| 317 } | |
| 5775 | 318 else if (matrix.nzmax () > 8192) // FIXME -- make this configurable. |
| 5164 | 319 { |
| 320 double max_val, min_val; | |
| 321 if (matrix.all_integers (max_val, min_val)) | |
| 322 st = get_save_type (max_val, min_val); | |
| 323 } | |
| 324 | |
| 325 // add one to the printed indices to go from | |
| 326 // zero-based to one-based arrays | |
| 327 for (int i = 0; i < nc+1; i++) | |
| 328 { | |
| 329 OCTAVE_QUIT; | |
| 330 itmp = matrix.cidx(i); | |
| 5760 | 331 os.write (reinterpret_cast<char *> (&itmp), 4); |
| 5164 | 332 } |
| 333 | |
| 334 for (int i = 0; i < nz; i++) | |
| 335 { | |
| 336 OCTAVE_QUIT; | |
| 337 itmp = matrix.ridx(i); | |
| 5760 | 338 os.write (reinterpret_cast<char *> (&itmp), 4); |
| 5164 | 339 } |
| 340 | |
| 341 write_doubles (os, matrix.data(), st, nz); | |
| 342 | |
| 343 return true; | |
| 344 } | |
| 345 | |
| 346 bool | |
| 347 octave_sparse_matrix::load_binary (std::istream& is, bool swap, | |
| 348 oct_mach_info::float_format fmt) | |
| 349 { | |
| 5828 | 350 int32_t nz, nc, nr, tmp; |
| 5327 | 351 char ctmp; |
| 352 | |
| 5760 | 353 if (! is.read (reinterpret_cast<char *> (&tmp), 4)) |
| 5164 | 354 return false; |
| 355 | |
| 356 if (swap) | |
| 357 swap_bytes<4> (&tmp); | |
| 358 | |
| 359 if (tmp != -2) { | |
| 360 error("load: only 2D sparse matrices are supported"); | |
| 361 return false; | |
| 362 } | |
| 363 | |
| 5760 | 364 if (! is.read (reinterpret_cast<char *> (&nr), 4)) |
| 5164 | 365 return false; |
| 5760 | 366 if (! is.read (reinterpret_cast<char *> (&nc), 4)) |
| 5164 | 367 return false; |
| 5760 | 368 if (! is.read (reinterpret_cast<char *> (&nz), 4)) |
| 5164 | 369 return false; |
| 370 | |
| 371 if (swap) | |
| 372 { | |
| 373 swap_bytes<4> (&nr); | |
| 374 swap_bytes<4> (&nc); | |
| 375 swap_bytes<4> (&nz); | |
| 376 } | |
| 377 | |
| 5275 | 378 SparseMatrix m (static_cast<octave_idx_type> (nr), |
| 379 static_cast<octave_idx_type> (nc), | |
| 380 static_cast<octave_idx_type> (nz)); | |
| 5164 | 381 |
| 382 for (int i = 0; i < nc+1; i++) | |
| 383 { | |
| 384 OCTAVE_QUIT; | |
| 5760 | 385 if (! is.read (reinterpret_cast<char *> (&tmp), 4)) |
| 5164 | 386 return false; |
| 387 if (swap) | |
| 388 swap_bytes<4> (&tmp); | |
| 389 m.xcidx(i) = tmp; | |
| 390 } | |
| 391 | |
| 392 for (int i = 0; i < nz; i++) | |
| 393 { | |
| 394 OCTAVE_QUIT; | |
| 5760 | 395 if (! is.read (reinterpret_cast<char *> (&tmp), 4)) |
| 5164 | 396 return false; |
| 397 if (swap) | |
| 398 swap_bytes<4> (&tmp); | |
| 399 m.xridx(i) = tmp; | |
| 400 } | |
| 401 | |
| 5760 | 402 if (! is.read (reinterpret_cast<char *> (&ctmp), 1)) |
| 5164 | 403 return false; |
| 404 | |
| 5760 | 405 read_doubles (is, m.xdata (), static_cast<save_type> (ctmp), nz, swap, fmt); |
| 5164 | 406 |
| 407 if (error_state || ! is) | |
| 408 return false; | |
| 409 matrix = m; | |
| 410 | |
| 411 return true; | |
| 412 } | |
| 413 | |
| 414 #if defined (HAVE_HDF5) | |
| 5900 | 415 |
| 5164 | 416 bool |
| 417 octave_sparse_matrix::save_hdf5 (hid_t loc_id, const char *name, | |
| 418 bool save_as_floats) | |
| 419 { | |
| 420 dim_vector dv = dims (); | |
| 421 int empty = save_hdf5_empty (loc_id, name, dv); | |
| 422 if (empty) | |
| 423 return (empty > 0); | |
| 424 | |
| 425 // Ensure that additional memory is deallocated | |
| 426 matrix.maybe_compress (); | |
| 427 | |
| 428 hid_t group_hid = H5Gcreate (loc_id, name, 0); | |
| 429 if (group_hid < 0) | |
| 430 return false; | |
| 431 | |
| 432 hid_t space_hid = -1, data_hid = -1; | |
| 433 bool retval = true; | |
| 434 SparseMatrix m = sparse_matrix_value (); | |
| 5351 | 435 octave_idx_type tmp; |
| 5164 | 436 hsize_t hdims[2]; |
| 437 | |
| 5760 | 438 space_hid = H5Screate_simple (0, hdims, 0); |
| 5164 | 439 if (space_hid < 0) |
| 440 { | |
| 441 H5Gclose (group_hid); | |
| 442 return false; | |
| 443 } | |
| 444 | |
| 5351 | 445 data_hid = H5Dcreate (group_hid, "nr", H5T_NATIVE_IDX, space_hid, |
| 5164 | 446 H5P_DEFAULT); |
| 447 if (data_hid < 0) | |
| 448 { | |
| 449 H5Sclose (space_hid); | |
| 450 H5Gclose (group_hid); | |
| 451 return false; | |
| 452 } | |
| 453 | |
| 454 tmp = m.rows (); | |
| 5351 | 455 retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, |
| 5760 | 456 &tmp) >= 0; |
| 5164 | 457 H5Dclose (data_hid); |
| 458 if (!retval) | |
| 459 { | |
| 460 H5Sclose (space_hid); | |
| 461 H5Gclose (group_hid); | |
| 462 return false; | |
| 463 } | |
| 464 | |
| 5351 | 465 data_hid = H5Dcreate (group_hid, "nc", H5T_NATIVE_IDX, space_hid, |
| 5164 | 466 H5P_DEFAULT); |
| 467 if (data_hid < 0) | |
| 468 { | |
| 469 H5Sclose (space_hid); | |
| 470 H5Gclose (group_hid); | |
| 471 return false; | |
| 472 } | |
| 473 | |
| 474 tmp = m.cols (); | |
| 5351 | 475 retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, |
| 5760 | 476 &tmp) >= 0; |
| 5164 | 477 H5Dclose (data_hid); |
| 478 if (!retval) | |
| 479 { | |
| 480 H5Sclose (space_hid); | |
| 481 H5Gclose (group_hid); | |
| 482 return false; | |
| 483 } | |
| 484 | |
| 5351 | 485 data_hid = H5Dcreate (group_hid, "nz", H5T_NATIVE_IDX, space_hid, |
| 5164 | 486 H5P_DEFAULT); |
| 487 if (data_hid < 0) | |
| 488 { | |
| 489 H5Sclose (space_hid); | |
| 490 H5Gclose (group_hid); | |
| 491 return false; | |
| 492 } | |
| 493 | |
| 5604 | 494 tmp = m.nzmax (); |
| 5351 | 495 retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, |
| 5760 | 496 &tmp) >= 0; |
| 5164 | 497 H5Dclose (data_hid); |
| 498 if (!retval) | |
| 499 { | |
| 500 H5Sclose (space_hid); | |
| 501 H5Gclose (group_hid); | |
| 502 return false; | |
| 503 } | |
| 504 | |
| 505 H5Sclose (space_hid); | |
| 506 | |
| 507 hdims[0] = m.cols() + 1; | |
| 508 hdims[1] = 1; | |
| 509 | |
| 510 space_hid = H5Screate_simple (2, hdims, 0); | |
| 511 | |
| 512 if (space_hid < 0) | |
| 513 { | |
| 514 H5Gclose (group_hid); | |
| 515 return false; | |
| 516 } | |
| 517 | |
| 5351 | 518 data_hid = H5Dcreate (group_hid, "cidx", H5T_NATIVE_IDX, space_hid, |
| 5164 | 519 H5P_DEFAULT); |
| 520 if (data_hid < 0) | |
| 521 { | |
| 522 H5Sclose (space_hid); | |
| 523 H5Gclose (group_hid); | |
| 524 return false; | |
| 525 } | |
| 526 | |
| 5351 | 527 octave_idx_type * itmp = m.xcidx (); |
| 528 retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, | |
| 5760 | 529 itmp) >= 0; |
| 5164 | 530 H5Dclose (data_hid); |
| 531 if (!retval) | |
| 532 { | |
| 533 H5Sclose (space_hid); | |
| 534 H5Gclose (group_hid); | |
| 535 return false; | |
| 536 } | |
| 537 | |
| 538 H5Sclose (space_hid); | |
| 539 | |
| 5604 | 540 hdims[0] = m.nzmax (); |
| 5164 | 541 hdims[1] = 1; |
| 542 | |
| 543 space_hid = H5Screate_simple (2, hdims, 0); | |
| 544 | |
| 545 if (space_hid < 0) | |
| 546 { | |
| 547 H5Gclose (group_hid); | |
| 548 return false; | |
| 549 } | |
| 550 | |
| 5351 | 551 data_hid = H5Dcreate (group_hid, "ridx", H5T_NATIVE_IDX, space_hid, |
| 5164 | 552 H5P_DEFAULT); |
| 553 if (data_hid < 0) | |
| 554 { | |
| 555 H5Sclose (space_hid); | |
| 556 H5Gclose (group_hid); | |
| 557 return false; | |
| 558 } | |
| 559 | |
| 560 itmp = m.xridx (); | |
| 5351 | 561 retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, |
| 5760 | 562 itmp) >= 0; |
| 5164 | 563 H5Dclose (data_hid); |
| 564 if (!retval) | |
| 565 { | |
| 566 H5Sclose (space_hid); | |
| 567 H5Gclose (group_hid); | |
| 568 return false; | |
| 569 } | |
| 570 | |
| 571 hid_t save_type_hid = H5T_NATIVE_DOUBLE; | |
| 572 | |
| 573 if (save_as_floats) | |
| 574 { | |
| 575 if (m.too_large_for_float ()) | |
| 576 { | |
| 577 warning ("save: some values too large to save as floats --"); | |
| 578 warning ("save: saving as doubles instead"); | |
| 579 } | |
| 580 else | |
| 581 save_type_hid = H5T_NATIVE_FLOAT; | |
| 582 } | |
| 583 #if HAVE_HDF5_INT2FLOAT_CONVERSIONS | |
| 584 // hdf5 currently doesn't support float/integer conversions | |
| 585 else | |
| 586 { | |
| 587 double max_val, min_val; | |
| 588 | |
| 589 if (m.all_integers (max_val, min_val)) | |
| 590 save_type_hid | |
| 591 = save_type_to_hdf5 (get_save_type (max_val, min_val)); | |
| 592 } | |
| 593 #endif /* HAVE_HDF5_INT2FLOAT_CONVERSIONS */ | |
| 594 | |
| 595 data_hid = H5Dcreate (group_hid, "data", save_type_hid, space_hid, | |
| 596 H5P_DEFAULT); | |
| 597 if (data_hid < 0) | |
| 598 { | |
| 599 H5Sclose (space_hid); | |
| 600 H5Gclose (group_hid); | |
| 601 return false; | |
| 602 } | |
| 603 | |
| 604 double * dtmp = m.xdata (); | |
| 605 retval = H5Dwrite (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, | |
| 5760 | 606 H5P_DEFAULT, dtmp) >= 0; |
| 5164 | 607 H5Dclose (data_hid); |
| 608 H5Sclose (space_hid); | |
| 609 H5Gclose (group_hid); | |
| 610 | |
| 611 return retval; | |
| 612 } | |
| 613 | |
| 614 bool | |
| 615 octave_sparse_matrix::load_hdf5 (hid_t loc_id, const char *name, | |
| 5760 | 616 bool /* have_h5giterate_bug */) |
| 5164 | 617 { |
| 5351 | 618 octave_idx_type nr, nc, nz; |
| 5164 | 619 hid_t group_hid, data_hid, space_hid; |
| 620 hsize_t rank; | |
| 621 | |
| 622 dim_vector dv; | |
| 623 int empty = load_hdf5_empty (loc_id, name, dv); | |
| 624 if (empty > 0) | |
| 625 matrix.resize(dv); | |
| 626 if (empty) | |
| 627 return (empty > 0); | |
| 628 | |
| 629 group_hid = H5Gopen (loc_id, name); | |
| 5760 | 630 if (group_hid < 0) return false; |
| 5164 | 631 |
| 632 data_hid = H5Dopen (group_hid, "nr"); | |
| 633 space_hid = H5Dget_space (data_hid); | |
| 634 rank = H5Sget_simple_extent_ndims (space_hid); | |
| 635 | |
| 636 if (rank != 0) | |
| 637 { | |
| 638 H5Dclose (data_hid); | |
| 639 H5Gclose (group_hid); | |
| 640 return false; | |
| 641 } | |
| 642 | |
| 5351 | 643 if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, |
| 5760 | 644 H5P_DEFAULT, &nr) < 0) |
| 5164 | 645 { |
| 646 H5Dclose (data_hid); | |
| 647 H5Gclose (group_hid); | |
| 648 return false; | |
| 649 } | |
| 650 | |
| 651 H5Dclose (data_hid); | |
| 652 | |
| 653 data_hid = H5Dopen (group_hid, "nc"); | |
| 654 space_hid = H5Dget_space (data_hid); | |
| 655 rank = H5Sget_simple_extent_ndims (space_hid); | |
| 656 | |
| 657 if (rank != 0) | |
| 658 { | |
| 659 H5Dclose (data_hid); | |
| 660 H5Gclose (group_hid); | |
| 661 return false; | |
| 662 } | |
| 663 | |
| 5351 | 664 if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, |
| 5760 | 665 H5P_DEFAULT, &nc) < 0) |
| 5164 | 666 { |
| 667 H5Dclose (data_hid); | |
| 668 H5Gclose (group_hid); | |
| 669 return false; | |
| 670 } | |
| 671 | |
| 672 H5Dclose (data_hid); | |
| 673 | |
| 674 data_hid = H5Dopen (group_hid, "nz"); | |
| 675 space_hid = H5Dget_space (data_hid); | |
| 676 rank = H5Sget_simple_extent_ndims (space_hid); | |
| 677 | |
| 678 if (rank != 0) | |
| 679 { | |
| 680 H5Dclose (data_hid); | |
| 681 H5Gclose (group_hid); | |
| 682 return false; | |
| 683 } | |
| 684 | |
| 5351 | 685 if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, |
| 5760 | 686 H5P_DEFAULT, &nz) < 0) |
| 5164 | 687 { |
| 688 H5Dclose (data_hid); | |
| 689 H5Gclose (group_hid); | |
| 690 return false; | |
| 691 } | |
| 692 | |
| 693 H5Dclose (data_hid); | |
| 694 | |
| 5275 | 695 SparseMatrix m (static_cast<octave_idx_type> (nr), |
| 696 static_cast<octave_idx_type> (nc), | |
| 697 static_cast<octave_idx_type> (nz)); | |
| 5164 | 698 |
| 699 data_hid = H5Dopen (group_hid, "cidx"); | |
| 700 space_hid = H5Dget_space (data_hid); | |
| 701 rank = H5Sget_simple_extent_ndims (space_hid); | |
| 702 | |
| 703 if (rank != 2) | |
| 704 { | |
| 705 H5Sclose (space_hid); | |
| 706 H5Dclose (data_hid); | |
| 707 H5Gclose (group_hid); | |
| 708 return false; | |
| 709 } | |
| 710 | |
| 711 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank); | |
| 712 OCTAVE_LOCAL_BUFFER (hsize_t, maxdims, rank); | |
| 713 | |
| 714 H5Sget_simple_extent_dims (space_hid, hdims, maxdims); | |
| 715 | |
| 5322 | 716 if (static_cast<int> (hdims[0]) != nc + 1 || |
| 717 static_cast<int> (hdims[1]) != 1) | |
| 5164 | 718 { |
| 719 H5Sclose (space_hid); | |
| 720 H5Dclose (data_hid); | |
| 721 H5Gclose (group_hid); | |
| 722 return false; | |
| 723 } | |
| 724 | |
| 5351 | 725 octave_idx_type *itmp = m.xcidx (); |
| 726 if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, | |
| 5760 | 727 H5P_DEFAULT, itmp) < 0) |
| 5164 | 728 { |
| 729 H5Sclose (space_hid); | |
| 730 H5Dclose (data_hid); | |
| 731 H5Gclose (group_hid); | |
| 732 return false; | |
| 733 } | |
| 734 | |
| 735 H5Sclose (space_hid); | |
| 736 H5Dclose (data_hid); | |
| 737 | |
| 738 data_hid = H5Dopen (group_hid, "ridx"); | |
| 739 space_hid = H5Dget_space (data_hid); | |
| 740 rank = H5Sget_simple_extent_ndims (space_hid); | |
| 741 | |
| 742 if (rank != 2) | |
| 743 { | |
| 744 H5Sclose (space_hid); | |
| 745 H5Dclose (data_hid); | |
| 746 H5Gclose (group_hid); | |
| 747 return false; | |
| 748 } | |
| 749 | |
| 750 H5Sget_simple_extent_dims (space_hid, hdims, maxdims); | |
| 751 | |
| 5322 | 752 if (static_cast<int> (hdims[0]) != nz || static_cast<int> (hdims[1]) != 1) |
| 5164 | 753 { |
| 754 H5Sclose (space_hid); | |
| 755 H5Dclose (data_hid); | |
| 756 H5Gclose (group_hid); | |
| 757 return false; | |
| 758 } | |
| 759 | |
| 760 itmp = m.xridx (); | |
| 5351 | 761 if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, |
| 5760 | 762 H5P_DEFAULT, itmp) < 0) |
| 5164 | 763 { |
| 764 H5Sclose (space_hid); | |
| 765 H5Dclose (data_hid); | |
| 766 H5Gclose (group_hid); | |
| 767 return false; | |
| 768 } | |
| 769 | |
| 770 H5Sclose (space_hid); | |
| 771 H5Dclose (data_hid); | |
| 772 | |
| 773 data_hid = H5Dopen (group_hid, "data"); | |
| 774 space_hid = H5Dget_space (data_hid); | |
| 775 rank = H5Sget_simple_extent_ndims (space_hid); | |
| 776 | |
| 777 if (rank != 2) | |
| 778 { | |
| 779 H5Sclose (space_hid); | |
| 780 H5Dclose (data_hid); | |
| 781 H5Gclose (group_hid); | |
| 782 return false; | |
| 783 } | |
| 784 | |
| 785 H5Sget_simple_extent_dims (space_hid, hdims, maxdims); | |
| 786 | |
| 5322 | 787 if (static_cast<int> (hdims[0]) != nz || static_cast<int> (hdims[1]) != 1) |
| 5164 | 788 { |
| 789 H5Sclose (space_hid); | |
| 790 H5Dclose (data_hid); | |
| 791 H5Gclose (group_hid); | |
| 792 return false; | |
| 793 } | |
| 794 | |
| 795 double *dtmp = m.xdata (); | |
| 796 if (H5Dread (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, | |
| 5760 | 797 H5P_DEFAULT, dtmp) < 0) |
| 5164 | 798 { |
| 799 H5Sclose (space_hid); | |
| 800 H5Dclose (data_hid); | |
| 801 H5Gclose (group_hid); | |
| 802 return false; | |
| 803 } | |
| 804 | |
| 805 H5Sclose (space_hid); | |
| 806 H5Dclose (data_hid); | |
| 807 H5Gclose (group_hid); | |
| 808 | |
| 809 matrix = m; | |
| 810 | |
| 811 return true; | |
| 812 } | |
| 5900 | 813 |
| 5164 | 814 #endif |
| 815 | |
| 5900 | 816 mxArray * |
| 817 octave_sparse_matrix::as_mxArray (void) const | |
| 818 { | |
| 6686 | 819 mwSize nz = nzmax(); |
| 820 mwSize nr = rows(); | |
| 821 mwSize nc = columns(); | |
| 5903 | 822 mxArray *retval = new mxArray (mxDOUBLE_CLASS, nr, nc, nz, mxREAL); |
| 823 double *pr = static_cast<double *> (retval->get_data ()); | |
| 6686 | 824 mwIndex *ir = retval->get_ir(); |
| 825 mwIndex *jc = retval->get_jc(); | |
| 5903 | 826 |
| 6686 | 827 for (mwIndex i = 0; i < nz; i++) |
| 5903 | 828 { |
| 829 pr[i] = matrix.data(i); | |
| 830 ir[i] = matrix.ridx(i); | |
| 831 } | |
| 832 | |
| 6686 | 833 for (mwIndex i = 0; i < nc + 1; i++) |
| 5903 | 834 jc[i] = matrix.cidx(i); |
| 835 | |
| 836 return retval; | |
| 5900 | 837 } |
| 838 | |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
839 static bool |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
840 any_element_less_than (const SparseMatrix& a, double val) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
841 { |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
842 octave_idx_type len = a.nnz (); |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
843 |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
844 if (val > 0. && len != a.numel ()) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
845 return true; |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
846 |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
847 for (octave_idx_type i = 0; i < len; i++) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
848 { |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
849 OCTAVE_QUIT; |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
850 |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
851 if (a.data(i) < val) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
852 return true; |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
853 } |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
854 |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
855 return false; |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
856 } |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
857 |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
858 static bool |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
859 any_element_greater_than (const SparseMatrix& a, double val) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
860 { |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
861 octave_idx_type len = a.nnz (); |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
862 |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
863 if (val < 0. && len != a.numel ()) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
864 return true; |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
865 |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
866 for (octave_idx_type i = 0; i < len; i++) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
867 { |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
868 OCTAVE_QUIT; |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
869 |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
870 if (a.data(i) > val) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
871 return true; |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
872 } |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
873 |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
874 return false; |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
875 } |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
876 |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
877 #define SPARSE_MAPPER(MAP, AMAP, FCN) \ |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
878 octave_value \ |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
879 octave_sparse_matrix::MAP (void) const \ |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
880 { \ |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
881 static AMAP dmap = FCN; \ |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
882 return matrix.map (dmap); \ |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
883 } |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
884 |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
885 #define CD_SPARSE_MAPPER(MAP, RFCN, CFCN, L1, L2) \ |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
886 octave_value \ |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
887 octave_sparse_matrix::MAP (void) const \ |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
888 { \ |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
889 static NDArray::dmapper dmap = RFCN; \ |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
890 static NDArray::cmapper cmap = CFCN; \ |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
891 \ |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
892 return (any_element_less_than (matrix, L1) \ |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
893 ? octave_value (matrix.map (cmap)) \ |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
894 : (any_element_greater_than (matrix, L2) \ |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
895 ? octave_value (matrix.map (cmap)) \ |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
896 : octave_value (matrix.map (dmap)))); \ |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
897 } |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
898 |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
899 static double |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
900 xconj (double x) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
901 { |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
902 return x; |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
903 } |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
904 |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
905 SPARSE_MAPPER (erf, SparseMatrix::dmapper, ::erf) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
906 SPARSE_MAPPER (erfc, SparseMatrix::dmapper, ::erfc) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
907 SPARSE_MAPPER (gamma, SparseMatrix::dmapper, xgamma) |
|
7601
8a939b217863
Treat negative values to lgamma and beta correctly
David Bateman <dbateman@free.fr>
parents:
7503
diff
changeset
|
908 CD_SPARSE_MAPPER (lgamma, xlgamma, xlgamma, 0.0, octave_Inf) |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
909 SPARSE_MAPPER (abs, SparseMatrix::dmapper, ::fabs) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
910 SPARSE_MAPPER (acos, SparseMatrix::dmapper, ::acos) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
911 CD_SPARSE_MAPPER (acosh, ::acosh, ::acosh, 1.0, octave_Inf) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
912 SPARSE_MAPPER (angle, SparseMatrix::dmapper, ::arg) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
913 SPARSE_MAPPER (arg, SparseMatrix::dmapper, ::arg) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
914 CD_SPARSE_MAPPER (asin, ::asin, ::asin, -1.0, 1.0) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
915 SPARSE_MAPPER (asinh, SparseMatrix::dmapper, ::asinh) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
916 SPARSE_MAPPER (atan, SparseMatrix::dmapper, ::atan) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
917 CD_SPARSE_MAPPER (atanh, ::atanh, ::atanh, -1.0, 1.0) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
918 SPARSE_MAPPER (ceil, SparseMatrix::dmapper, ::ceil) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
919 SPARSE_MAPPER (conj, SparseMatrix::dmapper, xconj) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
920 SPARSE_MAPPER (cos, SparseMatrix::dmapper, ::cos) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
921 SPARSE_MAPPER (cosh, SparseMatrix::dmapper, ::cosh) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
922 SPARSE_MAPPER (exp, SparseMatrix::dmapper, ::exp) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
923 SPARSE_MAPPER (fix, SparseMatrix::dmapper, ::fix) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
924 SPARSE_MAPPER (floor, SparseMatrix::dmapper, ::floor) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
925 SPARSE_MAPPER (imag, SparseMatrix::dmapper, ::imag) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
926 CD_SPARSE_MAPPER (log, ::log, std::log, 0.0, octave_Inf) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
927 CD_SPARSE_MAPPER (log10, ::log10, std::log10, 0.0, octave_Inf) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
928 SPARSE_MAPPER (real, SparseMatrix::dmapper, ::real) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
929 SPARSE_MAPPER (round, SparseMatrix::dmapper, xround) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
930 SPARSE_MAPPER (signum, SparseMatrix::dmapper, ::signum) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
931 SPARSE_MAPPER (sin, SparseMatrix::dmapper, ::sin) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
932 SPARSE_MAPPER (sinh, SparseMatrix::dmapper, ::sinh) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
933 CD_SPARSE_MAPPER (sqrt, ::sqrt, std::sqrt, 0.0, octave_Inf) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
934 SPARSE_MAPPER (tan, SparseMatrix::dmapper, ::tan) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
935 SPARSE_MAPPER (tanh, SparseMatrix::dmapper, ::tanh) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
936 SPARSE_MAPPER (finite, SparseMatrix::bmapper, xfinite) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
937 SPARSE_MAPPER (isinf, SparseMatrix::bmapper, xisinf) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
938 SPARSE_MAPPER (isna, SparseMatrix::bmapper, octave_is_NA) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
939 SPARSE_MAPPER (isnan, SparseMatrix::bmapper, xisnan) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
940 |
| 5164 | 941 /* |
| 942 ;;; Local Variables: *** | |
| 943 ;;; mode: C++ *** | |
| 944 ;;; End: *** | |
| 945 */ |