Mercurial > octave
diff src/ov-bool-mat.cc @ 7789:82be108cc558
First attempt at single precision tyeps
* * *
corrections to qrupdate single precision routines
* * *
prefer demotion to single over promotion to double
* * *
Add single precision support to log2 function
* * *
Trivial PROJECT file update
* * *
Cache optimized hermitian/transpose methods
* * *
Add tests for tranpose/hermitian and ChangeLog entry for new transpose code
| author | David Bateman <dbateman@free.fr> |
|---|---|
| date | Sun, 27 Apr 2008 22:34:17 +0200 |
| parents | a1dbe9d80eee |
| children | c777f3ce02d8 |
line wrap: on
line diff
--- a/src/ov-bool-mat.cc Wed May 14 18:09:56 2008 +0200 +++ b/src/ov-bool-mat.cc Sun Apr 27 22:34:17 2008 +0200 @@ -112,6 +112,24 @@ return retval; } +float +octave_bool_matrix::float_value (bool) const +{ + float retval = lo_ieee_float_nan_value (); + + if (rows () > 0 && columns () > 0) + { + gripe_implicit_conversion ("Octave:array-as-scalar", + "bool matrix", "real scalar"); + + retval = matrix (0, 0); + } + else + gripe_invalid_conversion ("bool matrix", "real scalar"); + + return retval; +} + Complex octave_bool_matrix::complex_value (bool) const { @@ -132,6 +150,26 @@ return retval; } +FloatComplex +octave_bool_matrix::float_complex_value (bool) const +{ + float tmp = lo_ieee_float_nan_value (); + + FloatComplex retval (tmp, tmp); + + if (rows () > 0 && columns () > 0) + { + gripe_implicit_conversion ("Octave:array-as-scalar", + "bool matrix", "complex scalar"); + + retval = matrix (0, 0); + } + else + gripe_invalid_conversion ("bool matrix", "complex scalar"); + + return retval; +} + octave_value octave_bool_matrix::convert_to_str_internal (bool pad, bool force, char type) const