Mercurial > octave-nkf
annotate libinterp/octave-value/ov-bool-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 | |
|
15149
62a35ae7d6a2
use forward decls for mxArray in ov.h and ov-base.h
John W. Eaton <jwe@octave.org>
parents:
15057
diff
changeset
|
32 #include "dim-vector.h" |
|
62a35ae7d6a2
use forward decls for mxArray in ov.h and ov-base.h
John W. Eaton <jwe@octave.org>
parents:
15057
diff
changeset
|
33 |
|
62a35ae7d6a2
use forward decls for mxArray in ov.h and ov-base.h
John W. Eaton <jwe@octave.org>
parents:
15057
diff
changeset
|
34 #include "mxarray.h" |
| 5164 | 35 #include "ov-base.h" |
| 36 #include "ov-scalar.h" | |
| 37 #include "ov-bool.h" | |
| 38 #include "ov-bool-mat.h" | |
| 39 #include "gripes.h" | |
| 40 #include "ops.h" | |
|
8377
25bc2d31e1bf
improve OCTAVE_LOCAL_BUFFER
Jaroslav Hajek <highegg@gmail.com>
parents:
8345
diff
changeset
|
41 #include "oct-locbuf.h" |
| 5164 | 42 |
|
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
|
43 #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
|
44 |
| 5164 | 45 #include "ov-re-sparse.h" |
| 46 #include "ov-cx-sparse.h" | |
| 47 #include "ov-bool-sparse.h" | |
| 48 | |
| 49 #include "ov-base-sparse.h" | |
| 50 #include "ov-base-sparse.cc" | |
| 51 | |
| 6109 | 52 template class OCTINTERP_API octave_base_sparse<SparseBoolMatrix>; |
| 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_bool_matrix, |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
56 "sparse bool matrix", "logical"); |
| 5164 | 57 |
| 5759 | 58 static octave_base_value * |
| 59 default_numeric_conversion_function (const octave_base_value& a) | |
| 5164 | 60 { |
| 61 CAST_CONV_ARG (const octave_sparse_bool_matrix&); | |
| 62 | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
63 return |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
64 new octave_sparse_matrix (SparseMatrix (v.sparse_bool_matrix_value ())); |
| 5164 | 65 } |
| 66 | |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
7503
diff
changeset
|
67 octave_base_value::type_conv_info |
| 5164 | 68 octave_sparse_bool_matrix::numeric_conversion_function (void) const |
| 69 { | |
|
8345
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
7503
diff
changeset
|
70 return octave_base_value::type_conv_info (default_numeric_conversion_function, |
|
c777f3ce02d8
smarter conversion lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
7503
diff
changeset
|
71 octave_sparse_matrix::static_type_id ()); |
| 5164 | 72 } |
| 73 | |
| 5759 | 74 octave_base_value * |
| 5164 | 75 octave_sparse_bool_matrix::try_narrowing_conversion (void) |
| 76 { | |
| 5759 | 77 octave_base_value *retval = 0; |
| 5164 | 78 |
| 7193 | 79 if (Vsparse_auto_mutate) |
| 5164 | 80 { |
| 7193 | 81 // Don't use numel, since it can overflow for very large matrices |
| 82 // Note that for the second test, this means it becomes approximative | |
| 83 // since it involves a cast to double to avoid issues of overflow | |
| 84 if (matrix.rows () == 1 && matrix.cols () == 1) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
85 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
86 // 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
|
87 const SparseBoolMatrix tmp (matrix); |
| 5164 | 88 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
89 retval = new octave_bool (tmp (0)); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
90 } |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
91 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
|
92 && (double (matrix.byte_size ()) > double (matrix.rows ()) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
93 * double (matrix.cols ()) * sizeof (bool))) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
94 retval = new octave_bool_matrix (matrix.matrix_value ()); |
| 5164 | 95 } |
| 96 | |
| 97 return retval; | |
| 98 } | |
| 99 | |
| 100 double | |
| 101 octave_sparse_bool_matrix::double_value (bool) const | |
| 102 { | |
| 103 double retval = lo_ieee_nan_value (); | |
| 104 | |
| 105 if (numel () > 0) | |
| 106 { | |
| 6221 | 107 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
|
108 gripe_implicit_conversion ("Octave:array-to-scalar", |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
109 "bool sparse matrix", "real scalar"); |
| 5164 | 110 |
| 111 retval = matrix (0, 0); | |
| 112 } | |
| 113 else | |
| 114 gripe_invalid_conversion ("bool sparse matrix", "real scalar"); | |
| 115 | |
| 116 return retval; | |
| 117 } | |
| 118 | |
| 119 Complex | |
| 120 octave_sparse_bool_matrix::complex_value (bool) const | |
| 121 { | |
| 122 double tmp = lo_ieee_nan_value (); | |
| 123 | |
| 124 Complex retval (tmp, tmp); | |
| 125 | |
| 126 if (rows () > 0 && columns () > 0) | |
| 127 { | |
| 6221 | 128 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
|
129 gripe_implicit_conversion ("Octave:array-to-scalar", |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
130 "bool sparse matrix", "complex scalar"); |
| 5164 | 131 |
| 132 retval = matrix (0, 0); | |
| 133 } | |
| 134 else | |
| 135 gripe_invalid_conversion ("bool sparse matrix", "complex scalar"); | |
| 136 | |
| 137 return retval; | |
| 138 } | |
| 139 | |
| 140 octave_value | |
| 5279 | 141 octave_sparse_bool_matrix::convert_to_str_internal (bool pad, bool force, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
142 char type) const |
| 5164 | 143 { |
| 144 octave_value tmp = octave_value (array_value ()); | |
| 5279 | 145 return tmp.convert_to_str (pad, force, type); |
| 5164 | 146 } |
| 147 | |
|
17861
870f3e12e163
maint: Use phrase "FIXME:" for problem areas in code.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
148 // FIXME: These are inefficient ways of creating full matrices |
| 5164 | 149 |
| 150 Matrix | |
| 151 octave_sparse_bool_matrix::matrix_value (bool) const | |
| 152 { | |
| 153 return Matrix (matrix.matrix_value ()); | |
| 154 } | |
| 155 | |
| 156 ComplexMatrix | |
| 157 octave_sparse_bool_matrix::complex_matrix_value (bool) const | |
| 158 { | |
| 159 return ComplexMatrix (matrix.matrix_value ()); | |
| 160 } | |
| 161 | |
| 162 ComplexNDArray | |
| 163 octave_sparse_bool_matrix::complex_array_value (bool) const | |
| 164 { | |
| 165 return ComplexNDArray (ComplexMatrix (matrix.matrix_value ())); | |
| 166 } | |
| 167 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
168 NDArray |
| 5164 | 169 octave_sparse_bool_matrix::array_value (bool) const |
| 170 { | |
|
14861
f7afecdd87ef
maint: Use Octave coding conventions for cuddling parentheses in src/ directory
Rik <octave@nomad.inbox5.com>
parents:
14846
diff
changeset
|
171 return NDArray (Matrix (matrix.matrix_value ())); |
| 5164 | 172 } |
| 173 | |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
174 charNDArray |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
175 octave_sparse_bool_matrix::char_array_value (bool) const |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
176 { |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
177 charNDArray retval (dims (), 0); |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
178 octave_idx_type nc = matrix.cols (); |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
179 octave_idx_type nr = matrix.rows (); |
|
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 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
|
182 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
|
183 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
|
184 |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
185 return retval; |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
186 } |
|
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7193
diff
changeset
|
187 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
188 boolMatrix |
| 5944 | 189 octave_sparse_bool_matrix::bool_matrix_value (bool) const |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
190 { |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
191 return matrix.matrix_value (); |
| 5164 | 192 } |
| 193 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
194 boolNDArray |
| 5944 | 195 octave_sparse_bool_matrix::bool_array_value (bool) const |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
196 { |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
197 return boolNDArray (matrix.matrix_value ()); |
| 5164 | 198 } |
| 199 | |
| 200 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
201 SparseMatrix |
| 5188 | 202 octave_sparse_bool_matrix::sparse_matrix_value (bool) const |
| 5164 | 203 { |
| 204 return SparseMatrix (this->matrix); | |
| 205 } | |
| 206 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
207 SparseComplexMatrix |
| 5188 | 208 octave_sparse_bool_matrix::sparse_complex_matrix_value (bool) const |
| 5164 | 209 { |
| 210 return SparseComplexMatrix (this->matrix); | |
| 211 } | |
| 212 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
213 bool |
| 5164 | 214 octave_sparse_bool_matrix::save_binary (std::ostream& os, bool&) |
| 215 { | |
| 216 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
|
217 if (d.length () < 1) |
| 5164 | 218 return false; |
| 219 | |
| 220 // Ensure that additional memory is deallocated | |
| 221 matrix.maybe_compress (); | |
| 222 | |
| 223 int nr = d(0); | |
| 224 int nc = d(1); | |
|
10527
b4d2080b6df7
Replace nzmax by nnz as needed
David Bateman <dbateman@free.fr>
parents:
10315
diff
changeset
|
225 int nz = nnz (); |
| 5164 | 226 |
| 5828 | 227 int32_t itmp; |
| 5164 | 228 // 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
|
229 itmp = -2; |
| 5760 | 230 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
|
231 |
|
18772
3bffa847d215
maint: Use space after variable name and before equals sign.
Rik <rik@octave.org>
parents:
18712
diff
changeset
|
232 itmp = nr; |
| 5760 | 233 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
|
234 |
|
18772
3bffa847d215
maint: Use space after variable name and before equals sign.
Rik <rik@octave.org>
parents:
18712
diff
changeset
|
235 itmp = nc; |
| 5760 | 236 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
|
237 |
|
18772
3bffa847d215
maint: Use space after variable name and before equals sign.
Rik <rik@octave.org>
parents:
18712
diff
changeset
|
238 itmp = nz; |
| 5760 | 239 os.write (reinterpret_cast<char *> (&itmp), 4); |
| 5164 | 240 |
| 241 // add one to the printed indices to go from | |
| 242 // zero-based to one-based arrays | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
243 for (int i = 0; i < nc+1; i++) |
| 5164 | 244 { |
|
10142
829e69ec3110
make OCTAVE_QUIT a function
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
245 octave_quit (); |
|
14861
f7afecdd87ef
maint: Use Octave coding conventions for cuddling parentheses in src/ directory
Rik <octave@nomad.inbox5.com>
parents:
14846
diff
changeset
|
246 itmp = matrix.cidx (i); |
| 5760 | 247 os.write (reinterpret_cast<char *> (&itmp), 4); |
| 5164 | 248 } |
| 249 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
250 for (int i = 0; i < nz; i++) |
| 5164 | 251 { |
|
10142
829e69ec3110
make OCTAVE_QUIT a function
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
252 octave_quit (); |
|
14861
f7afecdd87ef
maint: Use Octave coding conventions for cuddling parentheses in src/ directory
Rik <octave@nomad.inbox5.com>
parents:
14846
diff
changeset
|
253 itmp = matrix.ridx (i); |
| 5760 | 254 os.write (reinterpret_cast<char *> (&itmp), 4); |
| 5164 | 255 } |
| 256 | |
| 257 OCTAVE_LOCAL_BUFFER (char, htmp, nz); | |
| 258 | |
| 259 for (int i = 0; i < nz; i++) | |
| 260 htmp[i] = (matrix.data (i) ? 1 : 0); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
261 |
| 5164 | 262 os.write (htmp, nz); |
| 263 | |
| 264 return true; | |
| 265 } | |
| 266 | |
| 267 bool | |
| 268 octave_sparse_bool_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
|
269 oct_mach_info::float_format /* fmt */) |
| 5164 | 270 { |
| 5828 | 271 int32_t nz, nc, nr, tmp; |
| 5760 | 272 if (! is.read (reinterpret_cast<char *> (&tmp), 4)) |
| 5164 | 273 return false; |
| 274 | |
| 275 if (swap) | |
| 276 swap_bytes<4> (&tmp); | |
| 277 | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
278 if (tmp != -2) |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
279 { |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
280 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
|
281 return false; |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
282 } |
| 5164 | 283 |
| 5760 | 284 if (! is.read (reinterpret_cast<char *> (&nr), 4)) |
| 5164 | 285 return false; |
| 5760 | 286 if (! is.read (reinterpret_cast<char *> (&nc), 4)) |
| 5164 | 287 return false; |
| 5760 | 288 if (! is.read (reinterpret_cast<char *> (&nz), 4)) |
| 5164 | 289 return false; |
| 290 | |
| 291 if (swap) | |
| 292 { | |
| 293 swap_bytes<4> (&nr); | |
| 294 swap_bytes<4> (&nc); | |
| 295 swap_bytes<4> (&nz); | |
| 296 } | |
| 297 | |
| 5275 | 298 SparseBoolMatrix m (static_cast<octave_idx_type> (nr), |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
299 static_cast<octave_idx_type> (nc), |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
300 static_cast<octave_idx_type> (nz)); |
| 5164 | 301 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
302 for (int i = 0; i < nc+1; i++) |
| 5164 | 303 { |
|
10142
829e69ec3110
make OCTAVE_QUIT a function
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
304 octave_quit (); |
| 5760 | 305 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
|
306 return false; |
| 5164 | 307 if (swap) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
308 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
|
309 m.cidx (i) = tmp; |
| 5164 | 310 } |
| 311 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
312 for (int i = 0; i < nz; i++) |
| 5164 | 313 { |
|
10142
829e69ec3110
make OCTAVE_QUIT a function
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
314 octave_quit (); |
| 5760 | 315 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
|
316 return false; |
| 5164 | 317 if (swap) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
318 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
|
319 m.ridx (i) = tmp; |
| 5164 | 320 } |
| 321 | |
|
20587
f90c8372b7ba
eliminate many more simple uses of error_state
John W. Eaton <jwe@octave.org>
parents:
20216
diff
changeset
|
322 if (! is) |
| 5164 | 323 return false; |
| 324 | |
| 325 OCTAVE_LOCAL_BUFFER (char, htmp, nz); | |
| 326 | |
| 327 if (! is.read (htmp, nz)) | |
| 328 return false; | |
| 329 | |
| 330 for (int i = 0; i < nz; i++) | |
| 331 m.data(i) = (htmp[i] ? 1 : 0); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
332 |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
333 if (! m.indices_ok ()) |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
334 return false; |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
335 |
| 5164 | 336 matrix = m; |
| 337 | |
| 338 return true; | |
| 339 } | |
| 340 | |
|
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
|
341 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
|
342 octave_sparse_bool_matrix::save_hdf5 (octave_hdf5_id loc_id, const char *name, 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
|
343 { |
|
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
|
344 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
|
345 |
| 5164 | 346 #if defined (HAVE_HDF5) |
| 5900 | 347 |
| 5164 | 348 dim_vector dv = dims (); |
| 349 int empty = save_hdf5_empty (loc_id, name, dv); | |
| 350 if (empty) | |
| 351 return (empty > 0); | |
| 352 | |
| 353 // Ensure that additional memory is deallocated | |
| 354 matrix.maybe_compress (); | |
|
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
|
355 #if HAVE_HDF5_18 |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
356 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
|
357 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
|
358 #else |
| 5164 | 359 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
|
360 #endif |
| 5164 | 361 if (group_hid < 0) |
| 362 return false; | |
| 363 | |
|
18099
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17861
diff
changeset
|
364 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:
17861
diff
changeset
|
365 space_hid = data_hid = -1; |
| 5164 | 366 SparseBoolMatrix m = sparse_bool_matrix_value (); |
| 5351 | 367 octave_idx_type tmp; |
| 5164 | 368 hsize_t hdims[2]; |
| 369 | |
| 5760 | 370 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
|
371 if (space_hid < 0) |
| 5164 | 372 { |
| 373 H5Gclose (group_hid); | |
| 374 return false; | |
| 375 } | |
|
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
|
376 #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
|
377 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
|
378 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
|
379 #else |
| 5760 | 380 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
|
381 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
|
382 #endif |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
383 if (data_hid < 0) |
| 5164 | 384 { |
| 385 H5Sclose (space_hid); | |
| 386 H5Gclose (group_hid); | |
| 387 return false; | |
| 388 } | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
389 |
| 5164 | 390 tmp = m.rows (); |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
391 retval = H5Dwrite (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
|
392 H5S_ALL, H5P_DEFAULT, &tmp) >= 0; |
| 5164 | 393 H5Dclose (data_hid); |
| 394 if (!retval) | |
| 395 { | |
| 396 H5Sclose (space_hid); | |
| 397 H5Gclose (group_hid); | |
| 398 return false; | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
399 } |
| 5164 | 400 |
|
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
|
401 #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
|
402 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
|
403 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
|
404 #else |
| 5760 | 405 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
|
406 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
|
407 #endif |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
408 if (data_hid < 0) |
| 5164 | 409 { |
| 410 H5Sclose (space_hid); | |
| 411 H5Gclose (group_hid); | |
| 412 return false; | |
| 413 } | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
414 |
| 5164 | 415 tmp = m.cols (); |
| 5351 | 416 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
|
417 H5P_DEFAULT, &tmp) >= 0; |
| 5164 | 418 H5Dclose (data_hid); |
| 419 if (!retval) | |
| 420 { | |
| 421 H5Sclose (space_hid); | |
| 422 H5Gclose (group_hid); | |
| 423 return false; | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
424 } |
| 5164 | 425 |
|
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
|
426 #if HAVE_HDF5_18 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
427 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
|
428 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
|
429 #else |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
430 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
|
431 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
|
432 #endif |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
433 if (data_hid < 0) |
| 5164 | 434 { |
| 435 H5Sclose (space_hid); | |
| 436 H5Gclose (group_hid); | |
| 437 return false; | |
| 438 } | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
439 |
|
10527
b4d2080b6df7
Replace nzmax by nnz as needed
David Bateman <dbateman@free.fr>
parents:
10315
diff
changeset
|
440 tmp = m.nnz (); |
| 5351 | 441 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
|
442 H5P_DEFAULT, &tmp) >= 0; |
| 5164 | 443 H5Dclose (data_hid); |
| 444 if (!retval) | |
| 445 { | |
| 446 H5Sclose (space_hid); | |
| 447 H5Gclose (group_hid); | |
| 448 return false; | |
| 449 } | |
| 450 | |
| 451 H5Sclose (space_hid); | |
| 452 | |
|
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
|
453 hdims[0] = m.cols () + 1; |
| 5164 | 454 hdims[1] = 1; |
| 455 | |
| 456 space_hid = H5Screate_simple (2, hdims, 0); | |
| 457 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
458 if (space_hid < 0) |
| 5164 | 459 { |
| 460 H5Gclose (group_hid); | |
| 461 return false; | |
| 462 } | |
| 463 | |
|
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 #if HAVE_HDF5_18 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
465 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
|
466 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
|
467 #else |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
468 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
|
469 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
|
470 #endif |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
471 if (data_hid < 0) |
| 5164 | 472 { |
| 473 H5Sclose (space_hid); | |
| 474 H5Gclose (group_hid); | |
| 475 return false; | |
| 476 } | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
477 |
| 5351 | 478 octave_idx_type * itmp = m.xcidx (); |
| 479 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
|
480 H5P_DEFAULT, itmp) >= 0; |
| 5164 | 481 H5Dclose (data_hid); |
| 482 if (!retval) | |
| 483 { | |
| 484 H5Sclose (space_hid); | |
| 485 H5Gclose (group_hid); | |
| 486 return false; | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
487 } |
| 5164 | 488 |
| 489 H5Sclose (space_hid); | |
| 490 | |
|
10527
b4d2080b6df7
Replace nzmax by nnz as needed
David Bateman <dbateman@free.fr>
parents:
10315
diff
changeset
|
491 hdims[0] = m.nnz (); |
| 5164 | 492 hdims[1] = 1; |
| 493 | |
| 494 space_hid = H5Screate_simple (2, hdims, 0); | |
| 495 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
496 if (space_hid < 0) |
| 5164 | 497 { |
| 498 H5Gclose (group_hid); | |
| 499 return false; | |
| 500 } | |
| 501 | |
|
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
|
502 #if HAVE_HDF5_18 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
503 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
|
504 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
|
505 #else |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
506 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
|
507 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
|
508 #endif |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
509 if (data_hid < 0) |
| 5164 | 510 { |
| 511 H5Sclose (space_hid); | |
| 512 H5Gclose (group_hid); | |
| 513 return false; | |
| 514 } | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
515 |
| 5164 | 516 itmp = m.xridx (); |
| 5351 | 517 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
|
518 H5P_DEFAULT, itmp) >= 0; |
| 5164 | 519 H5Dclose (data_hid); |
| 520 if (!retval) | |
| 521 { | |
| 522 H5Sclose (space_hid); | |
| 523 H5Gclose (group_hid); | |
| 524 return false; | |
| 525 } | |
| 526 | |
|
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 #if HAVE_HDF5_18 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
528 data_hid = H5Dcreate (group_hid, "data", H5T_NATIVE_HBOOL, space_hid, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
529 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
|
530 #else |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
531 data_hid = H5Dcreate (group_hid, "data", H5T_NATIVE_HBOOL, space_hid, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
532 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
|
533 #endif |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
534 if (data_hid < 0) |
| 5164 | 535 { |
| 536 H5Sclose (space_hid); | |
| 537 H5Gclose (group_hid); | |
| 538 return false; | |
| 539 } | |
| 6276 | 540 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
541 OCTAVE_LOCAL_BUFFER (hbool_t, htmp, m.nnz ()); |
|
10527
b4d2080b6df7
Replace nzmax by nnz as needed
David Bateman <dbateman@free.fr>
parents:
10315
diff
changeset
|
542 for (int i = 0; i < m.nnz (); i++) |
| 5164 | 543 htmp[i] = m.xdata(i); |
| 544 | |
| 545 retval = H5Dwrite (data_hid, H5T_NATIVE_HBOOL, H5S_ALL, H5S_ALL, | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
546 H5P_DEFAULT, htmp) >= 0; |
| 5164 | 547 H5Dclose (data_hid); |
| 548 H5Sclose (space_hid); | |
| 549 H5Gclose (group_hid); | |
| 550 | |
|
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
|
551 #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
|
552 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
|
553 #endif |
|
20216
aa36fb998a4d
maint: Remove unnecessary whitespace at end of lines.
Rik <rik@octave.org>
parents:
19897
diff
changeset
|
554 |
| 5164 | 555 return retval; |
| 556 } | |
| 557 | |
| 558 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
|
559 octave_sparse_bool_matrix::load_hdf5 (octave_hdf5_id loc_id, const char *name) |
| 5164 | 560 { |
|
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
|
561 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
|
562 |
|
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
|
563 #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
|
564 |
| 5351 | 565 octave_idx_type nr, nc, nz; |
| 5164 | 566 hid_t group_hid, data_hid, space_hid; |
| 567 hsize_t rank; | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
568 |
| 5164 | 569 dim_vector dv; |
| 570 int empty = load_hdf5_empty (loc_id, name, dv); | |
| 571 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
|
572 matrix.resize (dv); |
| 5164 | 573 if (empty) |
| 574 return (empty > 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
|
575 |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
576 #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
|
577 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
|
578 #else |
| 5164 | 579 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
|
580 #endif |
|
18712
6113e0c6920b
maint: Clean up extra spaces before/after parentheses.
Rik <rik@octave.org>
parents:
18099
diff
changeset
|
581 if (group_hid < 0) return false; |
| 5164 | 582 |
|
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
|
583 #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
|
584 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
|
585 #else |
| 5164 | 586 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
|
587 #endif |
| 5164 | 588 space_hid = H5Dget_space (data_hid); |
| 589 rank = H5Sget_simple_extent_ndims (space_hid); | |
| 590 | |
| 591 if (rank != 0) | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
592 { |
| 5164 | 593 H5Dclose (data_hid); |
| 594 H5Gclose (group_hid); | |
| 595 return false; | |
| 596 } | |
| 597 | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
598 if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, &nr) |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
599 < 0) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
600 { |
| 5164 | 601 H5Dclose (data_hid); |
| 602 H5Gclose (group_hid); | |
| 603 return false; | |
| 604 } | |
| 605 | |
| 606 H5Dclose (data_hid); | |
| 607 | |
|
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
|
608 #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
|
609 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
|
610 #else |
| 5164 | 611 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
|
612 #endif |
| 5164 | 613 space_hid = H5Dget_space (data_hid); |
| 614 rank = H5Sget_simple_extent_ndims (space_hid); | |
| 615 | |
| 616 if (rank != 0) | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
617 { |
| 5164 | 618 H5Dclose (data_hid); |
| 619 H5Gclose (group_hid); | |
| 620 return false; | |
| 621 } | |
| 622 | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
623 if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, &nc) |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
624 < 0) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
625 { |
| 5164 | 626 H5Dclose (data_hid); |
| 627 H5Gclose (group_hid); | |
| 628 return false; | |
| 629 } | |
| 630 | |
| 631 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
|
632 |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
633 #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
|
634 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
|
635 #else |
| 5164 | 636 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
|
637 #endif |
| 5164 | 638 space_hid = H5Dget_space (data_hid); |
| 639 rank = H5Sget_simple_extent_ndims (space_hid); | |
| 640 | |
| 641 if (rank != 0) | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
642 { |
| 5164 | 643 H5Dclose (data_hid); |
| 644 H5Gclose (group_hid); | |
| 645 return false; | |
| 646 } | |
| 647 | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
648 if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, &nz) |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
649 < 0) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
650 { |
| 5164 | 651 H5Dclose (data_hid); |
| 652 H5Gclose (group_hid); | |
| 653 return false; | |
| 654 } | |
| 655 | |
| 656 H5Dclose (data_hid); | |
| 657 | |
| 5275 | 658 SparseBoolMatrix m (static_cast<octave_idx_type> (nr), |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
659 static_cast<octave_idx_type> (nc), |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
660 static_cast<octave_idx_type> (nz)); |
| 5164 | 661 |
|
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
|
662 #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
|
663 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
|
664 #else |
| 5164 | 665 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
|
666 #endif |
| 5164 | 667 space_hid = H5Dget_space (data_hid); |
| 668 rank = H5Sget_simple_extent_ndims (space_hid); | |
| 669 | |
| 670 if (rank != 2) | |
| 671 { | |
| 672 H5Sclose (space_hid); | |
| 673 H5Dclose (data_hid); | |
| 674 H5Gclose (group_hid); | |
| 675 return false; | |
| 676 } | |
| 677 | |
| 678 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank); | |
| 679 OCTAVE_LOCAL_BUFFER (hsize_t, maxdims, rank); | |
| 680 | |
| 681 H5Sget_simple_extent_dims (space_hid, hdims, maxdims); | |
| 682 | |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
683 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
|
684 || static_cast<int> (hdims[1]) != 1) |
| 5164 | 685 { |
| 686 H5Sclose (space_hid); | |
| 687 H5Dclose (data_hid); | |
| 688 H5Gclose (group_hid); | |
| 689 return false; | |
| 690 } | |
| 691 | |
| 5351 | 692 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
|
693 if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, H5P_DEFAULT, itmp) |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
694 < 0) |
| 5164 | 695 { |
| 696 H5Sclose (space_hid); | |
| 697 H5Dclose (data_hid); | |
| 698 H5Gclose (group_hid); | |
| 699 return false; | |
| 700 } | |
| 701 | |
| 702 H5Sclose (space_hid); | |
| 703 H5Dclose (data_hid); | |
| 704 | |
|
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
|
705 #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
|
706 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
|
707 #else |
| 5164 | 708 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
|
709 #endif |
| 5164 | 710 space_hid = H5Dget_space (data_hid); |
| 711 rank = H5Sget_simple_extent_ndims (space_hid); | |
| 712 | |
| 713 if (rank != 2) | |
| 714 { | |
| 715 H5Sclose (space_hid); | |
| 716 H5Dclose (data_hid); | |
| 717 H5Gclose (group_hid); | |
| 718 return false; | |
| 719 } | |
| 720 | |
| 721 H5Sget_simple_extent_dims (space_hid, hdims, maxdims); | |
| 722 | |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
723 if (static_cast<int> (hdims[0]) != nz |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
724 || static_cast<int> (hdims[1]) != 1) |
| 5164 | 725 { |
| 726 H5Sclose (space_hid); | |
| 727 H5Dclose (data_hid); | |
| 728 H5Gclose (group_hid); | |
| 729 return false; | |
| 730 } | |
| 731 | |
| 732 itmp = m.xridx (); | |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
733 if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
734 H5P_DEFAULT, itmp) < 0) |
| 5164 | 735 { |
| 736 H5Sclose (space_hid); | |
| 737 H5Dclose (data_hid); | |
| 738 H5Gclose (group_hid); | |
| 739 return false; | |
| 740 } | |
| 741 | |
| 742 H5Sclose (space_hid); | |
| 743 H5Dclose (data_hid); | |
| 744 | |
|
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
|
745 #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
|
746 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
|
747 #else |
| 5164 | 748 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
|
749 #endif |
| 5164 | 750 space_hid = H5Dget_space (data_hid); |
| 751 rank = H5Sget_simple_extent_ndims (space_hid); | |
| 752 | |
| 753 if (rank != 2) | |
| 754 { | |
| 755 H5Sclose (space_hid); | |
| 756 H5Dclose (data_hid); | |
| 757 H5Gclose (group_hid); | |
| 758 return false; | |
| 759 } | |
| 760 | |
| 761 H5Sget_simple_extent_dims (space_hid, hdims, maxdims); | |
| 762 | |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
763 if (static_cast<int> (hdims[0]) != nz |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
764 || static_cast<int> (hdims[1]) != 1) |
| 5164 | 765 { |
| 766 H5Sclose (space_hid); | |
| 767 H5Dclose (data_hid); | |
| 768 H5Gclose (group_hid); | |
| 769 return false; | |
| 770 } | |
| 771 | |
| 6775 | 772 OCTAVE_LOCAL_BUFFER (hbool_t, htmp, nz); |
|
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
|
773 |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
774 if (H5Dread (data_hid, H5T_NATIVE_HBOOL, H5S_ALL, H5S_ALL, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
775 H5P_DEFAULT, htmp) >= 0 |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
776 && m.indices_ok ()) |
| 5164 | 777 { |
| 778 retval = true; | |
| 779 | |
| 780 for (int i = 0; i < nz; i++) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
781 m.xdata(i) = htmp[i]; |
| 5164 | 782 |
| 783 matrix = m; | |
| 784 } | |
| 785 | |
| 786 H5Sclose (space_hid); | |
| 787 H5Dclose (data_hid); | |
| 788 H5Gclose (group_hid); | |
| 789 | |
|
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
|
790 #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
|
791 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
|
792 #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
|
793 |
| 5164 | 794 return retval; |
| 795 } | |
| 5900 | 796 |
| 797 mxArray * | |
| 798 octave_sparse_bool_matrix::as_mxArray (void) const | |
| 799 { | |
| 6686 | 800 mwSize nz = nzmax (); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
801 mxArray *retval = new mxArray (mxLOGICAL_CLASS, rows (), columns (), |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
802 nz, mxREAL); |
| 5903 | 803 bool *pr = static_cast<bool *> (retval->get_data ()); |
| 6686 | 804 mwIndex *ir = retval->get_ir (); |
| 805 mwIndex *jc = retval->get_jc (); | |
| 5903 | 806 |
| 6686 | 807 for (mwIndex i = 0; i < nz; i++) |
| 5903 | 808 { |
|
14861
f7afecdd87ef
maint: Use Octave coding conventions for cuddling parentheses in src/ directory
Rik <octave@nomad.inbox5.com>
parents:
14846
diff
changeset
|
809 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
|
810 ir[i] = matrix.ridx (i); |
| 5903 | 811 } |
| 812 | |
| 6686 | 813 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
|
814 jc[i] = matrix.cidx (i); |
| 5903 | 815 |
| 816 return retval; | |
| 5900 | 817 } |