Mercurial > hg > octave-lyh
diff liboctave/array/fDiagMatrix.cc @ 15448:0a0912a9ab6e
Replace deprecated DiagArray2<T>::diag calls with DiagArray2<T>::extract_diag
| author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
|---|---|
| date | Thu, 27 Sep 2012 17:00:45 -0400 |
| parents | 648dabbb4c6b |
| children |
line wrap: on
line diff
--- a/liboctave/array/fDiagMatrix.cc +++ b/liboctave/array/fDiagMatrix.cc @@ -141,19 +141,19 @@ FloatDiagMatrix FloatDiagMatrix::abs (void) const { - return FloatDiagMatrix (diag ().abs (), rows (), columns ()); + return FloatDiagMatrix (extract_diag ().abs (), rows (), columns ()); } FloatDiagMatrix real (const FloatComplexDiagMatrix& a) { - return FloatDiagMatrix (real (a.diag ()), a.rows (), a.columns ()); + return FloatDiagMatrix (real (a.extract_diag ()), a.rows (), a.columns ()); } FloatDiagMatrix imag (const FloatComplexDiagMatrix& a) { - return FloatDiagMatrix (imag (a.diag ()), a.rows (), a.columns ()); + return FloatDiagMatrix (imag (a.extract_diag ()), a.rows (), a.columns ()); } FloatMatrix @@ -362,7 +362,7 @@ float FloatDiagMatrix::rcond (void) const { - FloatColumnVector av = diag (0).map<float> (fabsf); + FloatColumnVector av = extract_diag (0).map<float> (fabsf); float amx = av.max (), amn = av.min (); return amx == 0 ? 0.0f : amn / amx; }