Mercurial > hg > octave-lyh
annotate libinterp/octave-value/ov-re-sparse.cc @ 15195:2fc554ffbc28
split libinterp from src
* libinterp: New directory. Move all files from src directory here
except Makefile.am, main.cc, main-cli.cc, mkoctfile.in.cc,
mkoctfilr.in.sh, octave-config.in.cc, octave-config.in.sh.
* libinterp/Makefile.am: New file, extracted from src/Makefile.am.
* src/Makefile.am: Delete everything except targets and definitions
needed to build and link main and utility programs.
* Makefile.am (SUBDIRS): Include libinterp in the list.
* autogen.sh: Run config-module.sh in libinterp/dldfcn directory, not
src/dldfcn directory.
* configure.ac (AC_CONFIG_SRCDIR): Use libinterp/octave.cc, not
src/octave.cc.
(DL_LDFLAGS, LIBOCTINTERP): Use libinterp, not src.
(AC_CONFIG_FILES): Include libinterp/Makefile in the list.
* find-docstring-files.sh: Look in libinterp, not src.
* gui/src/Makefile.am (liboctgui_la_CPPFLAGS): Find header files in
libinterp, not src.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sat, 18 Aug 2012 16:23:39 -0400 |
| parents | src/octave-value/ov-re-sparse.cc@62a35ae7d6a2 |
| children | 9020dddc925a |
| rev | line source |
|---|---|
| 5164 | 1 /* |
| 2 | |
|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
3 Copyright (C) 2004-2012 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 <climits> | |
| 29 | |
| 30 #include <iostream> | |
| 31 #include <vector> | |
| 32 | |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
33 #include "lo-specfun.h" |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
34 #include "lo-mappers.h" |
|
8377
25bc2d31e1bf
improve OCTAVE_LOCAL_BUFFER
Jaroslav Hajek <highegg@gmail.com>
parents:
7922
diff
changeset
|
35 #include "oct-locbuf.h" |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
36 |
|
15149
62a35ae7d6a2
use forward decls for mxArray in ov.h and ov-base.h
John W. Eaton <jwe@octave.org>
parents:
15057
diff
changeset
|
37 #include "mxarray.h" |
| 5164 | 38 #include "ov-base.h" |
| 39 #include "ov-scalar.h" | |
| 40 #include "gripes.h" | |
| 41 | |
| 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 DEFINE_OCTAVE_ALLOCATOR (octave_sparse_matrix); | |
| 54 | |
| 6823 | 55 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_sparse_matrix, "sparse matrix", "double"); |
| 5164 | 56 |
| 5282 | 57 idx_vector |
| 58 octave_sparse_matrix::index_vector (void) const | |
| 59 { | |
| 5604 | 60 if (matrix.numel () == matrix.nnz ()) |
| 5282 | 61 return idx_vector (array_value ()); |
| 62 else | |
| 63 { | |
| 64 std::string nm = type_name (); | |
| 65 error ("%s type invalid as index value", nm.c_str ()); | |
| 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 | |
| 5775 | 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 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
227 if (xisnan (d)) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
228 { |
|
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
|
229 gripe_nan_to_character_conversion (); |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
230 return retval; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
231 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
232 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
233 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
234 int ival = NINT (d); |
| 5282 | 235 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
236 if (ival < 0 || ival > UCHAR_MAX) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
237 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
238 // FIXME -- is there something |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
239 // better we could do? |
| 5282 | 240 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
241 ival = 0; |
| 5282 | 242 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
243 if (! warned) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
244 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
245 ::warning ("range error for conversion to character value"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
246 warned = true; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
247 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
248 } |
| 5282 | 249 |
|
14861
f7afecdd87ef
maint: Use Octave coding conventions for cuddling parentheses in src/ directory
Rik <octave@nomad.inbox5.com>
parents:
14846
diff
changeset
|
250 chm (matrix.ridx (i) + j * nr) = |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
251 static_cast<char> (ival); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
252 } |
|
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 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
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 |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
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 |
| 5164 | 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 |
| 5164 | 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 } |
|
10527
b4d2080b6df7
Replace nzmax by nnz as needed
David Bateman <dbateman@free.fr>
parents:
10414
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 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
309 for (int i = 0; i < nc+1; i++) |
| 5164 | 310 { |
|
10142
829e69ec3110
make OCTAVE_QUIT a function
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
311 octave_quit (); |
|
14861
f7afecdd87ef
maint: Use Octave coding conventions for cuddling parentheses in src/ directory
Rik <octave@nomad.inbox5.com>
parents:
14846
diff
changeset
|
312 itmp = matrix.cidx (i); |
| 5760 | 313 os.write (reinterpret_cast<char *> (&itmp), 4); |
| 5164 | 314 } |
| 315 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
316 for (int i = 0; i < nz; i++) |
| 5164 | 317 { |
|
10142
829e69ec3110
make OCTAVE_QUIT a function
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
318 octave_quit (); |
|
14861
f7afecdd87ef
maint: Use Octave coding conventions for cuddling parentheses in src/ directory
Rik <octave@nomad.inbox5.com>
parents:
14846
diff
changeset
|
319 itmp = matrix.ridx (i); |
| 5760 | 320 os.write (reinterpret_cast<char *> (&itmp), 4); |
| 5164 | 321 } |
| 322 | |
|
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
|
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 | |
| 341 if (tmp != -2) { | |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
342 error ("load: only 2D sparse matrices are supported"); |
| 5164 | 343 return false; |
| 344 } | |
| 345 | |
| 5760 | 346 if (! is.read (reinterpret_cast<char *> (&nr), 4)) |
| 5164 | 347 return false; |
| 5760 | 348 if (! is.read (reinterpret_cast<char *> (&nc), 4)) |
| 5164 | 349 return false; |
| 5760 | 350 if (! is.read (reinterpret_cast<char *> (&nz), 4)) |
| 5164 | 351 return false; |
| 352 | |
| 353 if (swap) | |
| 354 { | |
| 355 swap_bytes<4> (&nr); | |
| 356 swap_bytes<4> (&nc); | |
| 357 swap_bytes<4> (&nz); | |
| 358 } | |
| 359 | |
| 5275 | 360 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
|
361 static_cast<octave_idx_type> (nc), |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
362 static_cast<octave_idx_type> (nz)); |
| 5164 | 363 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
364 for (int i = 0; i < nc+1; i++) |
| 5164 | 365 { |
|
10142
829e69ec3110
make OCTAVE_QUIT a function
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
366 octave_quit (); |
| 5760 | 367 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
|
368 return false; |
| 5164 | 369 if (swap) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
370 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
|
371 m.xcidx (i) = tmp; |
| 5164 | 372 } |
| 373 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
374 for (int i = 0; i < nz; i++) |
| 5164 | 375 { |
|
10142
829e69ec3110
make OCTAVE_QUIT a function
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
376 octave_quit (); |
| 5760 | 377 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
|
378 return false; |
| 5164 | 379 if (swap) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
380 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
|
381 m.xridx (i) = tmp; |
| 5164 | 382 } |
| 383 | |
| 5760 | 384 if (! is.read (reinterpret_cast<char *> (&ctmp), 1)) |
| 5164 | 385 return false; |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
386 |
| 5760 | 387 read_doubles (is, m.xdata (), static_cast<save_type> (ctmp), nz, swap, fmt); |
| 5164 | 388 |
| 389 if (error_state || ! is) | |
| 390 return false; | |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
391 |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
392 if (! m.indices_ok ()) |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
393 return false; |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
394 |
| 5164 | 395 matrix = m; |
| 396 | |
| 397 return true; | |
| 398 } | |
| 399 | |
| 400 #if defined (HAVE_HDF5) | |
| 5900 | 401 |
| 5164 | 402 bool |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
403 octave_sparse_matrix::save_hdf5 (hid_t loc_id, const char *name, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
404 bool save_as_floats) |
| 5164 | 405 { |
| 406 dim_vector dv = dims (); | |
| 407 int empty = save_hdf5_empty (loc_id, name, dv); | |
| 408 if (empty) | |
| 409 return (empty > 0); | |
| 410 | |
| 411 // Ensure that additional memory is deallocated | |
| 412 matrix.maybe_compress (); | |
| 413 | |
|
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
|
414 #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
|
415 hid_t group_hid = H5Gcreate (loc_id, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
416 #else |
| 5164 | 417 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
|
418 #endif |
| 5164 | 419 if (group_hid < 0) |
| 420 return false; | |
| 421 | |
| 422 hid_t space_hid = -1, data_hid = -1; | |
| 423 bool retval = true; | |
| 424 SparseMatrix m = sparse_matrix_value (); | |
| 5351 | 425 octave_idx_type tmp; |
| 5164 | 426 hsize_t hdims[2]; |
| 427 | |
| 5760 | 428 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
|
429 if (space_hid < 0) |
| 5164 | 430 { |
| 431 H5Gclose (group_hid); | |
| 432 return false; | |
| 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, "nr", 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, "nr", 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.rows (); |
| 5351 | 449 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
|
450 &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 } |
|
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
|
458 #if HAVE_HDF5_18 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
459 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
|
460 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
|
461 #else |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
462 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
|
463 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
|
464 #endif |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
465 if (data_hid < 0) |
| 5164 | 466 { |
| 467 H5Sclose (space_hid); | |
| 468 H5Gclose (group_hid); | |
| 469 return false; | |
| 470 } | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
471 |
| 5164 | 472 tmp = m.cols (); |
| 5351 | 473 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
|
474 &tmp) >= 0; |
| 5164 | 475 H5Dclose (data_hid); |
| 476 if (!retval) | |
| 477 { | |
| 478 H5Sclose (space_hid); | |
| 479 H5Gclose (group_hid); | |
| 480 return false; | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
481 } |
| 5164 | 482 |
|
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
|
483 #if HAVE_HDF5_18 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
484 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
|
485 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
486 #else |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
487 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
|
488 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
|
489 #endif |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
490 if (data_hid < 0) |
| 5164 | 491 { |
| 492 H5Sclose (space_hid); | |
| 493 H5Gclose (group_hid); | |
| 494 return false; | |
| 495 } | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
496 |
|
10527
b4d2080b6df7
Replace nzmax by nnz as needed
David Bateman <dbateman@free.fr>
parents:
10414
diff
changeset
|
497 tmp = m.nnz (); |
| 5351 | 498 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
|
499 &tmp) >= 0; |
| 5164 | 500 H5Dclose (data_hid); |
| 501 if (!retval) | |
| 502 { | |
| 503 H5Sclose (space_hid); | |
| 504 H5Gclose (group_hid); | |
| 505 return false; | |
| 506 } | |
| 507 | |
| 508 H5Sclose (space_hid); | |
| 509 | |
|
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
|
510 hdims[0] = m.cols () + 1; |
| 5164 | 511 hdims[1] = 1; |
| 512 | |
| 513 space_hid = H5Screate_simple (2, hdims, 0); | |
| 514 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
515 if (space_hid < 0) |
| 5164 | 516 { |
| 517 H5Gclose (group_hid); | |
| 518 return false; | |
| 519 } | |
| 520 | |
|
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
|
521 #if HAVE_HDF5_18 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
522 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
|
523 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
|
524 #else |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
525 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
|
526 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
|
527 #endif |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
528 if (data_hid < 0) |
| 5164 | 529 { |
| 530 H5Sclose (space_hid); | |
| 531 H5Gclose (group_hid); | |
| 532 return false; | |
| 533 } | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
534 |
| 5351 | 535 octave_idx_type * itmp = m.xcidx (); |
| 536 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
|
537 itmp) >= 0; |
| 5164 | 538 H5Dclose (data_hid); |
| 539 if (!retval) | |
| 540 { | |
| 541 H5Sclose (space_hid); | |
| 542 H5Gclose (group_hid); | |
| 543 return false; | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
544 } |
| 5164 | 545 |
| 546 H5Sclose (space_hid); | |
| 547 | |
|
10527
b4d2080b6df7
Replace nzmax by nnz as needed
David Bateman <dbateman@free.fr>
parents:
10414
diff
changeset
|
548 hdims[0] = m.nnz (); |
| 5164 | 549 hdims[1] = 1; |
| 550 | |
| 551 space_hid = H5Screate_simple (2, hdims, 0); | |
| 552 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
553 if (space_hid < 0) |
| 5164 | 554 { |
| 555 H5Gclose (group_hid); | |
| 556 return false; | |
| 557 } | |
|
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
|
558 #if HAVE_HDF5_18 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
559 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
|
560 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
|
561 #else |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
562 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
|
563 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
|
564 #endif |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
565 if (data_hid < 0) |
| 5164 | 566 { |
| 567 H5Sclose (space_hid); | |
| 568 H5Gclose (group_hid); | |
| 569 return false; | |
| 570 } | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
571 |
| 5164 | 572 itmp = m.xridx (); |
| 5351 | 573 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
|
574 itmp) >= 0; |
| 5164 | 575 H5Dclose (data_hid); |
| 576 if (!retval) | |
| 577 { | |
| 578 H5Sclose (space_hid); | |
| 579 H5Gclose (group_hid); | |
| 580 return false; | |
| 581 } | |
| 582 | |
| 583 hid_t save_type_hid = H5T_NATIVE_DOUBLE; | |
| 584 | |
| 585 if (save_as_floats) | |
| 586 { | |
| 587 if (m.too_large_for_float ()) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
588 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
589 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
|
590 warning ("save: saving as doubles instead"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
591 } |
| 5164 | 592 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
593 save_type_hid = H5T_NATIVE_FLOAT; |
| 5164 | 594 } |
| 595 #if HAVE_HDF5_INT2FLOAT_CONVERSIONS | |
| 596 // hdf5 currently doesn't support float/integer conversions | |
| 597 else | |
| 598 { | |
| 599 double max_val, min_val; | |
| 600 | |
| 601 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
|
602 save_type_hid |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
603 = save_type_to_hdf5 (get_save_type (max_val, min_val)); |
| 5164 | 604 } |
| 605 #endif /* HAVE_HDF5_INT2FLOAT_CONVERSIONS */ | |
| 606 | |
|
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
|
607 #if HAVE_HDF5_18 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
608 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
|
609 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
|
610 #else |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
611 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
|
612 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
|
613 #endif |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
614 if (data_hid < 0) |
| 5164 | 615 { |
| 616 H5Sclose (space_hid); | |
| 617 H5Gclose (group_hid); | |
| 618 return false; | |
| 619 } | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
620 |
| 5164 | 621 double * dtmp = m.xdata (); |
| 622 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
|
623 H5P_DEFAULT, dtmp) >= 0; |
| 5164 | 624 H5Dclose (data_hid); |
| 625 H5Sclose (space_hid); | |
| 626 H5Gclose (group_hid); | |
| 627 | |
| 628 return retval; | |
| 629 } | |
| 630 | |
| 631 bool | |
|
9881
b3089dba88bf
Remove HDF5 cruft for older versions of HDF5
Kacper Kowalik
parents:
9852
diff
changeset
|
632 octave_sparse_matrix::load_hdf5 (hid_t loc_id, const char *name) |
| 5164 | 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 |
| 5760 | 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 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
667 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
|
668 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 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
692 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
|
693 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); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
701 |
|
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
|
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 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
717 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
|
718 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 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
|
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 (); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
762 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
|
763 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 | |
| 5322 | 792 if (static_cast<int> (hdims[0]) != nz || static_cast<int> (hdims[1]) != 1) |
| 5164 | 793 { |
| 794 H5Sclose (space_hid); | |
| 795 H5Dclose (data_hid); | |
| 796 H5Gclose (group_hid); | |
| 797 return false; | |
| 798 } | |
| 799 | |
| 800 itmp = m.xridx (); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
801 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
|
802 H5P_DEFAULT, itmp) < 0) |
| 5164 | 803 { |
| 804 H5Sclose (space_hid); | |
| 805 H5Dclose (data_hid); | |
| 806 H5Gclose (group_hid); | |
| 807 return false; | |
| 808 } | |
| 809 | |
| 810 H5Sclose (space_hid); | |
| 811 H5Dclose (data_hid); | |
| 812 | |
|
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
|
813 #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
|
814 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
|
815 #else |
| 5164 | 816 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
|
817 #endif |
| 5164 | 818 space_hid = H5Dget_space (data_hid); |
| 819 rank = H5Sget_simple_extent_ndims (space_hid); | |
| 820 | |
| 821 if (rank != 2) | |
| 822 { | |
| 823 H5Sclose (space_hid); | |
| 824 H5Dclose (data_hid); | |
| 825 H5Gclose (group_hid); | |
| 826 return false; | |
| 827 } | |
| 828 | |
| 829 H5Sget_simple_extent_dims (space_hid, hdims, maxdims); | |
| 830 | |
| 5322 | 831 if (static_cast<int> (hdims[0]) != nz || static_cast<int> (hdims[1]) != 1) |
| 5164 | 832 { |
| 833 H5Sclose (space_hid); | |
| 834 H5Dclose (data_hid); | |
| 835 H5Gclose (group_hid); | |
| 836 return false; | |
| 837 } | |
| 838 | |
| 839 double *dtmp = m.xdata (); | |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
840 bool retval = false; |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
841 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
|
842 H5P_DEFAULT, dtmp) >= 0 |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
843 && m.indices_ok ()) |
| 5164 | 844 { |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
845 retval = true; |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
846 matrix = m; |
| 5164 | 847 } |
| 848 | |
| 849 H5Sclose (space_hid); | |
| 850 H5Dclose (data_hid); | |
| 851 H5Gclose (group_hid); | |
| 852 | |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
853 return retval; |
| 5164 | 854 } |
| 5900 | 855 |
| 5164 | 856 #endif |
| 857 | |
| 5900 | 858 mxArray * |
| 859 octave_sparse_matrix::as_mxArray (void) const | |
| 860 { | |
|
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
|
861 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
|
862 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
|
863 mwSize nc = columns (); |
| 5903 | 864 mxArray *retval = new mxArray (mxDOUBLE_CLASS, nr, nc, nz, mxREAL); |
| 865 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
|
866 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
|
867 mwIndex *jc = retval->get_jc (); |
| 5903 | 868 |
| 6686 | 869 for (mwIndex i = 0; i < nz; i++) |
| 5903 | 870 { |
|
14861
f7afecdd87ef
maint: Use Octave coding conventions for cuddling parentheses in src/ directory
Rik <octave@nomad.inbox5.com>
parents:
14846
diff
changeset
|
871 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
|
872 ir[i] = matrix.ridx (i); |
| 5903 | 873 } |
| 874 | |
| 6686 | 875 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
|
876 jc[i] = matrix.cidx (i); |
| 5903 | 877 |
| 878 return retval; | |
| 5900 | 879 } |
| 880 | |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
881 octave_value |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
882 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
|
883 { |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
884 switch (umap) |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
885 { |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
886 case umap_imag: |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
887 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
|
888 |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
889 case umap_real: |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
890 case umap_conj: |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
891 return matrix; |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
892 |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
893 // Mappers handled specially. |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
894 #define ARRAY_METHOD_MAPPER(UMAP, FCN) \ |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
895 case umap_ ## UMAP: \ |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
896 return octave_value (matrix.FCN ()) |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
897 |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
898 ARRAY_METHOD_MAPPER (abs, abs); |
|
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 #define ARRAY_MAPPER(UMAP, TYPE, FCN) \ |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
901 case umap_ ## UMAP: \ |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
902 return octave_value (matrix.map<TYPE> (FCN)) |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
903 |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
904 ARRAY_MAPPER (acos, Complex, rc_acos); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
905 ARRAY_MAPPER (acosh, Complex, rc_acosh); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
906 ARRAY_MAPPER (angle, double, ::arg); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
907 ARRAY_MAPPER (arg, double, ::arg); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
908 ARRAY_MAPPER (asin, Complex, rc_asin); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
909 ARRAY_MAPPER (asinh, double, ::asinh); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
910 ARRAY_MAPPER (atan, double, ::atan); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
911 ARRAY_MAPPER (atanh, Complex, rc_atanh); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
912 ARRAY_MAPPER (erf, double, ::erf); |
|
9835
1bb1ed717d2f
implement built-in erfinv
Jaroslav Hajek <highegg@gmail.com>
parents:
9813
diff
changeset
|
913 ARRAY_MAPPER (erfinv, double, ::erfinv); |
|
14770
cb85e836d035
New function: erfcinv (bug #36607)
Axel Mathéi <axel.mathei@gmail.com>
parents:
14469
diff
changeset
|
914 ARRAY_MAPPER (erfcinv, double, ::erfcinv); |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
915 ARRAY_MAPPER (erfc, double, ::erfc); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
916 ARRAY_MAPPER (gamma, double, xgamma); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
917 ARRAY_MAPPER (lgamma, Complex, rc_lgamma); |
|
10414
2a8b1db1e2ca
implement built-in cbrt
Jaroslav Hajek <highegg@gmail.com>
parents:
10315
diff
changeset
|
918 ARRAY_MAPPER (cbrt, double, ::cbrt); |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
919 ARRAY_MAPPER (ceil, double, ::ceil); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
920 ARRAY_MAPPER (cos, double, ::cos); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
921 ARRAY_MAPPER (cosh, double, ::cosh); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
922 ARRAY_MAPPER (exp, double, ::exp); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
923 ARRAY_MAPPER (expm1, double, ::expm1); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
924 ARRAY_MAPPER (fix, double, ::fix); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
925 ARRAY_MAPPER (floor, double, ::floor); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
926 ARRAY_MAPPER (log, Complex, rc_log); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
927 ARRAY_MAPPER (log2, Complex, rc_log2); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
928 ARRAY_MAPPER (log10, Complex, rc_log10); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
929 ARRAY_MAPPER (log1p, Complex, rc_log1p); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
930 ARRAY_MAPPER (round, double, xround); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
931 ARRAY_MAPPER (roundb, double, xroundb); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
932 ARRAY_MAPPER (signum, double, ::signum); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
933 ARRAY_MAPPER (sin, double, ::sin); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
934 ARRAY_MAPPER (sinh, double, ::sinh); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
935 ARRAY_MAPPER (sqrt, Complex, rc_sqrt); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
936 ARRAY_MAPPER (tan, double, ::tan); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
937 ARRAY_MAPPER (tanh, double, ::tanh); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
938 ARRAY_MAPPER (isnan, bool, xisnan); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
939 ARRAY_MAPPER (isna, bool, octave_is_NA); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
940 ARRAY_MAPPER (isinf, bool, xisinf); |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
941 ARRAY_MAPPER (finite, bool, xfinite); |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
942 |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9689
diff
changeset
|
943 default: // Attempt to go via dense matrix. |
|
9813
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
944 return octave_base_sparse<SparseMatrix>::map (umap); |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
945 } |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
946 } |