comparison src/ov-bool.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 72c96de7a403
comparison
equal deleted inserted replaced
11585:1473d0cf86d2 11586:12df7854fa7c
81 octave_value tmp (new octave_bool_matrix (bool_matrix_value ())); 81 octave_value tmp (new octave_bool_matrix (bool_matrix_value ()));
82 82
83 return tmp.do_index_op (idx, resize_ok); 83 return tmp.do_index_op (idx, resize_ok);
84 } 84 }
85 85
86 octave_value 86 octave_value
87 octave_bool::resize (const dim_vector& dv, bool fill) const 87 octave_bool::resize (const dim_vector& dv, bool fill) const
88 { 88 {
89 if (fill) 89 if (fill)
90 { 90 {
91 boolNDArray retval (dv, false); 91 boolNDArray retval (dv, false);
92 if (dv.numel()) 92 if (dv.numel())
93 retval(0) = scalar; 93 retval(0) = scalar;
94 return retval; 94 return retval;
95 } 95 }
96 else 96 else
97 { 97 {
98 boolNDArray retval (dv); 98 boolNDArray retval (dv);
99 if (dv.numel()) 99 if (dv.numel())
100 retval(0) = scalar; 100 retval(0) = scalar;
101 return retval; 101 return retval;
102 } 102 }
103 } 103 }
104 104
105 octave_value 105 octave_value
106 octave_bool::convert_to_str_internal (bool, bool, char type) const 106 octave_bool::convert_to_str_internal (bool, bool, char type) const
110 s[1] = '\0'; 110 s[1] = '\0';
111 111
112 return octave_value (s, type); 112 return octave_value (s, type);
113 } 113 }
114 114
115 bool 115 bool
116 octave_bool::save_ascii (std::ostream& os) 116 octave_bool::save_ascii (std::ostream& os)
117 { 117 {
118 double d = double_value (); 118 double d = double_value ();
119 119
120 octave_write_double (os, d); 120 octave_write_double (os, d);
121 os << "\n"; 121 os << "\n";
122 122
123 return true; 123 return true;
124 } 124 }
125 125
126 bool 126 bool
127 octave_bool::load_ascii (std::istream& is) 127 octave_bool::load_ascii (std::istream& is)
128 { 128 {
129 scalar = (octave_read_value<double> (is) != 0.); 129 scalar = (octave_read_value<double> (is) != 0.);
130 130
131 if (!is) 131 if (!is)
135 } 135 }
136 136
137 return true; 137 return true;
138 } 138 }
139 139
140 bool 140 bool
141 octave_bool::save_binary (std::ostream& os, bool& /* save_as_floats */) 141 octave_bool::save_binary (std::ostream& os, bool& /* save_as_floats */)
142 { 142 {
143 char tmp = (scalar ? 1 : 0); 143 char tmp = (scalar ? 1 : 0);
144 os.write (reinterpret_cast<char *> (&tmp), 1); 144 os.write (reinterpret_cast<char *> (&tmp), 1);
145 145
146 return true; 146 return true;
147 } 147 }
148 148
149 bool 149 bool
150 octave_bool::load_binary (std::istream& is, bool /* swap */, 150 octave_bool::load_binary (std::istream& is, bool /* swap */,
151 oct_mach_info::float_format /* fmt */) 151 oct_mach_info::float_format /* fmt */)
152 { 152 {
153 char tmp; 153 char tmp;
154 if (! is.read (reinterpret_cast<char *> (&tmp), 1)) 154 if (! is.read (reinterpret_cast<char *> (&tmp), 1))
168 bool retval = true; 168 bool retval = true;
169 169
170 space_hid = H5Screate_simple (0, dimens, 0); 170 space_hid = H5Screate_simple (0, dimens, 0);
171 if (space_hid < 0) return false; 171 if (space_hid < 0) return false;
172 #if HAVE_HDF5_18 172 #if HAVE_HDF5_18
173 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, space_hid, 173 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, space_hid,
174 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); 174 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
175 #else 175 #else
176 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, space_hid, 176 data_hid = H5Dcreate (loc_id, name, H5T_NATIVE_DOUBLE, space_hid,
177 H5P_DEFAULT); 177 H5P_DEFAULT);
178 #endif 178 #endif
179 if (data_hid < 0) 179 if (data_hid < 0)
180 { 180 {
181 H5Sclose (space_hid); 181 H5Sclose (space_hid);
182 return false; 182 return false;
183 } 183 }
184 184
203 hid_t space_id = H5Dget_space (data_hid); 203 hid_t space_id = H5Dget_space (data_hid);
204 204
205 hsize_t rank = H5Sget_simple_extent_ndims (space_id); 205 hsize_t rank = H5Sget_simple_extent_ndims (space_id);
206 206
207 if (rank != 0) 207 if (rank != 0)
208 { 208 {
209 H5Dclose (data_hid); 209 H5Dclose (data_hid);
210 return false; 210 return false;
211 } 211 }
212 212
213 double dtmp; 213 double dtmp;
214 if (H5Dread (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, 214 if (H5Dread (data_hid, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL,
215 H5P_DEFAULT, &dtmp) < 0) 215 H5P_DEFAULT, &dtmp) < 0)
216 { 216 {
217 H5Dclose (data_hid); 217 H5Dclose (data_hid);
218 return false; 218 return false;
219 } 219 }
220 220
221 scalar = (dtmp != 0.); 221 scalar = (dtmp != 0.);