Mercurial > octave-nkf

comparison src/ov-flt-cx-diag.cc @ 10815:0eb323b71957

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplify narrowing of diagonal matrices
author Jaroslav Hajek <highegg@gmail.com>
date Fri, 23 Jul 2010 08:20:39 +0200
parents 57a59eae83cc
children fd0a3ac60b0e
comparison
equal deleted inserted replaced
10814:83896a06adaf 10815:0eb323b71957
60 { 60 {
61 octave_base_value *retval = 0; 61 octave_base_value *retval = 0;
62 62
63 if (matrix.nelem () == 1) 63 if (matrix.nelem () == 1)
64 { 64 {
65 // FIXME: the proxy mechanism of DiagArray2 causes problems here. 65 retval = new octave_float_complex (matrix (0, 0));
66 retval = new octave_float_complex (FloatComplex (matrix (0, 0)));
67 octave_base_value *rv2 = retval->try_narrowing_conversion (); 66 octave_base_value *rv2 = retval->try_narrowing_conversion ();
68 if (rv2) 67 if (rv2)
69 { 68 {
70 delete retval; 69 delete retval;
71 retval = rv2; 70 retval = rv2;