Mercurial > hg > octave-nkf
diff liboctave/array/fCDiagMatrix.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 | 7975d75f933c |
line wrap: on
line diff
--- a/liboctave/array/fCDiagMatrix.cc +++ b/liboctave/array/fCDiagMatrix.cc @@ -236,13 +236,13 @@ FloatDiagMatrix FloatComplexDiagMatrix::abs (void) const { - return FloatDiagMatrix (diag ().abs (), rows (), columns ()); + return FloatDiagMatrix (extract_diag ().abs (), rows (), columns ()); } FloatComplexDiagMatrix conj (const FloatComplexDiagMatrix& a) { - return FloatComplexDiagMatrix (conj (a.diag ()), a.rows (), a.columns ()); + return FloatComplexDiagMatrix (conj (a.extract_diag ()), a.rows (), a.columns ()); } // resize is the destructive analog for this one @@ -546,7 +546,7 @@ float FloatComplexDiagMatrix::rcond (void) const { - FloatColumnVector av = diag (0).map<float> (std::abs); + FloatColumnVector av = extract_diag (0).map<float> (std::abs); float amx = av.max (), amn = av.min (); return amx == 0 ? 0.0f : amn / amx; }