Mercurial > hg > octave-jordi

comparison src/ov-cx-mat.cc @ 11129:0de5cc44e690

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use gripe functions for NaN to logical and NaN to character conversions more consistently
author John W. Eaton <jwe@octave.org>
date Thu, 21 Oct 2010 16:12:00 -0400
parents 4d1fc073fbb7
children fd0a3ac60b0e
comparison
equal deleted inserted replaced
11128:9cb5c0b7b43b 11129:0de5cc44e690
224 224
225 boolNDArray 225 boolNDArray
226 octave_complex_matrix::bool_array_value (bool warn) const 226 octave_complex_matrix::bool_array_value (bool warn) const
227 { 227 {
228 if (matrix.any_element_is_nan ()) 228 if (matrix.any_element_is_nan ())
229 error ("invalid conversion from NaN to logical"); 229 gripe_nan_to_logical_conversion ();
230 else if (warn && (! matrix.all_elements_are_real () 230 else if (warn && (! matrix.all_elements_are_real ()
231 || real (matrix).any_element_not_one_or_zero ())) 231 || real (matrix).any_element_not_one_or_zero ()))
232 gripe_logical_conversion (); 232 gripe_logical_conversion ();
233 233
234 return mx_el_ne (matrix, Complex (0.0)); 234 return mx_el_ne (matrix, Complex (0.0));