Mercurial > hg > octave-nkf
diff liboctave/array/dDiagMatrix.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/dDiagMatrix.cc +++ b/liboctave/array/dDiagMatrix.cc @@ -141,19 +141,19 @@ DiagMatrix DiagMatrix::abs (void) const { - return DiagMatrix (diag ().abs (), rows (), columns ()); + return DiagMatrix (extract_diag ().abs (), rows (), columns ()); } DiagMatrix real (const ComplexDiagMatrix& a) { - return DiagMatrix (real (a.diag ()), a.rows (), a.cols ()); + return DiagMatrix (real (a.extract_diag ()), a.rows (), a.cols ()); } DiagMatrix imag (const ComplexDiagMatrix& a) { - return DiagMatrix (imag (a.diag ()), a.rows (), a.cols ()); + return DiagMatrix (imag (a.extract_diag ()), a.rows (), a.cols ()); } Matrix @@ -362,7 +362,7 @@ double DiagMatrix::rcond (void) const { - ColumnVector av = diag (0).map<double> (fabs); + ColumnVector av = extract_diag (0).map<double> (fabs); double amx = av.max (), amn = av.min (); return amx == 0 ? 0.0 : amn / amx; }