Mercurial > octave-nkf

comparison liboctave/array/fDiagMatrix.cc @ 15448:0a0912a9ab6e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
15447:352349219529 15448:0a0912a9ab6e
139 } 139 }
140 140
141 FloatDiagMatrix 141 FloatDiagMatrix
142 FloatDiagMatrix::abs (void) const 142 FloatDiagMatrix::abs (void) const
143 { 143 {
144 return FloatDiagMatrix (diag ().abs (), rows (), columns ()); 144 return FloatDiagMatrix (extract_diag ().abs (), rows (), columns ());
145 } 145 }
146 146
147 FloatDiagMatrix 147 FloatDiagMatrix
148 real (const FloatComplexDiagMatrix& a) 148 real (const FloatComplexDiagMatrix& a)
149 { 149 {
150 return FloatDiagMatrix (real (a.diag ()), a.rows (), a.columns ()); 150 return FloatDiagMatrix (real (a.extract_diag ()), a.rows (), a.columns ());
151 } 151 }
152 152
153 FloatDiagMatrix 153 FloatDiagMatrix
154 imag (const FloatComplexDiagMatrix& a) 154 imag (const FloatComplexDiagMatrix& a)
155 { 155 {
156 return FloatDiagMatrix (imag (a.diag ()), a.rows (), a.columns ()); 156 return FloatDiagMatrix (imag (a.extract_diag ()), a.rows (), a.columns ());
157 } 157 }
158 158
159 FloatMatrix 159 FloatMatrix
160 FloatDiagMatrix::extract (octave_idx_type r1, octave_idx_type c1, octave_idx_type r2, octave_idx_type c2) const 160 FloatDiagMatrix::extract (octave_idx_type r1, octave_idx_type c1, octave_idx_type r2, octave_idx_type c2) const
161 { 161 {
360 } 360 }
361 361
362 float 362 float
363 FloatDiagMatrix::rcond (void) const 363 FloatDiagMatrix::rcond (void) const
364 { 364 {
365 FloatColumnVector av = diag (0).map<float> (fabsf); 365 FloatColumnVector av = extract_diag (0).map<float> (fabsf);
366 float amx = av.max (), amn = av.min (); 366 float amx = av.max (), amn = av.min ();
367 return amx == 0 ? 0.0f : amn / amx; 367 return amx == 0 ? 0.0f : amn / amx;
368 } 368 }
369 369
370 std::ostream& 370 std::ostream&