Mercurial > octave-nkf
annotate libinterp/octave-value/ov-re-sparse.cc @ 20574:dd6345fd8a97
use exceptions for better invalid index error reporting (bug #45957)
* lo-array-gripes.h, lo-array-gripes.cc (index_exception):
New base class for indexing errors.
(invalid_index, out_of_range): New classes.
(gripe_index_out_of_range): New overloaded function.
(gripe_invalid_index): New overloaded functions.
Delete version with no arguments.
(gripe_invalid_assignment_size, gripe_assignment_dimension_mismatch):
Delete.
Change uses of gripe functions as needed.
* Cell.cc (Cell::index, Cell::assign, Cell::delete_elements): Use
exceptions to collect error info about and handle indexing errors.
* data.cc (Fnth_element, do_accumarray_sum, F__accumarray_sum__,
do_accumarray_minmax, do_accumarray_minmax_fun, F__accumdim_sum__):
Likewise.
* oct-map.cc (octave_map::index, octave_map::assign,
octave_map::delete_elements): Likewise.
* sparse.cc (Fsparse): Likewise.
* sub2ind.cc (Fsub2ind, Find2sub): Likewise. New tests.
* utils.cc (dims_to_numel): Likewise.
* ov-base-diag.cc (octave_base_diag<DMT, MT>::do_index_op,
octave_base_diag<DMT, MT>::subsasgn): Likewise.
* ov-base-mat.cc (octave_base_matrix<MT>::subsref,
octave_base_matrix<MT>::assign): Likewise.
* ov-base-sparse.cc (octave_base_sparse<T>::do_index_op,
octave_base_sparse<T>::assign,
octave_base_sparse<MT>::delete_elements): Likewise.
* ov-classdef.cc (cdef_object_array::subsref,
cdef_object_array::subsasgn): Likewise.
* ov-java.cc (make_java_index): Likewise.
* ov-perm.cc (octave_perm_matrix::do_index_op): Likewise.
* ov-range.cc (octave_range::do_index_op): Likewise.
* ov-re-diag.cc (octave_diag_matrix::do_index_op): Likewise.
* ov-str-mat.cc (octave_char_matrix_str::do_index_op_internal): Likewise.
* pt-assign.cc (tree_simple_assignment::rvalue1): Likewise.
* pt-idx.cc (tree_index_expression::rvalue,
tree_index_expression::lvalue): Likewise.
* Array-util.cc (sub2ind): Likewise.
* toplev.cc (main_loop): Also catch unhandled index_exception
exceptions.
* ov-base.cc (octave_base_value::index_vector): Improve error message.
* ov-re-sparse.cc (octave_sparse_matrix::index_vector): Likewise.
* ov-complex.cc (complex_index): New class.
(gripe_complex_index): New function.
(octave_complex::index_vector): Use it.
* pt-id.h, pt-id.cc (tree_identifier::is_variable,
tree_black_hole::is_variable): Now const.
* pt-idx.cc (final_index_error): New static function.
(tree_index_expression::rvalue, tree_index_expression::lvalue):
Use it.
* index.tst: New tests.
| author | Lachlan Andrew <lachlanbis@gmail.com> |
|---|---|
| date | Fri, 02 Oct 2015 15:07:37 -0400 |
| parents | aa36fb998a4d |
| children | f90c8372b7ba |
| rev | line source |
|---|---|
| 5164 | 1 /* |
| 2 | |
|
19731
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
19632
diff
changeset
|
3 Copyright (C) 2004-2015 David Bateman |
| 11523 | 4 Copyright (C) 1998-2004 Andy Adler |
| 7016 | 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 <iostream> | |
|
15215
9020dddc925a
use std::numeric_limits for integer max and min values
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
29 #include <limits> |
| 5164 | 30 #include <vector> |
| 31 | |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
32 #include "lo-specfun.h" |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
33 #include "lo-mappers.h" |
|
8377
25bc2d31e1bf
improve OCTAVE_LOCAL_BUFFER
Jaroslav Hajek <highegg@gmail.com>
parents:
7922
diff
changeset
|
34 #include "oct-locbuf.h" |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
35 |
|
15149
62a35ae7d6a2
use forward decls for mxArray in ov.h and ov-base.h
John W. Eaton <jwe@octave.org>
parents:
15057
diff
changeset
|
36 #include "mxarray.h" |
| 5164 | 37 #include "ov-base.h" |
| 38 #include "ov-scalar.h" | |
| 39 #include "gripes.h" | |
| 40 | |
|
19897
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19731
diff
changeset
|
41 #include "oct-hdf5.h" |
| 5164 | 42 #include "ls-hdf5.h" |
| 43 | |
| 44 #include "ov-re-sparse.h" | |
| 45 | |
| 46 #include "ov-base-sparse.h" | |
| 47 #include "ov-base-sparse.cc" | |
| 48 | |
| 49 #include "ov-bool-sparse.h" | |
| 50 | |
| 6109 | 51 template class OCTINTERP_API octave_base_sparse<SparseMatrix>; |
| 5164 | 52 |
| 53 | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
54 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_sparse_matrix, "sparse matrix", |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
55 "double"); |
| 5164 | 56 |
| 5282 | 57 idx_vector |
|
18129
e473c4853afc
enable non-integer ranges as indices by default and deprecate preference
John W. Eaton <jwe@octave.org>
parents:
17787
diff
changeset
|
58 octave_sparse_matrix::index_vector (bool /* require_integers */) const |
| 5282 | 59 { |
| 5604 | 60 if (matrix.numel () == matrix.nnz ()) |
| 5282 | 61 return idx_vector (array_value ()); |
| 62 else | |
| 63 { | |
|
20574
dd6345fd8a97
use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents:
20216
diff
changeset
|
64 std::string nm = "<" + type_name () + ">"; |
|
dd6345fd8a97
use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents:
20216
diff
changeset
|
65 gripe_invalid_index (nm.c_str ()); |
| 5282 | 66 return idx_vector (); |
| 67 } | |
| 68 } | |
| 69 | |
| 5759 | 70 octave_base_value * |
| 5164 | 71 octave_sparse_matrix::try_narrowing_conversion (void) |
| 72 { | |
| 5759 | 73 octave_base_value *retval = 0; |
| 5164 | 74 |
| 7193 | 75 if (Vsparse_auto_mutate) |
| 5164 | 76 { |
| 7193 | 77 // Don't use numel, since it can overflow for very large matrices |
| 78 // Note that for the second test, this means it becomes approximative | |
| 79 // since it involves a cast to double to avoid issues of overflow | |
| 80 if (matrix.rows () == 1 && matrix.cols () == 1) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
81 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
82 // Const copy of the matrix, so the right version of () operator used |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
83 const SparseMatrix tmp (matrix); |
| 5164 | 84 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
85 retval = new octave_scalar (tmp (0)); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
86 } |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
87 else if (matrix.cols () > 0 && matrix.rows () > 0 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
88 && (double (matrix.byte_size ()) > double (matrix.rows ()) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
89 * double (matrix.cols ()) * sizeof (double))) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
90 retval = new octave_matrix (matrix.matrix_value ()); |
| 5164 | 91 } |
| 92 | |
| 93 return retval; | |
| 94 } | |
| 95 | |
| 96 double | |
| 97 octave_sparse_matrix::double_value (bool) const | |
| 98 { | |
| 99 double retval = lo_ieee_nan_value (); | |
| 100 | |
| 101 if (numel () > 0) | |
| 102 { | |
| 6221 | 103 if (numel () > 1) |
|
14469
29aabe9b37a2
Rename array-as-vector, array-as-scalar warning IDs to match documentation (bug #35838)
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
104 gripe_implicit_conversion ("Octave:array-to-scalar", |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
105 "real sparse matrix", "real scalar"); |
| 5164 | 106 |
| 107 retval = matrix (0, 0); | |
| 108 } | |
| 109 else | |
| 110 gripe_invalid_conversion ("real sparse matrix", "real scalar"); | |
| 111 | |
| 112 return retval; | |
| 113 } | |
| 114 | |
| 115 Complex | |
| 116 octave_sparse_matrix::complex_value (bool) const | |
| 117 { | |
| 118 double tmp = lo_ieee_nan_value (); | |
| 119 | |
| 120 Complex retval (tmp, tmp); | |
| 121 | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
122 // FIXME: maybe this should be a function, valid_as_scalar() |
| 5164 | 123 if (rows () > 0 && columns () > 0) |
| 124 { | |
| 6221 | 125 if (numel () > 1) |
|
14469
29aabe9b37a2
Rename array-as-vector, array-as-scalar warning IDs to match documentation (bug #35838)
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
126 gripe_implicit_conversion ("Octave:array-to-scalar", |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
127 "real sparse matrix", "complex scalar"); |
| 5164 | 128 |
| 129 retval = matrix (0, 0); | |
| 130 } | |
| 131 else | |
| 132 gripe_invalid_conversion ("real sparse matrix", "complex scalar"); | |
| 133 | |
| 134 return retval; | |
| 135 } | |
| 136 | |
| 137 Matrix | |
| 138 octave_sparse_matrix::matrix_value (bool) const | |
| 139 { | |
| 140 return matrix.matrix_value (); | |
| 141 } | |
| 142 | |
| 5898 | 143 boolNDArray |
| 5943 | 144 octave_sparse_matrix::bool_array_value (bool warn) const |
| 5898 | 145 { |
| 5943 | 146 NDArray m = matrix.matrix_value (); |
| 147 | |
|
7922
935be827eaf8
error for NaN values in & and | expressions
John W. Eaton <jwe@octave.org>
parents:
7885
diff
changeset
|
148 if (m.any_element_is_nan ()) |
|
11129
0de5cc44e690
use gripe functions for NaN to logical and NaN to character conversions more consistently
John W. Eaton <jwe@octave.org>
parents:
10527
diff
changeset
|
149 gripe_nan_to_logical_conversion (); |
|
7922
935be827eaf8
error for NaN values in & and | expressions
John W. Eaton <jwe@octave.org>
parents:
7885
diff
changeset
|
150 else if (warn && m.any_element_not_one_or_zero ()) |
| 5943 | 151 gripe_logical_conversion (); |
| 152 | |
| 153 return boolNDArray (m); | |
| 5898 | 154 } |
| 155 | |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
156 charNDArray |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
157 octave_sparse_matrix::char_array_value (bool) const |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
158 { |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
159 charNDArray retval (dims (), 0); |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
160 octave_idx_type nc = matrix.cols (); |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
161 octave_idx_type nr = matrix.rows (); |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
162 |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
163 for (octave_idx_type j = 0; j < nc; j++) |
|
14861
f7afecdd87ef
maint: Use Octave coding conventions for cuddling parentheses in src/ directory
Rik <octave@nomad.inbox5.com>
parents:
14846
diff
changeset
|
164 for (octave_idx_type i = matrix.cidx (j); i < matrix.cidx (j+1); i++) |
|
f7afecdd87ef
maint: Use Octave coding conventions for cuddling parentheses in src/ directory
Rik <octave@nomad.inbox5.com>
parents:
14846
diff
changeset
|
165 retval(matrix.ridx (i) + nr * j) = static_cast<char>(matrix.data (i)); |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
166 |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
167 return retval; |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
168 } |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
169 |
| 5164 | 170 ComplexMatrix |
| 171 octave_sparse_matrix::complex_matrix_value (bool) const | |
| 172 { | |
| 173 return ComplexMatrix (matrix.matrix_value ()); | |
| 174 } | |
| 175 | |
| 176 ComplexNDArray | |
| 177 octave_sparse_matrix::complex_array_value (bool) const | |
| 178 { | |
| 179 return ComplexNDArray (ComplexMatrix (matrix.matrix_value ())); | |
| 180 } | |
| 181 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
182 NDArray |
| 5164 | 183 octave_sparse_matrix::array_value (bool) const |
| 184 { | |
| 185 return NDArray (matrix.matrix_value ()); | |
| 186 } | |
| 187 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
188 SparseBoolMatrix |
|
9852
aabf7a8c2e57
implement sparse logical conversion
Jaroslav Hajek <highegg@gmail.com>
parents:
9835
diff
changeset
|
189 octave_sparse_matrix::sparse_bool_matrix_value (bool warn) const |
|
aabf7a8c2e57
implement sparse logical conversion
Jaroslav Hajek <highegg@gmail.com>
parents:
9835
diff
changeset
|
190 { |
|
aabf7a8c2e57
implement sparse logical conversion
Jaroslav Hajek <highegg@gmail.com>
parents:
9835
diff
changeset
|
191 if (matrix.any_element_is_nan ()) |
|
11129
0de5cc44e690
use gripe functions for NaN to logical and NaN to character conversions more consistently
John W. Eaton <jwe@octave.org>
parents:
10527
diff
changeset
|
192 gripe_nan_to_logical_conversion (); |
|
9852
aabf7a8c2e57
implement sparse logical conversion
Jaroslav Hajek <highegg@gmail.com>
parents:
9835
diff
changeset
|
193 else if (warn && matrix.any_element_not_one_or_zero ()) |
|
aabf7a8c2e57
implement sparse logical conversion
Jaroslav Hajek <highegg@gmail.com>
parents:
9835
diff
changeset
|
194 gripe_logical_conversion (); |
|
aabf7a8c2e57
implement sparse logical conversion
Jaroslav Hajek <highegg@gmail.com>
parents:
9835
diff
changeset
|
195 |
|
aabf7a8c2e57
implement sparse logical conversion
Jaroslav Hajek <highegg@gmail.com>
parents:
9835
diff
changeset
|
196 return mx_el_ne (matrix, 0.0); |
|
aabf7a8c2e57
implement sparse logical conversion
Jaroslav Hajek <highegg@gmail.com>
parents:
9835
diff
changeset
|
197 } |
|
aabf7a8c2e57
implement sparse logical conversion
Jaroslav Hajek <highegg@gmail.com>
parents:
9835
diff
changeset
|
198 |
| 5282 | 199 octave_value |
| 5322 | 200 octave_sparse_matrix::convert_to_str_internal (bool, bool, char type) const |
| 5282 | 201 { |
| 202 octave_value retval; | |
| 203 dim_vector dv = dims (); | |
| 204 octave_idx_type nel = dv.numel (); | |
| 205 | |
| 206 if (nel == 0) | |
| 207 { | |
| 208 char s = '\0'; | |
| 5322 | 209 retval = octave_value (&s, type); |
| 5282 | 210 } |
| 211 else | |
| 212 { | |
| 213 octave_idx_type nr = matrix.rows (); | |
| 214 octave_idx_type nc = matrix.cols (); | |
| 215 charNDArray chm (dv, static_cast<char> (0)); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
216 |
| 5282 | 217 bool warned = false; |
| 218 | |
| 219 for (octave_idx_type j = 0; j < nc; j++) | |
|
14861
f7afecdd87ef
maint: Use Octave coding conventions for cuddling parentheses in src/ directory
Rik <octave@nomad.inbox5.com>
parents:
14846
diff
changeset
|
220 for (octave_idx_type i = matrix.cidx (j); |
|
f7afecdd87ef
maint: Use Octave coding conventions for cuddling parentheses in src/ directory
Rik <octave@nomad.inbox5.com>
parents:
14846
diff
changeset
|
221 i < matrix.cidx (j+1); i++) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
222 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
223 octave_quit (); |
| 5282 | 224 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
225 double d = matrix.data (i); |
| 5282 | 226 |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
227 if (xisnan (d)) |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
228 { |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
229 gripe_nan_to_character_conversion (); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
230 return retval; |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
231 } |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
232 else |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
233 { |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
234 int ival = NINT (d); |
| 5282 | 235 |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
236 if (ival < 0 |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
237 || ival > std::numeric_limits<unsigned char>::max ()) |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
238 { |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
239 // FIXME: is there something better we could do? |
| 5282 | 240 |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
241 ival = 0; |
| 5282 | 242 |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
243 if (! warned) |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
244 { |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
245 ::warning ("range error for conversion to character value"); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
246 warned = true; |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
247 } |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
248 } |
| 5282 | 249 |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
250 chm (matrix.ridx (i) + j * nr) = |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
251 static_cast<char> (ival); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
252 } |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
253 } |
|
9689
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9470
diff
changeset
|
254 |
|
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9470
diff
changeset
|
255 retval = octave_value (chm, type); |
| 5282 | 256 } |
| 257 | |
| 258 return retval; | |
| 259 } | |
| 260 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
261 bool |
| 5164 | 262 octave_sparse_matrix::save_binary (std::ostream& os, bool&save_as_floats) |
| 263 { | |
| 264 dim_vector d = this->dims (); | |
|
14846
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14770
diff
changeset
|
265 if (d.length () < 1) |
| 5164 | 266 return false; |
| 267 | |
| 268 // Ensure that additional memory is deallocated | |
| 269 matrix.maybe_compress (); | |
| 270 | |
| 271 int nr = d(0); | |
| 272 int nc = d(1); | |
|
10527
b4d2080b6df7
Replace nzmax by nnz as needed
David Bateman <dbateman@free.fr>
parents:
10414
diff
changeset
|
273 int nz = nnz (); |
| 5164 | 274 |
| 5828 | 275 int32_t itmp; |
| 5164 | 276 // Use negative value for ndims to be consistent with other formats |
|
18772
3bffa847d215
maint: Use space after variable name and before equals sign.
Rik <rik@octave.org>
parents:
18131
diff
changeset
|
277 itmp = -2; |
| 5760 | 278 os.write (reinterpret_cast<char *> (&itmp), 4); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
279 |
|
18772
3bffa847d215
maint: Use space after variable name and before equals sign.
Rik <rik@octave.org>
parents:
18131
diff
changeset
|
280 itmp = nr; |
| 5760 | 281 os.write (reinterpret_cast<char *> (&itmp), 4); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
282 |
|
18772
3bffa847d215
maint: Use space after variable name and before equals sign.
Rik <rik@octave.org>
parents:
18131
diff
changeset
|
283 itmp = nc; |
| 5760 | 284 os.write (reinterpret_cast<char *> (&itmp), 4); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
285 |
|
18772
3bffa847d215
maint: Use space after variable name and before equals sign.
Rik <rik@octave.org>
parents:
18131
diff
changeset
|
286 itmp = nz; |
| 5760 | 287 os.write (reinterpret_cast<char *> (&itmp), 4); |
| 5164 | 288 |
| 289 save_type st = LS_DOUBLE; | |
| 290 if (save_as_floats) | |
| 291 { | |
| 292 if (matrix.too_large_for_float ()) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
293 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
294 warning ("save: some values too large to save as floats --"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
295 warning ("save: saving as doubles instead"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
296 } |
| 5164 | 297 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
298 st = LS_FLOAT; |
| 5164 | 299 } |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
300 else if (matrix.nnz () > 8192) // FIXME: make this configurable. |
| 5164 | 301 { |
| 302 double max_val, min_val; | |
| 303 if (matrix.all_integers (max_val, min_val)) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
304 st = get_save_type (max_val, min_val); |
| 5164 | 305 } |
| 306 | |
| 307 // add one to the printed indices to go from | |
| 308 // zero-based to one-based arrays | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
309 for (int i = 0; i < nc+1; i++) |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
310 { |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
311 octave_quit (); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
312 itmp = matrix.cidx (i); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
313 os.write (reinterpret_cast<char *> (&itmp), 4); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
314 } |
| 5164 | 315 |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
316 for (int i = 0; i < nz; i++) |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
317 { |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
318 octave_quit (); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
319 itmp = matrix.ridx (i); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
320 os.write (reinterpret_cast<char *> (&itmp), 4); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
321 } |
| 5164 | 322 |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
323 write_doubles (os, matrix.data (), st, nz); |
| 5164 | 324 |
| 325 return true; | |
| 326 } | |
| 327 | |
| 328 bool | |
| 329 octave_sparse_matrix::load_binary (std::istream& is, bool swap, | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
330 oct_mach_info::float_format fmt) |
| 5164 | 331 { |
| 5828 | 332 int32_t nz, nc, nr, tmp; |
| 5327 | 333 char ctmp; |
| 334 | |
| 5760 | 335 if (! is.read (reinterpret_cast<char *> (&tmp), 4)) |
| 5164 | 336 return false; |
| 337 | |
| 338 if (swap) | |
| 339 swap_bytes<4> (&tmp); | |
| 340 | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
341 if (tmp != -2) |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
342 { |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
343 error ("load: only 2-D sparse matrices are supported"); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
344 return false; |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
345 } |
| 5164 | 346 |
| 5760 | 347 if (! is.read (reinterpret_cast<char *> (&nr), 4)) |
| 5164 | 348 return false; |
| 5760 | 349 if (! is.read (reinterpret_cast<char *> (&nc), 4)) |
| 5164 | 350 return false; |
| 5760 | 351 if (! is.read (reinterpret_cast<char *> (&nz), 4)) |
| 5164 | 352 return false; |
| 353 | |
| 354 if (swap) | |
| 355 { | |
| 356 swap_bytes<4> (&nr); | |
| 357 swap_bytes<4> (&nc); | |
| 358 swap_bytes<4> (&nz); | |
| 359 } | |
| 360 | |
| 5275 | 361 SparseMatrix m (static_cast<octave_idx_type> (nr), |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
362 static_cast<octave_idx_type> (nc), |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
363 static_cast<octave_idx_type> (nz)); |
| 5164 | 364 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
365 for (int i = 0; i < nc+1; i++) |
| 5164 | 366 { |
|
10142
829e69ec3110
make OCTAVE_QUIT a function
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
367 octave_quit (); |
| 5760 | 368 if (! is.read (reinterpret_cast<char *> (&tmp), 4)) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
369 return false; |
| 5164 | 370 if (swap) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
371 swap_bytes<4> (&tmp); |
|
14861
f7afecdd87ef
maint: Use Octave coding conventions for cuddling parentheses in src/ directory
Rik <octave@nomad.inbox5.com>
parents:
14846
diff
changeset
|
372 m.xcidx (i) = tmp; |
| 5164 | 373 } |
| 374 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
375 for (int i = 0; i < nz; i++) |
| 5164 | 376 { |
|
10142
829e69ec3110
make OCTAVE_QUIT a function
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
377 octave_quit (); |
| 5760 | 378 if (! is.read (reinterpret_cast<char *> (&tmp), 4)) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
379 return false; |
| 5164 | 380 if (swap) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
381 swap_bytes<4> (&tmp); |
|
14861
f7afecdd87ef
maint: Use Octave coding conventions for cuddling parentheses in src/ directory
Rik <octave@nomad.inbox5.com>
parents:
14846
diff
changeset
|
382 m.xridx (i) = tmp; |
| 5164 | 383 } |
| 384 | |
| 5760 | 385 if (! is.read (reinterpret_cast<char *> (&ctmp), 1)) |
| 5164 | 386 return false; |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
387 |
| 5760 | 388 read_doubles (is, m.xdata (), static_cast<save_type> (ctmp), nz, swap, fmt); |
| 5164 | 389 |
| 390 if (error_state || ! is) | |
| 391 return false; | |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
392 |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
393 if (! m.indices_ok ()) |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
394 return false; |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
395 |
| 5164 | 396 matrix = m; |
| 397 | |
| 398 return true; | |
| 399 } | |
| 400 | |
|
19897
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19731
diff
changeset
|
401 bool |
|
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19731
diff
changeset
|
402 octave_sparse_matrix::save_hdf5 (octave_hdf5_id loc_id, const char *name, |
|
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19731
diff
changeset
|
403 bool save_as_floats) |
|
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19731
diff
changeset
|
404 { |
|
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19731
diff
changeset
|
405 bool retval = false; |
|
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19731
diff
changeset
|
406 |
| 5164 | 407 #if defined (HAVE_HDF5) |
| 5900 | 408 |
| 5164 | 409 dim_vector dv = dims (); |
| 410 int empty = save_hdf5_empty (loc_id, name, dv); | |
| 411 if (empty) | |
| 412 return (empty > 0); | |
| 413 | |
| 414 // Ensure that additional memory is deallocated | |
| 415 matrix.maybe_compress (); | |
| 416 | |
|
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
|
417 #if HAVE_HDF5_18 |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
418 hid_t group_hid = H5Gcreate (loc_id, name, H5P_DEFAULT, H5P_DEFAULT, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
419 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
|
420 #else |
| 5164 | 421 hid_t group_hid = H5Gcreate (loc_id, name, 0); |
|
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
|
422 #endif |
| 5164 | 423 if (group_hid < 0) |
| 424 return false; | |
| 425 | |
|
18099
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
426 hid_t space_hid, data_hid; |
|
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
427 space_hid = data_hid = -1; |
| 5164 | 428 SparseMatrix m = sparse_matrix_value (); |
| 5351 | 429 octave_idx_type tmp; |
| 5164 | 430 hsize_t hdims[2]; |
| 431 | |
| 5760 | 432 space_hid = H5Screate_simple (0, hdims, 0); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
433 if (space_hid < 0) |
| 5164 | 434 { |
| 435 H5Gclose (group_hid); | |
| 436 return false; | |
| 437 } | |
|
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
|
438 #if HAVE_HDF5_18 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
439 data_hid = H5Dcreate (group_hid, "nr", H5T_NATIVE_IDX, space_hid, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
440 H5P_DEFAULT, H5P_DEFAULT, 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
|
441 #else |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
442 data_hid = H5Dcreate (group_hid, "nr", H5T_NATIVE_IDX, space_hid, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
443 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
|
444 #endif |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
445 if (data_hid < 0) |
| 5164 | 446 { |
| 447 H5Sclose (space_hid); | |
| 448 H5Gclose (group_hid); | |
| 449 return false; | |
| 450 } | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
451 |
| 5164 | 452 tmp = m.rows (); |
| 5351 | 453 retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
454 &tmp) >= 0; |
| 5164 | 455 H5Dclose (data_hid); |
| 456 if (!retval) | |
| 457 { | |
| 458 H5Sclose (space_hid); | |
| 459 H5Gclose (group_hid); | |
| 460 return false; | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
461 } |
|
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
|
462 #if HAVE_HDF5_18 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
463 data_hid = H5Dcreate (group_hid, "nc", H5T_NATIVE_IDX, space_hid, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
464 H5P_DEFAULT, H5P_DEFAULT, 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
|
465 #else |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
466 data_hid = H5Dcreate (group_hid, "nc", H5T_NATIVE_IDX, space_hid, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
467 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
|
468 #endif |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
469 if (data_hid < 0) |
| 5164 | 470 { |
| 471 H5Sclose (space_hid); | |
| 472 H5Gclose (group_hid); | |
| 473 return false; | |
| 474 } | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
475 |
| 5164 | 476 tmp = m.cols (); |
| 5351 | 477 retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
478 &tmp) >= 0; |
| 5164 | 479 H5Dclose (data_hid); |
| 480 if (!retval) | |
| 481 { | |
| 482 H5Sclose (space_hid); | |
| 483 H5Gclose (group_hid); | |
| 484 return false; | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
485 } |
| 5164 | 486 |
|
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
|
487 #if HAVE_HDF5_18 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
488 data_hid = H5Dcreate (group_hid, "nz", H5T_NATIVE_IDX, space_hid, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
489 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
490 #else |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
491 data_hid = H5Dcreate (group_hid, "nz", H5T_NATIVE_IDX, space_hid, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
492 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
|
493 #endif |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
494 if (data_hid < 0) |
| 5164 | 495 { |
| 496 H5Sclose (space_hid); | |
| 497 H5Gclose (group_hid); | |
| 498 return false; | |
| 499 } | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
500 |
|
10527
b4d2080b6df7
Replace nzmax by nnz as needed
David Bateman <dbateman@free.fr>
parents:
10414
diff
changeset
|
501 tmp = m.nnz (); |
| 5351 | 502 retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
503 &tmp) >= 0; |
| 5164 | 504 H5Dclose (data_hid); |
| 505 if (!retval) | |
| 506 { | |
| 507 H5Sclose (space_hid); | |
| 508 H5Gclose (group_hid); | |
| 509 return false; | |
| 510 } | |
| 511 | |
| 512 H5Sclose (space_hid); | |
| 513 | |
|
14846
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14770
diff
changeset
|
514 hdims[0] = m.cols () + 1; |
| 5164 | 515 hdims[1] = 1; |
| 516 | |
| 517 space_hid = H5Screate_simple (2, hdims, 0); | |
| 518 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
519 if (space_hid < 0) |
| 5164 | 520 { |
| 521 H5Gclose (group_hid); | |
| 522 return false; | |
| 523 } | |
| 524 | |
|
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
|
525 #if HAVE_HDF5_18 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
526 data_hid = H5Dcreate (group_hid, "cidx", H5T_NATIVE_IDX, space_hid, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
527 H5P_DEFAULT, H5P_DEFAULT, 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
|
528 #else |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
529 data_hid = H5Dcreate (group_hid, "cidx", H5T_NATIVE_IDX, space_hid, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
530 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
|
531 #endif |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
532 if (data_hid < 0) |
| 5164 | 533 { |
| 534 H5Sclose (space_hid); | |
| 535 H5Gclose (group_hid); | |
| 536 return false; | |
| 537 } | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
538 |
| 5351 | 539 octave_idx_type * itmp = m.xcidx (); |
| 540 retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
541 itmp) >= 0; |
| 5164 | 542 H5Dclose (data_hid); |
| 543 if (!retval) | |
| 544 { | |
| 545 H5Sclose (space_hid); | |
| 546 H5Gclose (group_hid); | |
| 547 return false; | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
548 } |
| 5164 | 549 |
| 550 H5Sclose (space_hid); | |
| 551 | |
|
10527
b4d2080b6df7
Replace nzmax by nnz as needed
David Bateman <dbateman@free.fr>
parents:
10414
diff
changeset
|
552 hdims[0] = m.nnz (); |
| 5164 | 553 hdims[1] = 1; |
| 554 | |
| 555 space_hid = H5Screate_simple (2, hdims, 0); | |
| 556 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
557 if (space_hid < 0) |
| 5164 | 558 { |
| 559 H5Gclose (group_hid); | |
| 560 return false; | |
| 561 } | |
|
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
|
562 #if HAVE_HDF5_18 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
563 data_hid = H5Dcreate (group_hid, "ridx", H5T_NATIVE_IDX, space_hid, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
564 H5P_DEFAULT, H5P_DEFAULT, 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
|
565 #else |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
566 data_hid = H5Dcreate (group_hid, "ridx", H5T_NATIVE_IDX, space_hid, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
567 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
|
568 #endif |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
569 if (data_hid < 0) |
| 5164 | 570 { |
| 571 H5Sclose (space_hid); | |
| 572 H5Gclose (group_hid); | |
| 573 return false; | |
| 574 } | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
575 |
| 5164 | 576 itmp = m.xridx (); |
| 5351 | 577 retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
578 itmp) >= 0; |
| 5164 | 579 H5Dclose (data_hid); |
| 580 if (!retval) | |
| 581 { | |
| 582 H5Sclose (space_hid); | |
| 583 H5Gclose (group_hid); | |
| 584 return false; | |
| 585 } | |
| 586 | |
| 587 hid_t save_type_hid = H5T_NATIVE_DOUBLE; | |
| 588 | |
| 589 if (save_as_floats) | |
| 590 { | |
| 591 if (m.too_large_for_float ()) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
592 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
593 warning ("save: some values too large to save as floats --"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
594 warning ("save: saving as doubles instead"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
595 } |
| 5164 | 596 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
597 save_type_hid = H5T_NATIVE_FLOAT; |
| 5164 | 598 } |
| 599 #if HAVE_HDF5_INT2FLOAT_CONVERSIONS | |
| 600 // hdf5 currently doesn't support float/integer conversions | |
| 601 else | |
| 602 { | |
| 603 double max_val, min_val; | |
| 604 | |
| 605 if (m.all_integers (max_val, min_val)) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
606 save_type_hid |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
607 = save_type_to_hdf5 (get_save_type (max_val, min_val)); |
| 5164 | 608 } |
| 609 #endif /* HAVE_HDF5_INT2FLOAT_CONVERSIONS */ | |
| 610 | |
|
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
|
611 #if HAVE_HDF5_18 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
612 data_hid = H5Dcreate (group_hid, "data", save_type_hid, space_hid, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
613 H5P_DEFAULT, H5P_DEFAULT, 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
|
614 #else |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
615 data_hid = H5Dcreate (group_hid, "data", save_type_hid, space_hid, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
616 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
|
617 #endif |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
618 if (data_hid < 0) |
| 5164 | 619 { |
| 620 H5Sclose (space_hid); | |
| 621 H5Gclose (group_hid); | |
| 622 return false; | |
| 623 } | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
624 |
| 5164 | 625 double * dtmp = m.xdata (); |
| 626 retval = H5Dwrite (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
627 H5P_DEFAULT, dtmp) >= 0; |
| 5164 | 628 H5Dclose (data_hid); |
| 629 H5Sclose (space_hid); | |
| 630 H5Gclose (group_hid); | |
| 631 | |
|
19897
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19731
diff
changeset
|
632 #else |
|
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19731
diff
changeset
|
633 gripe_save ("hdf5"); |
|
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19731
diff
changeset
|
634 #endif |
|
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19731
diff
changeset
|
635 |
| 5164 | 636 return retval; |
| 637 } | |
| 638 | |
| 639 bool | |
|
19897
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19731
diff
changeset
|
640 octave_sparse_matrix::load_hdf5 (octave_hdf5_id loc_id, const char *name) |
| 5164 | 641 { |
|
19897
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19731
diff
changeset
|
642 bool retval = false; |
|
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19731
diff
changeset
|
643 |
|
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19731
diff
changeset
|
644 #if defined (HAVE_HDF5) |
|
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19731
diff
changeset
|
645 |
| 5351 | 646 octave_idx_type nr, nc, nz; |
| 5164 | 647 hid_t group_hid, data_hid, space_hid; |
| 648 hsize_t rank; | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
649 |
| 5164 | 650 dim_vector dv; |
| 651 int empty = load_hdf5_empty (loc_id, name, dv); | |
| 652 if (empty > 0) | |
|
14861
f7afecdd87ef
maint: Use Octave coding conventions for cuddling parentheses in src/ directory
Rik <octave@nomad.inbox5.com>
parents:
14846
diff
changeset
|
653 matrix.resize (dv); |
| 5164 | 654 if (empty) |
| 655 return (empty > 0); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
656 |
|
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
|
657 #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
|
658 group_hid = H5Gopen (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
|
659 #else |
| 5164 | 660 group_hid = H5Gopen (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
|
661 #endif |
| 5760 | 662 if (group_hid < 0) return false; |
| 5164 | 663 |
|
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
|
664 #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
|
665 data_hid = H5Dopen (group_hid, "nr", 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
|
666 #else |
| 5164 | 667 data_hid = H5Dopen (group_hid, "nr"); |
|
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
|
668 #endif |
| 5164 | 669 space_hid = H5Dget_space (data_hid); |
| 670 rank = H5Sget_simple_extent_ndims (space_hid); | |
| 671 | |
| 672 if (rank != 0) | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
673 { |
| 5164 | 674 H5Dclose (data_hid); |
| 675 H5Gclose (group_hid); | |
| 676 return false; | |
| 677 } | |
| 678 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
679 if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
680 H5P_DEFAULT, &nr) < 0) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
681 { |
| 5164 | 682 H5Dclose (data_hid); |
| 683 H5Gclose (group_hid); | |
| 684 return false; | |
| 685 } | |
| 686 | |
| 687 H5Dclose (data_hid); | |
| 688 | |
|
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
|
689 #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
|
690 data_hid = H5Dopen (group_hid, "nc", 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
|
691 #else |
| 5164 | 692 data_hid = H5Dopen (group_hid, "nc"); |
|
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
|
693 #endif |
| 5164 | 694 space_hid = H5Dget_space (data_hid); |
| 695 rank = H5Sget_simple_extent_ndims (space_hid); | |
| 696 | |
| 697 if (rank != 0) | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
698 { |
| 5164 | 699 H5Dclose (data_hid); |
| 700 H5Gclose (group_hid); | |
| 701 return false; | |
| 702 } | |
| 703 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
704 if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
705 H5P_DEFAULT, &nc) < 0) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
706 { |
| 5164 | 707 H5Dclose (data_hid); |
| 708 H5Gclose (group_hid); | |
| 709 return false; | |
| 710 } | |
| 711 | |
| 712 H5Dclose (data_hid); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
713 |
|
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
|
714 #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
|
715 data_hid = H5Dopen (group_hid, "nz", 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
|
716 #else |
| 5164 | 717 data_hid = H5Dopen (group_hid, "nz"); |
|
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
|
718 #endif |
| 5164 | 719 space_hid = H5Dget_space (data_hid); |
| 720 rank = H5Sget_simple_extent_ndims (space_hid); | |
| 721 | |
| 722 if (rank != 0) | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
723 { |
| 5164 | 724 H5Dclose (data_hid); |
| 725 H5Gclose (group_hid); | |
| 726 return false; | |
| 727 } | |
| 728 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
729 if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
730 H5P_DEFAULT, &nz) < 0) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
731 { |
| 5164 | 732 H5Dclose (data_hid); |
| 733 H5Gclose (group_hid); | |
| 734 return false; | |
| 735 } | |
| 736 | |
| 737 H5Dclose (data_hid); | |
| 738 | |
| 5275 | 739 SparseMatrix m (static_cast<octave_idx_type> (nr), |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
740 static_cast<octave_idx_type> (nc), |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
741 static_cast<octave_idx_type> (nz)); |
| 5164 | 742 |
|
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
|
743 #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
|
744 data_hid = H5Dopen (group_hid, "cidx", 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
|
745 #else |
| 5164 | 746 data_hid = H5Dopen (group_hid, "cidx"); |
|
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
|
747 #endif |
| 5164 | 748 space_hid = H5Dget_space (data_hid); |
| 749 rank = H5Sget_simple_extent_ndims (space_hid); | |
| 750 | |
| 751 if (rank != 2) | |
| 752 { | |
| 753 H5Sclose (space_hid); | |
| 754 H5Dclose (data_hid); | |
| 755 H5Gclose (group_hid); | |
| 756 return false; | |
| 757 } | |
| 758 | |
| 759 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank); | |
| 760 OCTAVE_LOCAL_BUFFER (hsize_t, maxdims, rank); | |
| 761 | |
| 762 H5Sget_simple_extent_dims (space_hid, hdims, maxdims); | |
| 763 | |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
764 if (static_cast<int> (hdims[0]) != nc + 1 |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
765 || static_cast<int> (hdims[1]) != 1) |
| 5164 | 766 { |
| 767 H5Sclose (space_hid); | |
| 768 H5Dclose (data_hid); | |
| 769 H5Gclose (group_hid); | |
| 770 return false; | |
| 771 } | |
| 772 | |
| 5351 | 773 octave_idx_type *itmp = m.xcidx (); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
774 if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
775 H5P_DEFAULT, itmp) < 0) |
| 5164 | 776 { |
| 777 H5Sclose (space_hid); | |
| 778 H5Dclose (data_hid); | |
| 779 H5Gclose (group_hid); | |
| 780 return false; | |
| 781 } | |
| 782 | |
| 783 H5Sclose (space_hid); | |
| 784 H5Dclose (data_hid); | |
| 785 | |
|
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
|
786 #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
|
787 data_hid = H5Dopen (group_hid, "ridx", 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
|
788 #else |
| 5164 | 789 data_hid = H5Dopen (group_hid, "ridx"); |
|
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
|
790 #endif |
| 5164 | 791 space_hid = H5Dget_space (data_hid); |
| 792 rank = H5Sget_simple_extent_ndims (space_hid); | |
| 793 | |
| 794 if (rank != 2) | |
| 795 { | |
| 796 H5Sclose (space_hid); | |
| 797 H5Dclose (data_hid); | |
| 798 H5Gclose (group_hid); | |
| 799 return false; | |
| 800 } | |
| 801 | |
| 802 H5Sget_simple_extent_dims (space_hid, hdims, maxdims); | |
| 803 | |
| 5322 | 804 if (static_cast<int> (hdims[0]) != nz || static_cast<int> (hdims[1]) != 1) |
| 5164 | 805 { |
| 806 H5Sclose (space_hid); | |
| 807 H5Dclose (data_hid); | |
| 808 H5Gclose (group_hid); | |
| 809 return false; | |
| 810 } | |
| 811 | |
| 812 itmp = m.xridx (); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
813 if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
814 H5P_DEFAULT, itmp) < 0) |
| 5164 | 815 { |
| 816 H5Sclose (space_hid); | |
| 817 H5Dclose (data_hid); | |
| 818 H5Gclose (group_hid); | |
| 819 return false; | |
| 820 } | |
| 821 | |
| 822 H5Sclose (space_hid); | |
| 823 H5Dclose (data_hid); | |
| 824 | |
|
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
|
825 #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
|
826 data_hid = H5Dopen (group_hid, "data", 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
|
827 #else |
| 5164 | 828 data_hid = H5Dopen (group_hid, "data"); |
|
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
|
829 #endif |
| 5164 | 830 space_hid = H5Dget_space (data_hid); |
| 831 rank = H5Sget_simple_extent_ndims (space_hid); | |
| 832 | |
| 833 if (rank != 2) | |
| 834 { | |
| 835 H5Sclose (space_hid); | |
| 836 H5Dclose (data_hid); | |
| 837 H5Gclose (group_hid); | |
| 838 return false; | |
| 839 } | |
| 840 | |
| 841 H5Sget_simple_extent_dims (space_hid, hdims, maxdims); | |
| 842 | |
| 5322 | 843 if (static_cast<int> (hdims[0]) != nz || static_cast<int> (hdims[1]) != 1) |
| 5164 | 844 { |
| 845 H5Sclose (space_hid); | |
| 846 H5Dclose (data_hid); | |
| 847 H5Gclose (group_hid); | |
| 848 return false; | |
| 849 } | |
| 850 | |
| 851 double *dtmp = m.xdata (); | |
|
19897
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19731
diff
changeset
|
852 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
853 if (H5Dread (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
854 H5P_DEFAULT, dtmp) >= 0 |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
855 && m.indices_ok ()) |
| 5164 | 856 { |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
857 retval = true; |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
858 matrix = m; |
| 5164 | 859 } |
| 860 | |
| 861 H5Sclose (space_hid); | |
| 862 H5Dclose (data_hid); | |
| 863 H5Gclose (group_hid); | |
| 864 | |
|
19897
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19731
diff
changeset
|
865 #else |
|
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19731
diff
changeset
|
866 gripe_load ("hdf5"); |
|
09ed6f7538dd
avoid needing to include hdf5 in public header files (bug #44370, #43180)
John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org>
parents:
19731
diff
changeset
|
867 #endif |
|
20216
aa36fb998a4d
maint: Remove unnecessary whitespace at end of lines.
Rik <rik@octave.org>
parents:
19897
diff
changeset
|
868 |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
869 return retval; |
| 5164 | 870 } |
| 5900 | 871 |
| 872 mxArray * | |
| 873 octave_sparse_matrix::as_mxArray (void) const | |
| 874 { | |
|
14846
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14770
diff
changeset
|
875 mwSize nz = nzmax (); |
|
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14770
diff
changeset
|
876 mwSize nr = rows (); |
|
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14770
diff
changeset
|
877 mwSize nc = columns (); |
| 5903 | 878 mxArray *retval = new mxArray (mxDOUBLE_CLASS, nr, nc, nz, mxREAL); |
| 879 double *pr = static_cast<double *> (retval->get_data ()); | |
|
14846
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14770
diff
changeset
|
880 mwIndex *ir = retval->get_ir (); |
|
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14770
diff
changeset
|
881 mwIndex *jc = retval->get_jc (); |
| 5903 | 882 |
| 6686 | 883 for (mwIndex i = 0; i < nz; i++) |
| 5903 | 884 { |
|
14861
f7afecdd87ef
maint: Use Octave coding conventions for cuddling parentheses in src/ directory
Rik <octave@nomad.inbox5.com>
parents:
14846
diff
changeset
|
885 pr[i] = matrix.data (i); |
|
f7afecdd87ef
maint: Use Octave coding conventions for cuddling parentheses in src/ directory
Rik <octave@nomad.inbox5.com>
parents:
14846
diff
changeset
|
886 ir[i] = matrix.ridx (i); |
| 5903 | 887 } |
| 888 | |
| 6686 | 889 for (mwIndex i = 0; i < nc + 1; i++) |
|
14861
f7afecdd87ef
maint: Use Octave coding conventions for cuddling parentheses in src/ directory
Rik <octave@nomad.inbox5.com>
parents:
14846
diff
changeset
|
890 jc[i] = matrix.cidx (i); |
| 5903 | 891 |
| 892 return retval; | |
| 5900 | 893 } |
| 894 | |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
895 octave_value |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
896 octave_sparse_matrix::map (unary_mapper_t umap) const |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
897 { |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
898 switch (umap) |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
899 { |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
900 case umap_imag: |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
901 return SparseMatrix (matrix.rows (), matrix.cols (), 0.0); |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
902 |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
903 case umap_real: |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
904 case umap_conj: |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
905 return matrix; |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
906 |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
907 // Mappers handled specially. |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
908 #define ARRAY_METHOD_MAPPER(UMAP, FCN) \ |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
909 case umap_ ## UMAP: \ |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
910 return octave_value (matrix.FCN ()) |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
911 |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
912 ARRAY_METHOD_MAPPER (abs, abs); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
913 |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
914 #define ARRAY_MAPPER(UMAP, TYPE, FCN) \ |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
915 case umap_ ## UMAP: \ |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
916 return octave_value (matrix.map<TYPE> (FCN)) |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
917 |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
918 ARRAY_MAPPER (acos, Complex, rc_acos); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
919 ARRAY_MAPPER (acosh, Complex, rc_acosh); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
920 ARRAY_MAPPER (angle, double, ::arg); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
921 ARRAY_MAPPER (arg, double, ::arg); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
922 ARRAY_MAPPER (asin, Complex, rc_asin); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
923 ARRAY_MAPPER (asinh, double, ::asinh); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
924 ARRAY_MAPPER (atan, double, ::atan); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
925 ARRAY_MAPPER (atanh, Complex, rc_atanh); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
926 ARRAY_MAPPER (erf, double, ::erf); |
|
9835
1bb1ed717d2f
implement built-in erfinv
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
927 ARRAY_MAPPER (erfinv, double, ::erfinv); |
|
14770
cb85e836d035
New function: erfcinv (bug #36607)
Axel Mathéi <axel.mathei@gmail.com>
parents:
14469
diff
changeset
|
928 ARRAY_MAPPER (erfcinv, double, ::erfcinv); |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
929 ARRAY_MAPPER (erfc, double, ::erfc); |
|
15696
2fac72a256ce
Add complex erf,erfc,erfcx,erfi,dawson routines from Faddeeva package.
Steven G. Johnson <stevenj@alum.mit.edu>
parents:
15215
diff
changeset
|
930 ARRAY_MAPPER (erfcx, double, ::erfcx); |
|
2fac72a256ce
Add complex erf,erfc,erfcx,erfi,dawson routines from Faddeeva package.
Steven G. Johnson <stevenj@alum.mit.edu>
parents:
15215
diff
changeset
|
931 ARRAY_MAPPER (erfi, double, ::erfi); |
|
2fac72a256ce
Add complex erf,erfc,erfcx,erfi,dawson routines from Faddeeva package.
Steven G. Johnson <stevenj@alum.mit.edu>
parents:
15215
diff
changeset
|
932 ARRAY_MAPPER (dawson, double, ::dawson); |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
933 ARRAY_MAPPER (gamma, double, xgamma); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
934 ARRAY_MAPPER (lgamma, Complex, rc_lgamma); |
|
10414
2a8b1db1e2ca
implement built-in cbrt
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
935 ARRAY_MAPPER (cbrt, double, ::cbrt); |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
936 ARRAY_MAPPER (ceil, double, ::ceil); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
937 ARRAY_MAPPER (cos, double, ::cos); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
938 ARRAY_MAPPER (cosh, double, ::cosh); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
939 ARRAY_MAPPER (exp, double, ::exp); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
940 ARRAY_MAPPER (expm1, double, ::expm1); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
941 ARRAY_MAPPER (fix, double, ::fix); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
942 ARRAY_MAPPER (floor, double, ::floor); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
943 ARRAY_MAPPER (log, Complex, rc_log); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
944 ARRAY_MAPPER (log2, Complex, rc_log2); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
945 ARRAY_MAPPER (log10, Complex, rc_log10); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
946 ARRAY_MAPPER (log1p, Complex, rc_log1p); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
947 ARRAY_MAPPER (round, double, xround); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
948 ARRAY_MAPPER (roundb, double, xroundb); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
949 ARRAY_MAPPER (signum, double, ::signum); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
950 ARRAY_MAPPER (sin, double, ::sin); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
951 ARRAY_MAPPER (sinh, double, ::sinh); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
952 ARRAY_MAPPER (sqrt, Complex, rc_sqrt); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
953 ARRAY_MAPPER (tan, double, ::tan); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
954 ARRAY_MAPPER (tanh, double, ::tanh); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
955 ARRAY_MAPPER (isnan, bool, xisnan); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
956 ARRAY_MAPPER (isna, bool, octave_is_NA); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
957 ARRAY_MAPPER (isinf, bool, xisinf); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
958 ARRAY_MAPPER (finite, bool, xfinite); |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
959 |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
960 default: // Attempt to go via dense matrix. |
|
9813
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
961 return octave_base_sparse<SparseMatrix>::map (umap); |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
962 } |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
963 } |