comparison src/ov-range.h @ 7922:935be827eaf8

error for NaN values in & and | expressions
author John W. Eaton <jwe@octave.org>
date Fri, 11 Jul 2008 14:56:30 -0400
parents 82be108cc558
children c777f3ce02d8
comparison
equal deleted inserted replaced
7921:fcc70f30fe31 7922:935be827eaf8
225 225
226 boolNDArray bool_array_value (bool warn = false) const 226 boolNDArray bool_array_value (bool warn = false) const
227 { 227 {
228 Matrix m = range.matrix_value (); 228 Matrix m = range.matrix_value ();
229 229
230 if (warn && m.any_element_not_one_or_zero ()) 230 if (m.any_element_is_nan ())
231 error ("invalid conversion from NaN to logical");
232 else if (warn && m.any_element_not_one_or_zero ())
231 gripe_logical_conversion (); 233 gripe_logical_conversion ();
232 234
233 return boolNDArray (m); 235 return boolNDArray (m);
234 } 236 }
235 237