Mercurial > octave
comparison src/ov-float.cc @ 11586:12df7854fa7c
strip trailing whitespace from source files
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 20 Jan 2011 17:24:59 -0500 |
parents | fd0a3ac60b0e |
children | 88d1134bb095 |
comparison
equal
deleted
inserted
replaced
11585:1473d0cf86d2 | 11586:12df7854fa7c |
---|---|
72 octave_value tmp (new octave_matrix (matrix_value ())); | 72 octave_value tmp (new octave_matrix (matrix_value ())); |
73 | 73 |
74 return tmp.do_index_op (idx, resize_ok); | 74 return tmp.do_index_op (idx, resize_ok); |
75 } | 75 } |
76 | 76 |
77 octave_value | 77 octave_value |
78 octave_float_scalar::resize (const dim_vector& dv, bool fill) const | 78 octave_float_scalar::resize (const dim_vector& dv, bool fill) const |
79 { | 79 { |
80 if (fill) | 80 if (fill) |
81 { | 81 { |
82 FloatNDArray retval (dv, NDArray::resize_fill_value()); | 82 FloatNDArray retval (dv, NDArray::resize_fill_value()); |
121 } | 121 } |
122 | 122 |
123 return retval; | 123 return retval; |
124 } | 124 } |
125 | 125 |
126 bool | 126 bool |
127 octave_float_scalar::save_ascii (std::ostream& os) | 127 octave_float_scalar::save_ascii (std::ostream& os) |
128 { | 128 { |
129 float d = float_value (); | 129 float d = float_value (); |
130 | 130 |
131 octave_write_float (os, d); | 131 octave_write_float (os, d); |
133 os << "\n"; | 133 os << "\n"; |
134 | 134 |
135 return true; | 135 return true; |
136 } | 136 } |
137 | 137 |
138 bool | 138 bool |
139 octave_float_scalar::load_ascii (std::istream& is) | 139 octave_float_scalar::load_ascii (std::istream& is) |
140 { | 140 { |
141 scalar = octave_read_value<float> (is); | 141 scalar = octave_read_value<float> (is); |
142 if (!is) | 142 if (!is) |
143 { | 143 { |
146 } | 146 } |
147 | 147 |
148 return true; | 148 return true; |
149 } | 149 } |
150 | 150 |
151 bool | 151 bool |
152 octave_float_scalar::save_binary (std::ostream& os, bool& /* save_as_floats */) | 152 octave_float_scalar::save_binary (std::ostream& os, bool& /* save_as_floats */) |
153 { | 153 { |
154 char tmp = LS_FLOAT; | 154 char tmp = LS_FLOAT; |
155 os.write (reinterpret_cast<char *> (&tmp), 1); | 155 os.write (reinterpret_cast<char *> (&tmp), 1); |
156 float dtmp = float_value (); | 156 float dtmp = float_value (); |
157 os.write (reinterpret_cast<char *> (&dtmp), 4); | 157 os.write (reinterpret_cast<char *> (&dtmp), 4); |
158 | 158 |
159 return true; | 159 return true; |
160 } | 160 } |
161 | 161 |
162 bool | 162 bool |
163 octave_float_scalar::load_binary (std::istream& is, bool swap, | 163 octave_float_scalar::load_binary (std::istream& is, bool swap, |
164 oct_mach_info::float_format fmt) | 164 oct_mach_info::float_format fmt) |
165 { | 165 { |
166 char tmp; | 166 char tmp; |
167 if (! is.read (reinterpret_cast<char *> (&tmp), 1)) | 167 if (! is.read (reinterpret_cast<char *> (&tmp), 1)) |
187 bool retval = true; | 187 bool retval = true; |
188 | 188 |
189 space_hid = H5Screate_simple (0, dimens, 0); | 189 space_hid = H5Screate_simple (0, dimens, 0); |
190 if (space_hid < 0) return false; | 190 if (space_hid < 0) return false; |
191 #if HAVE_HDF5_18 | 191 #if HAVE_HDF5_18 |
192 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_FLOAT, space_hid, | 192 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_FLOAT, space_hid, |
193 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); | 193 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); |
194 #else | 194 #else |
195 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_FLOAT, space_hid, | 195 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_FLOAT, space_hid, |
196 H5P_DEFAULT); | 196 H5P_DEFAULT); |
197 #endif | 197 #endif |
198 if (data_hid < 0) | 198 if (data_hid < 0) |
199 { | 199 { |
200 H5Sclose (space_hid); | 200 H5Sclose (space_hid); |
201 return false; | 201 return false; |
202 } | 202 } |
203 | 203 |
222 hid_t space_id = H5Dget_space (data_hid); | 222 hid_t space_id = H5Dget_space (data_hid); |
223 | 223 |
224 hsize_t rank = H5Sget_simple_extent_ndims (space_id); | 224 hsize_t rank = H5Sget_simple_extent_ndims (space_id); |
225 | 225 |
226 if (rank != 0) | 226 if (rank != 0) |
227 { | 227 { |
228 H5Dclose (data_hid); | 228 H5Dclose (data_hid); |
229 return false; | 229 return false; |
230 } | 230 } |
231 | 231 |
232 float dtmp; | 232 float dtmp; |
233 if (H5Dread (data_hid, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, | 233 if (H5Dread (data_hid, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, |
234 H5P_DEFAULT, &dtmp) < 0) | 234 H5P_DEFAULT, &dtmp) < 0) |
235 { | 235 { |
236 H5Dclose (data_hid); | 236 H5Dclose (data_hid); |
237 return false; | 237 return false; |
238 } | 238 } |
239 | 239 |
240 scalar = dtmp; | 240 scalar = dtmp; |