Mercurial > octave-nkf
comparison src/ov-intx.h @ 5943:c038c2947ee1
[project @ 2006-08-18 21:27:03 by jwe]
author | jwe |
---|---|
date | Fri, 18 Aug 2006 21:27:04 +0000 |
parents | c20eb7330d13 |
children | 67b1a61a85ce |
comparison
equal
deleted
inserted
replaced
5942:a02a305e06ee | 5943:c038c2947ee1 |
---|---|
124 retval(i) = Complex (double (matrix(i))); | 124 retval(i) = Complex (double (matrix(i))); |
125 return retval; | 125 return retval; |
126 } | 126 } |
127 | 127 |
128 boolNDArray | 128 boolNDArray |
129 bool_array_value (void) const | 129 bool_array_value (bool warn = false) const |
130 { | 130 { |
131 boolNDArray retval (dims ()); | 131 boolNDArray retval (dims ()); |
132 | 132 |
133 octave_idx_type nel = numel (); | 133 octave_idx_type nel = numel (); |
134 | 134 |
135 if (warn && matrix.any_element_not_one_or_zero ()) | |
136 gripe_logical_conversion (); | |
137 | |
135 for (octave_idx_type i = 0; i < nel; i++) | 138 for (octave_idx_type i = 0; i < nel; i++) |
136 retval(i) = static_cast<bool>(matrix(i)); | 139 retval(i) = static_cast<bool>(matrix(i)); |
137 | 140 |
138 return retval; | 141 return retval; |
139 } | 142 } |
329 retval(0) = Complex (double (scalar)); | 332 retval(0) = Complex (double (scalar)); |
330 return retval; | 333 return retval; |
331 } | 334 } |
332 | 335 |
333 boolNDArray | 336 boolNDArray |
334 bool_array_value (void) const | 337 bool_array_value (bool warn = false) const |
335 { | 338 { |
336 boolNDArray retval (dim_vector (1, 1)); | 339 boolNDArray retval (dim_vector (1, 1)); |
340 | |
341 if (warn && scalar != 0.0 && scalar != 1.0) | |
342 gripe_logical_conversion (); | |
343 | |
337 retval(0) = static_cast<bool>(scalar); | 344 retval(0) = static_cast<bool>(scalar); |
345 | |
338 return retval; | 346 return retval; |
339 } | 347 } |
340 | 348 |
341 charNDArray | 349 charNDArray |
342 char_array_value (bool = false) const | 350 char_array_value (bool = false) const |