Mercurial > hg > octave-nkf
annotate libinterp/octave-value/ov-base-int.cc @ 19840:c5270263d466 gui-release
close gui-release branch
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 30 Jan 2015 17:41:50 -0500 |
| parents | 175b392e91fe |
| children | 6a71e5030df5 |
| rev | line source |
|---|---|
| 4903 | 1 /* |
| 2 | |
|
17744
d63878346099
maint: Update copyright notices for release.
John W. Eaton <jwe@octave.org>
parents:
15215
diff
changeset
|
3 Copyright (C) 2004-2013 John W. Eaton |
| 4903 | 4 |
| 5 This file is part of Octave. | |
| 6 | |
| 7 Octave is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
| 10 option) any later version. | |
| 4903 | 11 |
| 12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 7016 | 18 along with Octave; see the file COPYING. If not, see |
| 19 <http://www.gnu.org/licenses/>. | |
| 4903 | 20 |
| 21 */ | |
| 22 | |
| 23 #ifdef HAVE_CONFIG_H | |
| 24 #include <config.h> | |
| 25 #endif | |
| 26 | |
| 27 #include <iostream> | |
|
15215
9020dddc925a
use std::numeric_limits for integer max and min values
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
28 #include <limits> |
| 4903 | 29 #include <vector> |
| 30 | |
| 31 #include "lo-ieee.h" | |
| 32 #include "lo-utils.h" | |
| 33 #include "mx-base.h" | |
| 34 #include "quit.h" | |
|
8377
25bc2d31e1bf
improve OCTAVE_LOCAL_BUFFER
Jaroslav Hajek <highegg@gmail.com>
parents:
7534
diff
changeset
|
35 #include "oct-locbuf.h" |
| 4903 | 36 |
| 37 #include "defun.h" | |
| 38 #include "gripes.h" | |
| 39 #include "oct-obj.h" | |
| 40 #include "oct-lvalue.h" | |
| 4944 | 41 #include "oct-stream.h" |
| 4903 | 42 #include "ops.h" |
| 43 #include "ov-base.h" | |
| 44 #include "ov-base-mat.h" | |
| 45 #include "ov-base-mat.cc" | |
| 46 #include "ov-base-scalar.h" | |
| 47 #include "ov-base-scalar.cc" | |
| 48 #include "ov-base-int.h" | |
| 49 #include "ov-int-traits.h" | |
| 50 #include "pr-output.h" | |
| 51 #include "variables.h" | |
| 52 | |
| 53 #include "byte-swap.h" | |
| 54 #include "ls-oct-ascii.h" | |
| 55 #include "ls-utils.h" | |
| 56 #include "ls-hdf5.h" | |
| 57 | |
|
7534
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
58 // We have all the machinery below (octave_base_int_helper and |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
59 // octave_base_int_helper_traits) to avoid a few warnings from GCC |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
60 // about comparisons always false due to limited range of data types. |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
61 // Ugh. The cure may be worse than the disease. |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
62 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
63 template <class T, bool is_signed = true, bool can_be_too_big = true> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
64 struct octave_base_int_helper |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
65 { |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
66 static bool |
|
15215
9020dddc925a
use std::numeric_limits for integer max and min values
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
67 char_value_out_of_range (T val) |
|
9020dddc925a
use std::numeric_limits for integer max and min values
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
68 { |
|
9020dddc925a
use std::numeric_limits for integer max and min values
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
69 return val < 0 || val > std::numeric_limits<unsigned char>::max (); |
|
9020dddc925a
use std::numeric_limits for integer max and min values
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
70 } |
|
7534
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
71 }; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
72 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
73 template <class T> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
74 struct octave_base_int_helper<T, false, false> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
75 { |
|
9149
7120fbbecf97
ov-base-int.cc: correct result for template specialization
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
76 static bool char_value_out_of_range (T) { return false; } |
|
7534
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
77 }; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
78 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
79 template <class T> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
80 struct octave_base_int_helper<T, false, true> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
81 { |
|
15215
9020dddc925a
use std::numeric_limits for integer max and min values
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
82 static bool char_value_out_of_range (T val) |
|
9020dddc925a
use std::numeric_limits for integer max and min values
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
83 { |
|
9020dddc925a
use std::numeric_limits for integer max and min values
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
84 return val > std::numeric_limits<unsigned char>::max (); |
|
9020dddc925a
use std::numeric_limits for integer max and min values
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
85 } |
|
7534
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
86 }; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
87 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
88 template <class T> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
89 struct octave_base_int_helper<T, true, false> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
90 { |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
91 static bool char_value_out_of_range (T val) { return val < 0; } |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
92 }; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
93 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
94 // For all types other than char, signed char, and unsigned char, we |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
95 // assume that the upper limit for the range of allowable values is |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
96 // larger than the range for unsigned char. If that's not true, we |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
97 // are still OK, but will see the warnings again for any other types |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
98 // that do not meet this assumption. |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
99 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
100 template <class T> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
101 struct octave_base_int_helper_traits |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
102 { |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
103 static const bool can_be_larger_than_uchar_max = true; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
104 }; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
105 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
106 template <> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
107 struct octave_base_int_helper_traits<char> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
108 { |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
109 static const bool can_be_larger_than_uchar_max = false; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
110 }; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
111 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
112 template <> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
113 struct octave_base_int_helper_traits<signed char> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
114 { |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
115 static const bool can_be_larger_than_uchar_max = false; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
116 }; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
117 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
118 template <> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
119 struct octave_base_int_helper_traits<unsigned char> |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
120 { |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
121 static const bool can_be_larger_than_uchar_max = false; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
122 }; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
123 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
124 |
| 4903 | 125 template <class T> |
| 5759 | 126 octave_base_value * |
| 4903 | 127 octave_base_int_matrix<T>::try_narrowing_conversion (void) |
| 128 { | |
| 5759 | 129 octave_base_value *retval = 0; |
| 4903 | 130 |
| 4932 | 131 if (this->matrix.nelem () == 1) |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
132 retval = new typename octave_value_int_traits<T>::scalar_type |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
133 (this->matrix (0)); |
| 4903 | 134 |
| 135 return retval; | |
| 136 } | |
| 137 | |
| 138 template <class T> | |
| 5992 | 139 octave_value |
| 140 octave_base_int_matrix<T>::convert_to_str_internal (bool, bool, char type) const | |
| 141 { | |
| 142 octave_value retval; | |
| 143 dim_vector dv = this->dims (); | |
| 144 octave_idx_type nel = dv.numel (); | |
| 145 | |
| 146 charNDArray chm (dv); | |
| 147 | |
| 148 bool warned = false; | |
| 149 | |
| 150 for (octave_idx_type i = 0; i < nel; i++) | |
| 151 { | |
|
10142
829e69ec3110
make OCTAVE_QUIT a function
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
152 octave_quit (); |
| 5992 | 153 |
|
8918
f5408862892f
Consistently use element_type in the array classes.
Jason Riedy <jason@acm.org>
parents:
8377
diff
changeset
|
154 typename T::element_type tmp = this->matrix(i); |
| 5992 | 155 |
|
8918
f5408862892f
Consistently use element_type in the array classes.
Jason Riedy <jason@acm.org>
parents:
8377
diff
changeset
|
156 typedef typename T::element_type::val_type val_type; |
|
7534
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
157 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
158 val_type ival = tmp.value (); |
| 5992 | 159 |
|
7534
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
160 static const bool is_signed = std::numeric_limits<val_type>::is_signed; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
161 static const bool can_be_larger_than_uchar_max |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
162 = octave_base_int_helper_traits<val_type>::can_be_larger_than_uchar_max; |
|
7534
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
163 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
164 if (octave_base_int_helper<val_type, is_signed, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
165 can_be_larger_than_uchar_max>::char_value_out_of_range (ival)) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
166 { |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
167 // FIXME: is there something better we could do? |
| 5992 | 168 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
169 ival = 0; |
| 5992 | 170 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
171 if (! warned) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
172 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
173 ::warning ("range error for conversion to character value"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
174 warned = true; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
175 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
176 } |
| 5992 | 177 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
178 chm (i) = static_cast<char> (ival); |
| 5992 | 179 } |
| 180 | |
|
9689
34d6f005db4b
eliminate is_string argument from octave_value character array constructors
John W. Eaton <jwe@octave.org>
parents:
9149
diff
changeset
|
181 retval = octave_value (chm, type); |
| 5992 | 182 |
| 183 return retval; | |
| 184 } | |
| 185 | |
| 186 template <class T> | |
| 4903 | 187 bool |
| 6974 | 188 octave_base_int_matrix<T>::save_ascii (std::ostream& os) |
| 4903 | 189 { |
| 4932 | 190 dim_vector d = this->dims (); |
| 4903 | 191 |
| 192 os << "# ndims: " << d.length () << "\n"; | |
| 193 | |
| 194 for (int i = 0; i < d.length (); i++) | |
| 195 os << " " << d (i); | |
| 196 | |
| 4932 | 197 os << "\n" << this->matrix; |
| 4903 | 198 |
| 199 return true; | |
| 200 } | |
| 201 | |
| 202 template <class T> | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
203 bool |
| 4903 | 204 octave_base_int_matrix<T>::load_ascii (std::istream& is) |
| 205 { | |
| 206 int mdims = 0; | |
| 207 bool success = true; | |
| 208 | |
| 209 if (extract_keyword (is, "ndims", mdims, true)) | |
| 210 { | |
| 211 if (mdims >= 0) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
212 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
213 dim_vector dv; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
214 dv.resize (mdims); |
| 4903 | 215 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
216 for (int i = 0; i < mdims; i++) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
217 is >> dv(i); |
| 4903 | 218 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
219 T tmp(dv); |
| 4903 | 220 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
221 is >> tmp; |
| 4903 | 222 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
223 if (!is) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
224 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
225 error ("load: failed to load matrix constant"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
226 success = false; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
227 } |
| 4903 | 228 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
229 this->matrix = tmp; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
230 } |
| 4903 | 231 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
232 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
233 error ("load: failed to extract number of rows and columns"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
234 success = false; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
235 } |
| 4903 | 236 } |
| 237 else | |
| 238 error ("load: failed to extract number of dimensions"); | |
| 239 | |
| 240 return success; | |
| 241 } | |
| 242 | |
| 243 template <class T> | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
244 bool |
| 4917 | 245 octave_base_int_matrix<T>::save_binary (std::ostream& os, bool&) |
| 4903 | 246 { |
| 4932 | 247 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:
14138
diff
changeset
|
248 if (d.length () < 1) |
| 4903 | 249 return false; |
| 250 | |
| 251 // Use negative value for ndims to differentiate with old format!! | |
|
14846
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
252 int32_t tmp = - d.length (); |
| 5760 | 253 os.write (reinterpret_cast<char *> (&tmp), 4); |
| 4903 | 254 for (int i=0; i < d.length (); i++) |
| 255 { | |
| 256 tmp = d(i); | |
| 5760 | 257 os.write (reinterpret_cast<char *> (&tmp), 4); |
| 4903 | 258 } |
| 259 | |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
260 os.write (reinterpret_cast<const char *> (this->matrix.data ()), |
|
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
261 this->byte_size ()); |
| 4903 | 262 |
| 263 return true; | |
| 264 } | |
| 265 | |
| 266 template <class T> | |
| 267 bool | |
| 268 octave_base_int_matrix<T>::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 ) |
| 4903 | 270 { |
| 5828 | 271 int32_t mdims; |
| 5760 | 272 if (! is.read (reinterpret_cast<char *> (&mdims), 4)) |
| 4903 | 273 return false; |
| 274 if (swap) | |
| 4944 | 275 swap_bytes<4> (&mdims); |
| 4917 | 276 if (mdims >= 0) |
| 277 return false; | |
| 4903 | 278 |
| 4917 | 279 mdims = - mdims; |
| 5828 | 280 int32_t di; |
| 4917 | 281 dim_vector dv; |
| 282 dv.resize (mdims); | |
| 4903 | 283 |
| 4917 | 284 for (int i = 0; i < mdims; i++) |
| 4903 | 285 { |
| 5760 | 286 if (! is.read (reinterpret_cast<char *> (&di), 4)) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
287 return false; |
| 4903 | 288 if (swap) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
289 swap_bytes<4> (&di); |
| 4917 | 290 dv(i) = di; |
| 4903 | 291 } |
| 292 | |
| 5157 | 293 // Convert an array with a single dimension to be a row vector. |
| 294 // Octave should never write files like this, other software | |
| 295 // might. | |
| 296 | |
| 297 if (mdims == 1) | |
| 298 { | |
| 299 mdims = 2; | |
| 300 dv.resize (mdims); | |
| 301 dv(1) = dv(0); | |
| 302 dv(0) = 1; | |
| 303 } | |
| 304 | |
| 4917 | 305 T m (dv); |
| 306 | |
| 5760 | 307 if (! is.read (reinterpret_cast<char *> (m.fortran_vec ()), m.byte_size ())) |
| 4917 | 308 return false; |
| 4903 | 309 |
| 4917 | 310 if (swap) |
| 311 { | |
| 312 int nel = dv.numel (); | |
|
14846
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
313 int bytes = nel / m.byte_size (); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
314 for (int i = 0; i < nel; i++) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
315 switch (bytes) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
316 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
317 case 8: |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
318 swap_bytes<8> (&m(i)); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
319 break; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
320 case 4: |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
321 swap_bytes<4> (&m(i)); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
322 break; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
323 case 2: |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
324 swap_bytes<2> (&m(i)); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
325 break; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
326 case 1: |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
327 default: |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
328 break; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
329 } |
| 4917 | 330 } |
| 331 | |
| 4932 | 332 this->matrix = m; |
| 4903 | 333 return true; |
| 334 } | |
| 335 | |
| 336 #if defined (HAVE_HDF5) | |
| 337 | |
| 338 template <class T> | |
| 339 bool | |
| 4917 | 340 octave_base_int_matrix<T>::save_hdf5 (hid_t loc_id, const char *name, bool) |
| 4903 | 341 { |
| 4917 | 342 hid_t save_type_hid = HDF5_SAVE_TYPE; |
| 4903 | 343 bool retval = true; |
| 4932 | 344 dim_vector dv = this->dims (); |
| 4903 | 345 int empty = save_hdf5_empty (loc_id, name, dv); |
| 346 if (empty) | |
| 347 return (empty > 0); | |
| 348 | |
| 349 int rank = dv.length (); | |
| 350 hid_t space_hid = -1, data_hid = -1; | |
| 351 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank); | |
| 352 | |
| 353 // Octave uses column-major, while HDF5 uses row-major ordering | |
| 354 for (int i = 0; i < rank; i++) | |
| 355 hdims[i] = dv (rank-i-1); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
356 |
| 4903 | 357 space_hid = H5Screate_simple (rank, hdims, 0); |
| 358 | |
| 359 if (space_hid < 0) return false; | |
|
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 #if HAVE_HDF5_18 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
361 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
362 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
|
363 #else |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
364 data_hid = H5Dcreate (loc_id, name, save_type_hid, space_hid, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
365 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
|
366 #endif |
| 4903 | 367 if (data_hid < 0) |
| 368 { | |
| 369 H5Sclose (space_hid); | |
| 370 return false; | |
| 371 } | |
| 372 | |
| 4917 | 373 retval = H5Dwrite (data_hid, save_type_hid, H5S_ALL, H5S_ALL, |
|
14846
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
374 H5P_DEFAULT, this->matrix.data ()) >= 0; |
| 4903 | 375 |
| 376 H5Dclose (data_hid); | |
| 377 H5Sclose (space_hid); | |
| 378 | |
| 379 return retval; | |
| 380 } | |
| 381 | |
| 382 template <class T> | |
| 383 bool | |
|
9881
b3089dba88bf
Remove HDF5 cruft for older versions of HDF5
Kacper Kowalik
parents:
9689
diff
changeset
|
384 octave_base_int_matrix<T>::load_hdf5 (hid_t loc_id, const char *name) |
| 4903 | 385 { |
| 4917 | 386 hid_t save_type_hid = HDF5_SAVE_TYPE; |
| 4903 | 387 bool retval = false; |
| 388 dim_vector dv; | |
| 389 int empty = load_hdf5_empty (loc_id, name, dv); | |
| 390 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
|
391 this->matrix.resize (dv); |
| 4903 | 392 if (empty) |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
393 return (empty > 0); |
| 4903 | 394 |
|
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
|
395 #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
|
396 hid_t data_hid = H5Dopen (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
|
397 #else |
| 4903 | 398 hid_t data_hid = H5Dopen (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
|
399 #endif |
| 4903 | 400 hid_t space_id = H5Dget_space (data_hid); |
| 401 | |
| 402 hsize_t rank = H5Sget_simple_extent_ndims (space_id); | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
403 |
| 4903 | 404 if (rank < 1) |
| 405 { | |
| 406 H5Sclose (space_id); | |
| 407 H5Dclose (data_hid); | |
| 408 return false; | |
| 409 } | |
| 410 | |
| 411 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank); | |
| 412 OCTAVE_LOCAL_BUFFER (hsize_t, maxdims, rank); | |
| 413 | |
| 414 H5Sget_simple_extent_dims (space_id, hdims, maxdims); | |
| 415 | |
| 416 // Octave uses column-major, while HDF5 uses row-major ordering | |
| 417 if (rank == 1) | |
| 418 { | |
| 419 dv.resize (2); | |
| 420 dv(0) = 1; | |
| 421 dv(1) = hdims[0]; | |
| 422 } | |
| 423 else | |
| 424 { | |
| 425 dv.resize (rank); | |
| 426 for (hsize_t i = 0, j = rank - 1; i < rank; i++, j--) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
427 dv(j) = hdims[i]; |
| 4903 | 428 } |
| 429 | |
| 4917 | 430 T m (dv); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
431 if (H5Dread (data_hid, save_type_hid, H5S_ALL, H5S_ALL, |
|
14846
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
432 H5P_DEFAULT, m.fortran_vec ()) >= 0) |
| 4903 | 433 { |
| 434 retval = true; | |
| 4932 | 435 this->matrix = m; |
| 4903 | 436 } |
| 437 | |
| 438 H5Sclose (space_id); | |
| 439 H5Dclose (data_hid); | |
| 440 | |
| 441 return retval; | |
| 442 } | |
| 443 | |
| 444 #endif | |
| 445 | |
| 446 template <class T> | |
| 447 void | |
| 448 octave_base_int_matrix<T>::print_raw (std::ostream& os, | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
449 bool pr_as_read_syntax) const |
| 4903 | 450 { |
| 4932 | 451 octave_print_internal (os, this->matrix, pr_as_read_syntax, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
452 this->current_print_indent_level ()); |
| 4903 | 453 } |
| 454 | |
| 455 template <class T> | |
| 5992 | 456 octave_value |
| 457 octave_base_int_scalar<T>::convert_to_str_internal (bool, bool, char type) const | |
| 458 { | |
| 459 octave_value retval; | |
| 460 | |
| 461 T tmp = this->scalar; | |
| 462 | |
|
7534
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
463 typedef typename T::val_type val_type; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
464 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
465 val_type ival = tmp.value (); |
| 5992 | 466 |
|
7534
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
467 static const bool is_signed = std::numeric_limits<val_type>::is_signed; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
468 static const bool can_be_larger_than_uchar_max |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
469 = octave_base_int_helper_traits<val_type>::can_be_larger_than_uchar_max; |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
470 |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
471 if (octave_base_int_helper<val_type, is_signed, |
|
ef755c763b62
avoid more "comparison is always false due to limited range of data type" warnings from GCC
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
472 can_be_larger_than_uchar_max>::char_value_out_of_range (ival)) |
| 5992 | 473 { |
|
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
474 // FIXME: is there something better we could do? |
| 5992 | 475 |
| 476 ival = 0; | |
| 477 | |
| 478 ::warning ("range error for conversion to character value"); | |
| 479 } | |
| 480 else | |
| 481 retval = octave_value (std::string (1, static_cast<char> (ival)), type); | |
| 482 | |
| 483 return retval; | |
| 484 } | |
| 485 | |
| 486 template <class T> | |
| 4903 | 487 bool |
| 6974 | 488 octave_base_int_scalar<T>::save_ascii (std::ostream& os) |
| 4903 | 489 { |
| 4932 | 490 os << this->scalar << "\n"; |
| 4903 | 491 return true; |
| 492 } | |
| 493 | |
| 494 template <class T> | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
495 bool |
| 4903 | 496 octave_base_int_scalar<T>::load_ascii (std::istream& is) |
| 497 { | |
| 4932 | 498 is >> this->scalar; |
| 4903 | 499 if (!is) |
| 500 { | |
| 501 error ("load: failed to load scalar constant"); | |
| 502 return false; | |
| 503 } | |
| 504 return true; | |
| 505 } | |
| 506 | |
| 507 template <class T> | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
508 bool |
| 4917 | 509 octave_base_int_scalar<T>::save_binary (std::ostream& os, bool&) |
| 4903 | 510 { |
|
14846
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
511 os.write (reinterpret_cast<char *> (&(this->scalar)), this->byte_size ()); |
| 4903 | 512 return true; |
| 513 } | |
| 514 | |
| 515 template <class T> | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
516 bool |
| 4903 | 517 octave_base_int_scalar<T>::load_binary (std::istream& is, bool swap, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
518 oct_mach_info::float_format) |
| 4903 | 519 { |
| 4917 | 520 T tmp; |
|
14846
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
521 if (! is.read (reinterpret_cast<char *> (&tmp), this->byte_size ())) |
| 4903 | 522 return false; |
| 523 | |
| 4917 | 524 if (swap) |
|
14846
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
525 switch (this->byte_size ()) |
| 4917 | 526 { |
| 527 case 8: | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
528 swap_bytes<8> (&tmp); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
529 break; |
| 4917 | 530 case 4: |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
531 swap_bytes<4> (&tmp); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
532 break; |
| 4917 | 533 case 2: |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
534 swap_bytes<2> (&tmp); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
535 break; |
| 4917 | 536 case 1: |
| 537 default: | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
538 break; |
| 4917 | 539 } |
| 4932 | 540 this->scalar = tmp; |
| 4903 | 541 return true; |
| 542 } | |
| 543 | |
| 544 #if defined (HAVE_HDF5) | |
| 4944 | 545 |
| 4903 | 546 template <class T> |
| 547 bool | |
| 4917 | 548 octave_base_int_scalar<T>::save_hdf5 (hid_t loc_id, const char *name, bool) |
| 4903 | 549 { |
| 4917 | 550 hid_t save_type_hid = HDF5_SAVE_TYPE; |
| 4903 | 551 bool retval = true; |
| 552 hsize_t dimens[3]; | |
| 553 hid_t space_hid = -1, data_hid = -1; | |
| 554 | |
| 555 space_hid = H5Screate_simple (0, dimens, 0); | |
| 556 if (space_hid < 0) 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 (loc_id, name, save_type_hid, 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 (loc_id, name, save_type_hid, 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) |
| 4903 | 566 { |
| 567 H5Sclose (space_hid); | |
| 568 return false; | |
| 569 } | |
| 570 | |
| 4917 | 571 retval = H5Dwrite (data_hid, save_type_hid, H5S_ALL, H5S_ALL, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
572 H5P_DEFAULT, &(this->scalar)) >= 0; |
| 4903 | 573 |
| 574 H5Dclose (data_hid); | |
| 575 H5Sclose (space_hid); | |
| 576 | |
| 577 return retval; | |
| 578 } | |
| 579 | |
| 580 template <class T> | |
| 581 bool | |
|
9881
b3089dba88bf
Remove HDF5 cruft for older versions of HDF5
Kacper Kowalik
parents:
9689
diff
changeset
|
582 octave_base_int_scalar<T>::load_hdf5 (hid_t loc_id, const char *name) |
| 4903 | 583 { |
| 4917 | 584 hid_t save_type_hid = HDF5_SAVE_TYPE; |
|
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
|
585 #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
|
586 hid_t data_hid = H5Dopen (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
|
587 #else |
| 4903 | 588 hid_t data_hid = H5Dopen (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
|
589 #endif |
| 4903 | 590 hid_t space_id = H5Dget_space (data_hid); |
| 591 | |
| 592 hsize_t rank = H5Sget_simple_extent_ndims (space_id); | |
| 593 | |
| 594 if (rank != 0) | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
595 { |
| 4903 | 596 H5Dclose (data_hid); |
| 597 return false; | |
| 598 } | |
| 599 | |
| 4917 | 600 T tmp; |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
601 if (H5Dread (data_hid, save_type_hid, H5S_ALL, H5S_ALL, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
602 H5P_DEFAULT, &tmp) < 0) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
603 { |
| 4903 | 604 H5Dclose (data_hid); |
| 605 return false; | |
| 606 } | |
| 607 | |
| 4932 | 608 this->scalar = tmp; |
| 4903 | 609 |
| 610 H5Dclose (data_hid); | |
| 611 | |
| 612 return true; | |
| 613 } | |
| 4944 | 614 |
| 4903 | 615 #endif |