Mercurial > octave-nkf
annotate libinterp/octave-value/ov-cx-sparse.cc @ 20595:c1a6c31ac29a
eliminate more simple uses of error_state
* ov-classdef.cc: Eliminate simple uses of error_state.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 06 Oct 2015 00:20:02 -0400 |
| parents | f90c8372b7ba |
| children |
| 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:
7740
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 "ov-complex.h" | |
| 40 #include "gripes.h" | |
| 41 | |
|
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
|
42 #include "oct-hdf5.h" |
|
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
|
43 |
| 5164 | 44 #include "ov-re-sparse.h" |
| 45 #include "ov-cx-sparse.h" | |
| 46 | |
| 47 #include "ov-base-sparse.h" | |
| 48 #include "ov-base-sparse.cc" | |
| 49 | |
| 50 #include "ov-bool-sparse.h" | |
| 51 | |
| 6109 | 52 template class OCTINTERP_API octave_base_sparse<SparseComplexMatrix>; |
| 5164 | 53 |
| 54 | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
55 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_sparse_complex_matrix, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
56 "sparse complex matrix", "double"); |
| 5164 | 57 |
| 5759 | 58 octave_base_value * |
| 5164 | 59 octave_sparse_complex_matrix::try_narrowing_conversion (void) |
| 60 { | |
| 5759 | 61 octave_base_value *retval = 0; |
| 5164 | 62 |
| 7193 | 63 if (Vsparse_auto_mutate) |
| 64 { | |
| 65 int nr = matrix.rows (); | |
| 66 int nc = matrix.cols (); | |
| 5164 | 67 |
| 7193 | 68 // Don't use numel, since it can overflow for very large matrices |
| 69 // Note that for the tests on matrix size, they become approximative | |
| 70 // since they involves a cast to double to avoid issues of overflow | |
| 71 if (matrix.rows () == 1 && matrix.cols () == 1) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
72 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
73 // 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
|
74 const SparseComplexMatrix tmp (matrix); |
| 5164 | 75 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
76 Complex c = tmp (0, 0); |
| 5164 | 77 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
78 if (std::imag (c) == 0.0) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
79 retval = new octave_scalar (std::real (c)); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
80 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
81 retval = new octave_complex (c); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
82 } |
| 7193 | 83 else if (nr == 0 || nc == 0) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
84 retval = new octave_matrix (Matrix (nr, nc)); |
| 7193 | 85 else if (matrix.all_elements_are_real ()) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
86 if (matrix.cols () > 0 && matrix.rows () > 0 |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
87 && (double (matrix.byte_size ()) > double (matrix.rows ()) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
88 * double (matrix.cols ()) * sizeof (double))) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
89 retval = new octave_matrix (::real (matrix.matrix_value ())); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
90 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
91 retval = new octave_sparse_matrix (::real (matrix)); |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
92 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
|
93 && (double (matrix.byte_size ()) > double (matrix.rows ()) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
94 * double (matrix.cols ()) * sizeof (Complex))) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
95 retval = new octave_complex_matrix (matrix.matrix_value ()); |
| 5164 | 96 } |
| 7193 | 97 else |
| 98 { | |
| 99 if (matrix.all_elements_are_real ()) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
100 retval = new octave_sparse_matrix (::real (matrix)); |
| 7193 | 101 } |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
102 |
| 5164 | 103 return retval; |
| 104 } | |
| 105 | |
| 106 double | |
| 107 octave_sparse_complex_matrix::double_value (bool force_conversion) const | |
| 108 { | |
| 109 double retval = lo_ieee_nan_value (); | |
| 110 | |
| 5781 | 111 if (! force_conversion) |
| 112 gripe_implicit_conversion ("Octave:imag-to-real", | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
113 "complex sparse matrix", "real scalar"); |
| 5164 | 114 |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
115 // FIXME: maybe this should be a function, valid_as_scalar() |
| 5164 | 116 if (numel () > 0) |
| 117 { | |
| 6221 | 118 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
|
119 gripe_implicit_conversion ("Octave:array-to-scalar", |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
120 "complex sparse matrix", "real scalar"); |
| 5164 | 121 |
| 122 retval = std::real (matrix (0, 0)); | |
| 123 } | |
| 124 else | |
| 125 gripe_invalid_conversion ("complex sparse matrix", "real scalar"); | |
| 126 | |
| 127 return retval; | |
| 128 } | |
| 129 | |
| 130 Matrix | |
| 131 octave_sparse_complex_matrix::matrix_value (bool force_conversion) const | |
| 132 { | |
| 133 Matrix retval; | |
| 134 | |
| 5781 | 135 if (! force_conversion) |
| 136 gripe_implicit_conversion ("Octave:imag-to-real", | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
137 "complex sparse matrix", "real matrix"); |
| 5164 | 138 |
| 139 retval = ::real (matrix.matrix_value ()); | |
| 140 | |
| 141 return retval; | |
| 142 } | |
| 143 | |
| 144 Complex | |
| 145 octave_sparse_complex_matrix::complex_value (bool) const | |
| 146 { | |
| 147 double tmp = lo_ieee_nan_value (); | |
| 148 | |
| 149 Complex retval (tmp, tmp); | |
| 150 | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
151 // FIXME: maybe this should be a function, valid_as_scalar() |
| 5164 | 152 if (numel () > 0) |
| 153 { | |
| 6221 | 154 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
|
155 gripe_implicit_conversion ("Octave:array-to-scalar", |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
156 "complex sparse matrix", "real scalar"); |
| 5164 | 157 |
| 158 retval = matrix (0, 0); | |
| 159 } | |
| 160 else | |
| 161 gripe_invalid_conversion ("complex sparse matrix", "real scalar"); | |
| 162 | |
| 163 return retval; | |
| 164 } | |
| 165 | |
| 166 ComplexMatrix | |
| 167 octave_sparse_complex_matrix::complex_matrix_value (bool) const | |
| 168 { | |
| 169 return matrix.matrix_value (); | |
| 170 } | |
| 171 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
172 ComplexNDArray |
| 5164 | 173 octave_sparse_complex_matrix::complex_array_value (bool) const |
| 174 { | |
| 175 return ComplexNDArray (matrix.matrix_value ()); | |
| 176 } | |
| 177 | |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
178 charNDArray |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
179 octave_sparse_complex_matrix::char_array_value (bool frc_str_conv) const |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
180 { |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
181 charNDArray retval; |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
182 |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
183 if (! frc_str_conv) |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
184 gripe_implicit_conversion ("Octave:num-to-str", |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
185 "sparse complex matrix", "string"); |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
186 else |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
187 { |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
188 retval = charNDArray (dims (), 0); |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
189 octave_idx_type nc = matrix.cols (); |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
190 octave_idx_type nr = matrix.rows (); |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
191 |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
192 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
|
193 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
|
194 retval(matrix.ridx (i) + nr * j) = |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
195 static_cast<char>(std::real (matrix.data (i))); |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
196 } |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
197 |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
198 return retval; |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
199 } |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
200 |
| 5164 | 201 SparseMatrix |
| 202 octave_sparse_complex_matrix::sparse_matrix_value (bool force_conversion) const | |
| 203 { | |
| 204 SparseMatrix retval; | |
| 205 | |
| 5781 | 206 if (! force_conversion) |
| 207 gripe_implicit_conversion ("Octave:imag-to-real", | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
208 "complex sparse matrix", |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
209 "real sparse matrix"); |
| 5164 | 210 |
| 211 retval = ::real (matrix); | |
| 212 | |
| 213 return retval; | |
| 214 } | |
| 215 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
216 SparseBoolMatrix |
|
9853
8d9e4752441a
implement complex built-in logical conversions
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
217 octave_sparse_complex_matrix::sparse_bool_matrix_value (bool warn) const |
|
8d9e4752441a
implement complex built-in logical conversions
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
218 { |
|
8d9e4752441a
implement complex built-in logical conversions
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
219 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
|
220 gripe_nan_to_logical_conversion (); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
221 else if (warn && (! matrix.all_elements_are_real () |
|
9853
8d9e4752441a
implement complex built-in logical conversions
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
222 || real (matrix).any_element_not_one_or_zero ())) |
|
8d9e4752441a
implement complex built-in logical conversions
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
223 gripe_logical_conversion (); |
|
8d9e4752441a
implement complex built-in logical conversions
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
224 |
|
8d9e4752441a
implement complex built-in logical conversions
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
225 return mx_el_ne (matrix, Complex (0.0)); |
|
8d9e4752441a
implement complex built-in logical conversions
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
226 } |
|
8d9e4752441a
implement complex built-in logical conversions
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
227 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
228 bool |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
229 octave_sparse_complex_matrix::save_binary (std::ostream& os, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
230 bool&save_as_floats) |
| 5164 | 231 { |
| 232 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:
14469
diff
changeset
|
233 if (d.length () < 1) |
| 5164 | 234 return false; |
| 235 | |
| 236 // Ensure that additional memory is deallocated | |
| 237 matrix.maybe_compress (); | |
| 238 | |
| 239 int nr = d(0); | |
| 240 int nc = d(1); | |
|
10527
b4d2080b6df7
Replace nzmax by nnz as needed
David Bateman <dbateman@free.fr>
parents:
10512
diff
changeset
|
241 int nz = nnz (); |
| 5164 | 242 |
| 5828 | 243 int32_t itmp; |
| 5164 | 244 // 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:
18712
diff
changeset
|
245 itmp = -2; |
| 5760 | 246 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
|
247 |
|
18772
3bffa847d215
maint: Use space after variable name and before equals sign.
Rik <rik@octave.org>
parents:
18712
diff
changeset
|
248 itmp = nr; |
| 5760 | 249 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
|
250 |
|
18772
3bffa847d215
maint: Use space after variable name and before equals sign.
Rik <rik@octave.org>
parents:
18712
diff
changeset
|
251 itmp = nc; |
| 5760 | 252 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
|
253 |
|
18772
3bffa847d215
maint: Use space after variable name and before equals sign.
Rik <rik@octave.org>
parents:
18712
diff
changeset
|
254 itmp = nz; |
| 5760 | 255 os.write (reinterpret_cast<char *> (&itmp), 4); |
| 5164 | 256 |
| 257 save_type st = LS_DOUBLE; | |
| 258 if (save_as_floats) | |
| 259 { | |
| 260 if (matrix.too_large_for_float ()) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
261 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
262 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
|
263 warning ("save: saving as doubles instead"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
264 } |
| 5164 | 265 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
266 st = LS_FLOAT; |
| 5164 | 267 } |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
268 else if (matrix.nnz () > 8192) // FIXME: make this configurable. |
| 5164 | 269 { |
| 270 double max_val, min_val; | |
| 271 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
|
272 st = get_save_type (max_val, min_val); |
| 5164 | 273 } |
| 274 | |
| 275 // add one to the printed indices to go from | |
| 276 // 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
|
277 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
|
278 { |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
279 octave_quit (); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
280 itmp = matrix.cidx (i); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
281 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
|
282 } |
| 5164 | 283 |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
284 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
|
285 { |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
286 octave_quit (); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
287 itmp = matrix.ridx (i); |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
288 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
|
289 } |
| 5164 | 290 |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
291 write_doubles (os, reinterpret_cast<const double *> (matrix.data ()), st, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
292 2 * nz); |
| 5164 | 293 |
| 294 return true; | |
| 295 } | |
| 296 | |
| 297 bool | |
| 298 octave_sparse_complex_matrix::load_binary (std::istream& is, bool swap, | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
299 oct_mach_info::float_format fmt) |
| 5164 | 300 { |
| 5828 | 301 int32_t nz, nc, nr, tmp; |
| 5327 | 302 char ctmp; |
| 303 | |
| 5760 | 304 if (! is.read (reinterpret_cast<char *> (&tmp), 4)) |
| 5164 | 305 return false; |
| 306 | |
| 307 if (swap) | |
| 308 swap_bytes<4> (&tmp); | |
| 309 | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
310 if (tmp != -2) |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
311 { |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
312 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
|
313 return false; |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
314 } |
| 5164 | 315 |
| 5760 | 316 if (! is.read (reinterpret_cast<char *> (&nr), 4)) |
| 5164 | 317 return false; |
| 5760 | 318 if (! is.read (reinterpret_cast<char *> (&nc), 4)) |
| 5164 | 319 return false; |
| 5760 | 320 if (! is.read (reinterpret_cast<char *> (&nz), 4)) |
| 5164 | 321 return false; |
| 322 | |
| 323 if (swap) | |
| 324 { | |
| 325 swap_bytes<4> (&nr); | |
| 326 swap_bytes<4> (&nc); | |
| 327 swap_bytes<4> (&nz); | |
| 328 } | |
| 329 | |
| 5275 | 330 SparseComplexMatrix m (static_cast<octave_idx_type> (nr), |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
331 static_cast<octave_idx_type> (nc), |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
332 static_cast<octave_idx_type> (nz)); |
| 5164 | 333 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
334 for (int i = 0; i < nc+1; i++) |
| 5164 | 335 { |
|
10142
829e69ec3110
make OCTAVE_QUIT a function
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
336 octave_quit (); |
| 5760 | 337 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
|
338 return false; |
| 5164 | 339 if (swap) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
340 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
|
341 m.cidx (i) = tmp; |
| 5164 | 342 } |
| 343 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
344 for (int i = 0; i < nz; i++) |
| 5164 | 345 { |
|
10142
829e69ec3110
make OCTAVE_QUIT a function
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
346 octave_quit (); |
| 5760 | 347 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
|
348 return false; |
| 5164 | 349 if (swap) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
350 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
|
351 m.ridx (i) = tmp; |
| 5164 | 352 } |
| 353 | |
| 5760 | 354 if (! is.read (reinterpret_cast<char *> (&ctmp), 1)) |
| 5164 | 355 return false; |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
356 |
| 5760 | 357 read_doubles (is, reinterpret_cast<double *> (m.data ()), |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
358 static_cast<save_type> (ctmp), 2 * nz, swap, fmt); |
| 5164 | 359 |
|
20587
f90c8372b7ba
eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
19897
diff
changeset
|
360 if (! is) |
| 5164 | 361 return false; |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
362 |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
363 if (! m.indices_ok ()) |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
364 return false; |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
365 |
| 5164 | 366 matrix = m; |
| 367 | |
| 368 return true; | |
| 369 } | |
| 370 | |
|
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
|
371 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
|
372 octave_sparse_complex_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
|
373 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
|
374 { |
|
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
|
375 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
|
376 |
| 5164 | 377 #if defined (HAVE_HDF5) |
| 5900 | 378 |
| 5164 | 379 dim_vector dv = dims (); |
| 380 int empty = save_hdf5_empty (loc_id, name, dv); | |
| 381 if (empty) | |
| 382 return (empty > 0); | |
| 383 | |
| 384 // Ensure that additional memory is deallocated | |
| 385 matrix.maybe_compress (); | |
| 386 | |
|
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
|
387 #if HAVE_HDF5_18 |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
388 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
|
389 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
|
390 #else |
| 5164 | 391 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
|
392 #endif |
| 5164 | 393 if (group_hid < 0) |
| 394 return false; | |
| 395 | |
|
18099
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
396 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
|
397 space_hid = data_hid = -1; |
| 5164 | 398 SparseComplexMatrix m = sparse_complex_matrix_value (); |
| 5351 | 399 octave_idx_type tmp; |
| 5164 | 400 hsize_t hdims[2]; |
| 401 | |
| 5760 | 402 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
|
403 if (space_hid < 0) |
| 5164 | 404 { |
| 405 H5Gclose (group_hid); | |
| 406 return false; | |
| 407 } | |
| 408 | |
|
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
|
409 #if HAVE_HDF5_18 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
410 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
|
411 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
|
412 #else |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
413 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
|
414 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
|
415 #endif |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
416 if (data_hid < 0) |
| 5164 | 417 { |
| 418 H5Sclose (space_hid); | |
| 419 H5Gclose (group_hid); | |
| 420 return false; | |
| 421 } | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
422 |
| 5164 | 423 tmp = m.rows (); |
| 5351 | 424 retval = H5Dwrite (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
|
425 H5P_DEFAULT, &tmp) >= 0; |
| 5164 | 426 H5Dclose (data_hid); |
| 427 if (!retval) | |
| 428 { | |
| 429 H5Sclose (space_hid); | |
| 430 H5Gclose (group_hid); | |
| 431 return false; | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
432 } |
| 5164 | 433 |
|
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
|
434 #if HAVE_HDF5_18 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
435 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
|
436 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
|
437 #else |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
438 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
|
439 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
|
440 #endif |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
441 if (data_hid < 0) |
| 5164 | 442 { |
| 443 H5Sclose (space_hid); | |
| 444 H5Gclose (group_hid); | |
| 445 return false; | |
| 446 } | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
447 |
| 5164 | 448 tmp = m.cols (); |
| 5351 | 449 retval = H5Dwrite (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
|
450 H5P_DEFAULT, &tmp) >= 0; |
| 5164 | 451 H5Dclose (data_hid); |
| 452 if (!retval) | |
| 453 { | |
| 454 H5Sclose (space_hid); | |
| 455 H5Gclose (group_hid); | |
| 456 return false; | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
457 } |
| 5164 | 458 |
|
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
|
459 #if HAVE_HDF5_18 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
460 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
|
461 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
|
462 #else |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
463 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
|
464 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 #endif |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
466 if (data_hid < 0) |
| 5164 | 467 { |
| 468 H5Sclose (space_hid); | |
| 469 H5Gclose (group_hid); | |
| 470 return false; | |
| 471 } | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
472 |
|
10527
b4d2080b6df7
Replace nzmax by nnz as needed
David Bateman <dbateman@free.fr>
parents:
10512
diff
changeset
|
473 tmp = m.nnz (); |
| 5351 | 474 retval = H5Dwrite (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
|
475 H5P_DEFAULT, &tmp) >= 0; |
| 5164 | 476 H5Dclose (data_hid); |
| 477 if (!retval) | |
| 478 { | |
| 479 H5Sclose (space_hid); | |
| 480 H5Gclose (group_hid); | |
| 481 return false; | |
| 482 } | |
| 483 | |
| 484 H5Sclose (space_hid); | |
| 485 | |
|
14846
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14469
diff
changeset
|
486 hdims[0] = m.cols () + 1; |
| 5164 | 487 hdims[1] = 1; |
| 488 | |
| 489 space_hid = H5Screate_simple (2, hdims, 0); | |
| 490 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
491 if (space_hid < 0) |
| 5164 | 492 { |
| 493 H5Gclose (group_hid); | |
| 494 return false; | |
| 495 } | |
| 496 | |
|
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
|
497 #if HAVE_HDF5_18 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
498 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
|
499 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
|
500 #else |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
501 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
|
502 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
|
503 #endif |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
504 if (data_hid < 0) |
| 5164 | 505 { |
| 506 H5Sclose (space_hid); | |
| 507 H5Gclose (group_hid); | |
| 508 return false; | |
| 509 } | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
510 |
| 5351 | 511 octave_idx_type * itmp = m.xcidx (); |
| 512 retval = H5Dwrite (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
|
513 H5P_DEFAULT, itmp) >= 0; |
| 5164 | 514 H5Dclose (data_hid); |
| 515 if (!retval) | |
| 516 { | |
| 517 H5Sclose (space_hid); | |
| 518 H5Gclose (group_hid); | |
| 519 return false; | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
520 } |
| 5164 | 521 |
| 522 H5Sclose (space_hid); | |
| 523 | |
|
10527
b4d2080b6df7
Replace nzmax by nnz as needed
David Bateman <dbateman@free.fr>
parents:
10512
diff
changeset
|
524 hdims[0] = m.nnz (); |
| 5164 | 525 hdims[1] = 1; |
| 526 | |
| 527 space_hid = H5Screate_simple (2, hdims, 0); | |
| 528 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
529 if (space_hid < 0) |
| 5164 | 530 { |
| 531 H5Gclose (group_hid); | |
| 532 return false; | |
| 533 } | |
| 534 | |
|
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
|
535 #if HAVE_HDF5_18 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
536 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
|
537 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
|
538 #else |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
539 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
|
540 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
|
541 #endif |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
542 if (data_hid < 0) |
| 5164 | 543 { |
| 544 H5Sclose (space_hid); | |
| 545 H5Gclose (group_hid); | |
| 546 return false; | |
| 547 } | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
548 |
| 5164 | 549 itmp = m.xridx (); |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
550 retval = H5Dwrite (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
551 itmp) >= 0; |
| 5164 | 552 H5Dclose (data_hid); |
| 553 if (!retval) | |
| 554 { | |
| 555 H5Sclose (space_hid); | |
| 556 H5Gclose (group_hid); | |
| 557 return false; | |
| 558 } | |
| 559 | |
| 560 hid_t save_type_hid = H5T_NATIVE_DOUBLE; | |
| 561 | |
| 562 if (save_as_floats) | |
| 563 { | |
| 564 if (m.too_large_for_float ()) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
565 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
566 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
|
567 warning ("save: saving as doubles instead"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
568 } |
| 5164 | 569 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
570 save_type_hid = H5T_NATIVE_FLOAT; |
| 5164 | 571 } |
| 572 #if HAVE_HDF5_INT2FLOAT_CONVERSIONS | |
| 573 // hdf5 currently doesn't support float/integer conversions | |
| 574 else | |
| 575 { | |
| 576 double max_val, min_val; | |
| 577 | |
| 578 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
|
579 save_type_hid |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
580 = save_type_to_hdf5 (get_save_type (max_val, min_val)); |
| 5164 | 581 } |
| 582 #endif /* HAVE_HDF5_INT2FLOAT_CONVERSIONS */ | |
| 583 | |
| 584 hid_t type_hid = hdf5_make_complex_type (save_type_hid); | |
| 585 if (type_hid < 0) | |
| 586 { | |
| 587 H5Sclose (space_hid); | |
| 588 H5Gclose (group_hid); | |
| 589 return false; | |
| 590 } | |
|
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
|
591 #if HAVE_HDF5_18 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
592 data_hid = H5Dcreate (group_hid, "data", type_hid, space_hid, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
593 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
|
594 #else |
| 5760 | 595 data_hid = H5Dcreate (group_hid, "data", type_hid, space_hid, H5P_DEFAULT); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
596 #endif |
| 5164 | 597 if (data_hid < 0) |
| 598 { | |
| 599 H5Sclose (space_hid); | |
| 600 H5Tclose (type_hid); | |
| 601 H5Gclose (group_hid); | |
| 602 return false; | |
| 603 } | |
| 604 | |
| 605 hid_t complex_type_hid = hdf5_make_complex_type (H5T_NATIVE_DOUBLE); | |
| 606 retval = false; | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
607 if (complex_type_hid >= 0) |
| 5164 | 608 { |
| 609 Complex * ctmp = m.xdata (); | |
| 610 | |
| 611 retval = H5Dwrite (data_hid, complex_type_hid, H5S_ALL, H5S_ALL, | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
612 H5P_DEFAULT, ctmp) >= 0; |
| 5164 | 613 } |
| 614 | |
| 615 H5Dclose (data_hid); | |
| 616 H5Sclose (space_hid); | |
| 617 H5Tclose (type_hid); | |
| 618 H5Gclose (group_hid); | |
| 619 | |
|
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
|
620 #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
|
621 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
|
622 #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
|
623 |
| 5164 | 624 return retval; |
| 625 } | |
| 626 | |
| 627 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
|
628 octave_sparse_complex_matrix::load_hdf5 (octave_hdf5_id loc_id, const char *name) |
| 5164 | 629 { |
|
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
|
630 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
|
631 |
|
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 #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
|
633 |
| 5351 | 634 octave_idx_type nr, nc, nz; |
| 5164 | 635 hid_t group_hid, data_hid, space_hid; |
| 636 hsize_t rank; | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
637 |
| 5164 | 638 dim_vector dv; |
| 639 int empty = load_hdf5_empty (loc_id, name, dv); | |
| 640 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
|
641 matrix.resize (dv); |
| 5164 | 642 if (empty) |
| 643 return (empty > 0); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
644 |
|
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
|
645 #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
|
646 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
|
647 #else |
| 5164 | 648 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
|
649 #endif |
|
18712
6113e0c6920b
maint: Clean up extra spaces before/after parentheses.
Rik <rik@octave.org>
parents:
18099
diff
changeset
|
650 if (group_hid < 0) return false; |
| 5164 | 651 |
|
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
|
652 #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
|
653 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
|
654 #else |
| 5164 | 655 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
|
656 #endif |
| 5164 | 657 space_hid = H5Dget_space (data_hid); |
| 658 rank = H5Sget_simple_extent_ndims (space_hid); | |
| 659 | |
| 660 if (rank != 0) | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
661 { |
| 5164 | 662 H5Dclose (data_hid); |
| 663 H5Gclose (group_hid); | |
| 664 return false; | |
| 665 } | |
| 666 | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
667 if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
668 H5S_ALL, H5P_DEFAULT, &nr) < 0) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
669 { |
| 5164 | 670 H5Dclose (data_hid); |
| 671 H5Gclose (group_hid); | |
| 672 return false; | |
| 673 } | |
| 674 | |
| 675 H5Dclose (data_hid); | |
| 676 | |
|
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
|
677 #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
|
678 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
|
679 #else |
| 5164 | 680 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
|
681 #endif |
| 5164 | 682 space_hid = H5Dget_space (data_hid); |
| 683 rank = H5Sget_simple_extent_ndims (space_hid); | |
| 684 | |
| 685 if (rank != 0) | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
686 { |
| 5164 | 687 H5Dclose (data_hid); |
| 688 H5Gclose (group_hid); | |
| 689 return false; | |
| 690 } | |
| 691 | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
692 if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
693 H5S_ALL, H5P_DEFAULT, &nc) < 0) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
694 { |
| 5164 | 695 H5Dclose (data_hid); |
| 696 H5Gclose (group_hid); | |
| 697 return false; | |
| 698 } | |
| 699 | |
| 700 H5Dclose (data_hid); | |
|
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
|
701 |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
702 #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
|
703 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
|
704 #else |
| 5164 | 705 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
|
706 #endif |
| 5164 | 707 space_hid = H5Dget_space (data_hid); |
| 708 rank = H5Sget_simple_extent_ndims (space_hid); | |
| 709 | |
| 710 if (rank != 0) | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
711 { |
| 5164 | 712 H5Dclose (data_hid); |
| 713 H5Gclose (group_hid); | |
| 714 return false; | |
| 715 } | |
| 716 | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
717 if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
718 H5S_ALL, H5P_DEFAULT, &nz) < 0) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
719 { |
| 5164 | 720 H5Dclose (data_hid); |
| 721 H5Gclose (group_hid); | |
| 722 return false; | |
| 723 } | |
| 724 | |
| 725 H5Dclose (data_hid); | |
| 726 | |
| 5275 | 727 SparseComplexMatrix m (static_cast<octave_idx_type> (nr), |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
728 static_cast<octave_idx_type> (nc), |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
729 static_cast<octave_idx_type> (nz)); |
| 5164 | 730 |
|
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
|
731 #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
|
732 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
|
733 #else |
| 5164 | 734 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
|
735 #endif |
| 5164 | 736 space_hid = H5Dget_space (data_hid); |
| 737 rank = H5Sget_simple_extent_ndims (space_hid); | |
| 738 | |
| 739 if (rank != 2) | |
| 740 { | |
| 741 H5Sclose (space_hid); | |
| 742 H5Dclose (data_hid); | |
| 743 H5Gclose (group_hid); | |
| 744 return false; | |
| 745 } | |
| 746 | |
| 747 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank); | |
| 748 OCTAVE_LOCAL_BUFFER (hsize_t, maxdims, rank); | |
| 749 | |
| 750 H5Sget_simple_extent_dims (space_hid, hdims, maxdims); | |
| 751 | |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
752 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
|
753 || static_cast<int> (hdims[1]) != 1) |
| 5164 | 754 { |
| 755 H5Sclose (space_hid); | |
| 756 H5Dclose (data_hid); | |
| 757 H5Gclose (group_hid); | |
| 758 return false; | |
| 759 } | |
| 760 | |
| 5351 | 761 octave_idx_type *itmp = m.xcidx (); |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
762 if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
763 H5S_ALL, H5P_DEFAULT, itmp) < 0) |
| 5164 | 764 { |
| 765 H5Sclose (space_hid); | |
| 766 H5Dclose (data_hid); | |
| 767 H5Gclose (group_hid); | |
| 768 return false; | |
| 769 } | |
| 770 | |
| 771 H5Sclose (space_hid); | |
| 772 H5Dclose (data_hid); | |
| 773 | |
|
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
|
774 #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
|
775 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
|
776 #else |
| 5164 | 777 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
|
778 #endif |
| 5164 | 779 space_hid = H5Dget_space (data_hid); |
| 780 rank = H5Sget_simple_extent_ndims (space_hid); | |
| 781 | |
| 782 if (rank != 2) | |
| 783 { | |
| 784 H5Sclose (space_hid); | |
| 785 H5Dclose (data_hid); | |
| 786 H5Gclose (group_hid); | |
| 787 return false; | |
| 788 } | |
| 789 | |
| 790 H5Sget_simple_extent_dims (space_hid, hdims, maxdims); | |
| 791 | |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
792 if (static_cast<int> (hdims[0]) != nz |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
793 || static_cast<int> (hdims[1]) != 1) |
| 5164 | 794 { |
| 795 H5Sclose (space_hid); | |
| 796 H5Dclose (data_hid); | |
| 797 H5Gclose (group_hid); | |
| 798 return false; | |
| 799 } | |
| 800 | |
| 801 itmp = m.xridx (); | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
802 if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
803 H5S_ALL, H5P_DEFAULT, itmp) < 0) |
| 5164 | 804 { |
| 805 H5Sclose (space_hid); | |
| 806 H5Dclose (data_hid); | |
| 807 H5Gclose (group_hid); | |
| 808 return false; | |
| 809 } | |
| 810 | |
| 811 H5Sclose (space_hid); | |
| 812 H5Dclose (data_hid); | |
| 813 | |
|
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
|
814 #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
|
815 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
|
816 #else |
| 5164 | 817 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
|
818 #endif |
| 5164 | 819 hid_t type_hid = H5Dget_type (data_hid); |
| 820 | |
| 821 hid_t complex_type = hdf5_make_complex_type (H5T_NATIVE_DOUBLE); | |
| 822 | |
| 823 if (! hdf5_types_compatible (type_hid, complex_type)) | |
| 824 { | |
| 825 H5Tclose (complex_type); | |
| 826 H5Dclose (data_hid); | |
| 827 H5Gclose (group_hid); | |
| 828 return false; | |
| 829 } | |
| 830 | |
| 831 space_hid = H5Dget_space (data_hid); | |
| 832 rank = H5Sget_simple_extent_ndims (space_hid); | |
| 833 | |
| 834 if (rank != 2) | |
| 835 { | |
| 836 H5Sclose (space_hid); | |
| 837 H5Dclose (data_hid); | |
| 838 H5Gclose (group_hid); | |
| 839 return false; | |
| 840 } | |
| 841 | |
| 842 H5Sget_simple_extent_dims (space_hid, hdims, maxdims); | |
| 843 | |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
844 if (static_cast<int> (hdims[0]) != nz |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
845 || static_cast<int> (hdims[1]) != 1) |
| 5164 | 846 { |
| 847 H5Sclose (space_hid); | |
| 848 H5Dclose (data_hid); | |
| 849 H5Gclose (group_hid); | |
| 850 return false; | |
| 851 } | |
| 852 | |
| 853 Complex *ctmp = 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
|
854 |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
855 if (H5Dread (data_hid, complex_type, H5S_ALL, H5S_ALL, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
856 H5P_DEFAULT, ctmp) >= 0 |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
857 && m.indices_ok ()) |
| 5164 | 858 { |
| 859 retval = true; | |
| 860 matrix = m; | |
| 861 } | |
| 862 | |
| 863 H5Tclose (complex_type); | |
| 864 H5Sclose (space_hid); | |
| 865 H5Dclose (data_hid); | |
| 866 H5Gclose (group_hid); | |
| 867 | |
|
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
|
868 #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
|
869 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
|
870 #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
|
871 |
| 5164 | 872 return retval; |
| 873 } | |
| 874 | |
| 5900 | 875 mxArray * |
| 876 octave_sparse_complex_matrix::as_mxArray (void) const | |
| 877 { | |
| 6686 | 878 mwSize nz = nzmax (); |
| 5903 | 879 mxArray *retval = new mxArray (mxDOUBLE_CLASS, rows (), columns (), |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
880 nz, mxCOMPLEX); |
| 5903 | 881 double *pr = static_cast<double *> (retval->get_data ()); |
| 882 double *pi = static_cast<double *> (retval->get_imag_data ()); | |
| 6686 | 883 mwIndex *ir = retval->get_ir (); |
| 884 mwIndex *jc = retval->get_jc (); | |
| 5903 | 885 |
| 6686 | 886 for (mwIndex i = 0; i < nz; i++) |
| 5903 | 887 { |
|
14861
f7afecdd87ef
maint: Use Octave coding conventions for cuddling parentheses in src/ directory
Rik <octave@nomad.inbox5.com>
parents:
14846
diff
changeset
|
888 Complex val = matrix.data (i); |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
889 pr[i] = std::real (val); |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
890 pi[i] = std::imag (val); |
|
14861
f7afecdd87ef
maint: Use Octave coding conventions for cuddling parentheses in src/ directory
Rik <octave@nomad.inbox5.com>
parents:
14846
diff
changeset
|
891 ir[i] = matrix.ridx (i); |
| 5903 | 892 } |
| 893 | |
|
14846
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14469
diff
changeset
|
894 for (mwIndex i = 0; i < columns () + 1; i++) |
|
14861
f7afecdd87ef
maint: Use Octave coding conventions for cuddling parentheses in src/ directory
Rik <octave@nomad.inbox5.com>
parents:
14846
diff
changeset
|
895 jc[i] = matrix.cidx (i); |
| 5903 | 896 |
| 897 return retval; | |
| 5900 | 898 } |
| 899 | |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
900 octave_value |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
901 octave_sparse_complex_matrix::map (unary_mapper_t umap) const |
|
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:
9469
diff
changeset
|
903 switch (umap) |
|
7667
fb3a6c53c2b2
Allow negative zero imaginary part to be treated as zero for erf, erfc, gamma and lgamma mapper function
David Bateman <dbateman@free.fr>
parents:
7638
diff
changeset
|
904 { |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
905 // Mappers handled specially. |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
906 case umap_real: |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
907 return ::real (matrix); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
908 case umap_imag: |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
909 return ::imag (matrix); |
|
7667
fb3a6c53c2b2
Allow negative zero imaginary part to be treated as zero for erf, erfc, gamma and lgamma mapper function
David Bateman <dbateman@free.fr>
parents:
7638
diff
changeset
|
910 |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
911 #define ARRAY_METHOD_MAPPER(UMAP, FCN) \ |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
912 case umap_ ## UMAP: \ |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
913 return octave_value (matrix.FCN ()) |
|
7667
fb3a6c53c2b2
Allow negative zero imaginary part to be treated as zero for erf, erfc, gamma and lgamma mapper function
David Bateman <dbateman@free.fr>
parents:
7638
diff
changeset
|
914 |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
915 ARRAY_METHOD_MAPPER (abs, abs); |
|
7667
fb3a6c53c2b2
Allow negative zero imaginary part to be treated as zero for erf, erfc, gamma and lgamma mapper function
David Bateman <dbateman@free.fr>
parents:
7638
diff
changeset
|
916 |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
917 #define ARRAY_MAPPER(UMAP, TYPE, FCN) \ |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
918 case umap_ ## UMAP: \ |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
919 return octave_value (matrix.map<TYPE> (FCN)) |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
920 |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
921 ARRAY_MAPPER (acos, Complex, ::acos); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
922 ARRAY_MAPPER (acosh, Complex, ::acosh); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
923 ARRAY_MAPPER (angle, double, std::arg); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
924 ARRAY_MAPPER (arg, double, std::arg); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
925 ARRAY_MAPPER (asin, Complex, ::asin); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
926 ARRAY_MAPPER (asinh, Complex, ::asinh); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
927 ARRAY_MAPPER (atan, Complex, ::atan); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
928 ARRAY_MAPPER (atanh, Complex, ::atanh); |
|
15696
2fac72a256ce
Add complex erf,erfc,erfcx,erfi,dawson routines from Faddeeva package.
Steven G. Johnson <stevenj@alum.mit.edu>
parents:
15215
diff
changeset
|
929 ARRAY_MAPPER (erf, Complex, ::erf); |
|
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 (erfc, Complex, ::erfc); |
|
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 (erfcx, Complex, ::erfcx); |
|
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 (erfi, Complex, ::erfi); |
|
2fac72a256ce
Add complex erf,erfc,erfcx,erfi,dawson routines from Faddeeva package.
Steven G. Johnson <stevenj@alum.mit.edu>
parents:
15215
diff
changeset
|
933 ARRAY_MAPPER (dawson, Complex, ::dawson); |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
934 ARRAY_MAPPER (ceil, Complex, ::ceil); |
|
13107
353c71c76f22
maint: fix compilation problem with g++ -std=c++0x option
Júlio Hoffimann <julio.hoffimann@gmail.com>
parents:
11586
diff
changeset
|
935 ARRAY_MAPPER (conj, Complex, std::conj<double>); |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
936 ARRAY_MAPPER (cos, Complex, std::cos); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
937 ARRAY_MAPPER (cosh, Complex, std::cosh); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
938 ARRAY_MAPPER (exp, Complex, std::exp); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
939 ARRAY_MAPPER (expm1, Complex, ::expm1); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
940 ARRAY_MAPPER (fix, Complex, ::fix); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
941 ARRAY_MAPPER (floor, Complex, ::floor); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
942 ARRAY_MAPPER (log, Complex, std::log); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
943 ARRAY_MAPPER (log2, Complex, xlog2); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
944 ARRAY_MAPPER (log10, Complex, std::log10); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
945 ARRAY_MAPPER (log1p, Complex, ::log1p); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
946 ARRAY_MAPPER (round, Complex, xround); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
947 ARRAY_MAPPER (roundb, Complex, xroundb); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
948 ARRAY_MAPPER (signum, Complex, ::signum); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
949 ARRAY_MAPPER (sin, Complex, std::sin); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
950 ARRAY_MAPPER (sinh, Complex, std::sinh); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
951 ARRAY_MAPPER (sqrt, Complex, std::sqrt); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
952 ARRAY_MAPPER (tan, Complex, std::tan); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
953 ARRAY_MAPPER (tanh, Complex, std::tanh); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
954 ARRAY_MAPPER (isnan, bool, xisnan); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
955 ARRAY_MAPPER (isna, bool, octave_is_NA); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
956 ARRAY_MAPPER (isinf, bool, xisinf); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
957 ARRAY_MAPPER (finite, bool, xfinite); |
|
7667
fb3a6c53c2b2
Allow negative zero imaginary part to be treated as zero for erf, erfc, gamma and lgamma mapper function
David Bateman <dbateman@free.fr>
parents:
7638
diff
changeset
|
958 |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
959 default: // Attempt to go via dense matrix. |
|
9813
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
960 return octave_base_sparse<SparseComplexMatrix>::map (umap); |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
961 } |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
962 } |