Mercurial > hg > octave-lyh

comparison src/ov-float.cc @ 10315:57a59eae83cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
untabify src C++ source files
author John W. Eaton <jwe@octave.org>
date Thu, 11 Feb 2010 12:41:46 -0500
parents cd96d29c5efa
children 59e34bcdff13
comparison
equal deleted inserted replaced
10314:07ebe522dac2 10315:57a59eae83cc
81 if (fill) 81 if (fill)
82 { 82 {
83 FloatNDArray retval (dv, NDArray::resize_fill_value()); 83 FloatNDArray retval (dv, NDArray::resize_fill_value());
84 84
85 if (dv.numel ()) 85 if (dv.numel ())
86 retval(0) = scalar; 86 retval(0) = scalar;
87 87
88 return retval; 88 return retval;
89 } 89 }
90 else 90 else
91 { 91 {
92 FloatNDArray retval (dv); 92 FloatNDArray retval (dv);
93 93
94 if (dv.numel ()) 94 if (dv.numel ())
95 retval(0) = scalar; 95 retval(0) = scalar;
96 96
97 return retval; 97 return retval;
98 } 98 }
99 } 99 }
100 100
108 else 108 else
109 { 109 {
110 int ival = NINT (scalar); 110 int ival = NINT (scalar);
111 111
112 if (ival < 0 || ival > UCHAR_MAX) 112 if (ival < 0 || ival > UCHAR_MAX)
113 { 113 {
114 // FIXME -- is there something better we could do? 114 // FIXME -- is there something better we could do?
115 115
116 ival = 0; 116 ival = 0;
117 117
118 ::warning ("range error for conversion to character value"); 118 ::warning ("range error for conversion to character value");
119 } 119 }
120 120
121 retval = octave_value (std::string (1, static_cast<char> (ival)), type); 121 retval = octave_value (std::string (1, static_cast<char> (ival)), type);
122 } 122 }
123 123
124 return retval; 124 return retval;
160 return true; 160 return true;
161 } 161 }
162 162
163 bool 163 bool
164 octave_float_scalar::load_binary (std::istream& is, bool swap, 164 octave_float_scalar::load_binary (std::istream& is, bool swap,
165 oct_mach_info::float_format fmt) 165 oct_mach_info::float_format fmt)
166 { 166 {
167 char tmp; 167 char tmp;
168 if (! is.read (reinterpret_cast<char *> (&tmp), 1)) 168 if (! is.read (reinterpret_cast<char *> (&tmp), 1))
169 return false; 169 return false;
170 170
179 179
180 #if defined (HAVE_HDF5) 180 #if defined (HAVE_HDF5)
181 181
182 bool 182 bool
183 octave_float_scalar::save_hdf5 (hid_t loc_id, const char *name, 183 octave_float_scalar::save_hdf5 (hid_t loc_id, const char *name,
184 bool /* save_as_floats */) 184 bool /* save_as_floats */)
185 { 185 {
186 hsize_t dimens[3]; 186 hsize_t dimens[3];
187 hid_t space_hid = -1, data_hid = -1; 187 hid_t space_hid = -1, data_hid = -1;
188 bool retval = true; 188 bool retval = true;
189 189
190 space_hid = H5Screate_simple (0, dimens, 0); 190 space_hid = H5Screate_simple (0, dimens, 0);
191 if (space_hid < 0) return false; 191 if (space_hid < 0) return false;
192 #if HAVE_HDF5_18 192 #if HAVE_HDF5_18
193 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_FLOAT, space_hid, 193 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_FLOAT, space_hid,
194 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); 194 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
195 #else 195 #else
196 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_FLOAT, space_hid, 196 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_FLOAT, space_hid,
197 H5P_DEFAULT); 197 H5P_DEFAULT);
198 #endif 198 #endif
199 if (data_hid < 0) 199 if (data_hid < 0)
200 { 200 {
201 H5Sclose (space_hid); 201 H5Sclose (space_hid);
202 return false; 202 return false;
203 } 203 }
204 204
205 float tmp = float_value (); 205 float tmp = float_value ();
206 retval = H5Dwrite (data_hid, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, 206 retval = H5Dwrite (data_hid, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL,
207 H5P_DEFAULT, &tmp) >= 0; 207 H5P_DEFAULT, &tmp) >= 0;
208 208
209 H5Dclose (data_hid); 209 H5Dclose (data_hid);
210 H5Sclose (space_hid); 210 H5Sclose (space_hid);
211 211
212 return retval; 212 return retval;
230 return false; 230 return false;
231 } 231 }
232 232
233 float dtmp; 233 float dtmp;
234 if (H5Dread (data_hid, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, 234 if (H5Dread (data_hid, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL,
235 H5P_DEFAULT, &dtmp) < 0) 235 H5P_DEFAULT, &dtmp) < 0)
236 { 236 {
237 H5Dclose (data_hid); 237 H5Dclose (data_hid);
238 return false; 238 return false;
239 } 239 }
240 240