Mercurial > octave

comparison liboctave/numeric/fCmplxQR.cc @ 18084:8e056300994b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Follow coding convention of defining and initializing only 1 variable per line in liboctave. * liboctave/array/Array-b.cc, liboctave/array/Array-util.cc, liboctave/array/Array.cc, liboctave/array/CDiagMatrix.cc, liboctave/array/CMatrix.cc, liboctave/array/CSparse.cc, liboctave/array/MDiagArray2.cc, liboctave/array/MatrixType.cc, liboctave/array/PermMatrix.cc, liboctave/array/Sparse.cc, liboctave/array/Sparse.h, liboctave/array/boolSparse.cc, liboctave/array/dDiagMatrix.cc, liboctave/array/dMatrix.cc, liboctave/array/dSparse.cc, liboctave/array/dim-vector.cc, liboctave/array/fCDiagMatrix.cc, liboctave/array/fCMatrix.cc, liboctave/array/fDiagMatrix.cc, liboctave/array/fMatrix.cc, liboctave/array/idx-vector.cc, liboctave/array/idx-vector.h, liboctave/numeric/CmplxLU.cc, liboctave/numeric/CmplxQR.cc, liboctave/numeric/base-qr.cc, liboctave/numeric/bsxfun-defs.cc, liboctave/numeric/bsxfun.h, liboctave/numeric/dbleLU.cc, liboctave/numeric/dbleQR.cc, liboctave/numeric/fCmplxLU.cc, liboctave/numeric/fCmplxQR.cc, liboctave/numeric/floatLU.cc, liboctave/numeric/floatQR.cc, liboctave/numeric/lo-specfun.cc, liboctave/numeric/oct-convn.cc, liboctave/numeric/oct-norm.cc, liboctave/numeric/sparse-dmsolve.cc, liboctave/operators/mx-inlines.cc, liboctave/operators/mx-op-defs.h, liboctave/util/caseless-str.h, liboctave/util/kpse.cc, liboctave/util/lo-utils.cc, liboctave/util/oct-binmap.h, liboctave/util/oct-cmplx.h, liboctave/util/oct-inttypes.cc, liboctave/util/oct-inttypes.h, liboctave/util/oct-sort.cc: Follow coding convention of defining and initializing only 1 variable per line in liboctave.
author Rik <rik@octave.org>
date Wed, 04 Dec 2013 22:13:18 -0800
parents 49a5a4be04a1
children d47e50953abc
comparison
equal deleted inserted replaced
18083:938f01339043 18084:8e056300994b
138 } 138 }
139 139
140 void FloatComplexQR::form (octave_idx_type n, FloatComplexMatrix& afact, 140 void FloatComplexQR::form (octave_idx_type n, FloatComplexMatrix& afact,
141 FloatComplex *tau, qr_type_t qr_type) 141 FloatComplex *tau, qr_type_t qr_type)
142 { 142 {
143 octave_idx_type m = afact.rows (), min_mn = std::min (m, n); 143 octave_idx_type m = afact.rows ();
144 octave_idx_type min_mn = std::min (m, n);
144 octave_idx_type info; 145 octave_idx_type info;
145 146
146 if (qr_type == qr_type_raw) 147 if (qr_type == qr_type_raw)
147 { 148 {
148 for (octave_idx_type j = 0; j < min_mn; j++) 149 for (octave_idx_type j = 0; j < min_mn; j++)
215 octave_idx_type n = r.columns (); 216 octave_idx_type n = r.columns ();
216 octave_idx_type k = q.columns (); 217 octave_idx_type k = q.columns ();
217 218
218 if (u.length () == m && v.length () == n) 219 if (u.length () == m && v.length () == n)
219 { 220 {
220 FloatComplexColumnVector utmp = u, vtmp = v; 221 FloatComplexColumnVector utmp = u;
222 FloatComplexColumnVector vtmp = v;
221 OCTAVE_LOCAL_BUFFER (FloatComplex, w, k); 223 OCTAVE_LOCAL_BUFFER (FloatComplex, w, k);
222 OCTAVE_LOCAL_BUFFER (float, rw, k); 224 OCTAVE_LOCAL_BUFFER (float, rw, k);
223 F77_XFCN (cqr1up, CQR1UP, (m, n, k, q.fortran_vec (), 225 F77_XFCN (cqr1up, CQR1UP, (m, n, k, q.fortran_vec (),
224 m, r.fortran_vec (), k, 226 m, r.fortran_vec (), k,
225 utmp.fortran_vec (), vtmp.fortran_vec (), 227 utmp.fortran_vec (), vtmp.fortran_vec (),
241 { 243 {
242 OCTAVE_LOCAL_BUFFER (FloatComplex, w, k); 244 OCTAVE_LOCAL_BUFFER (FloatComplex, w, k);
243 OCTAVE_LOCAL_BUFFER (float, rw, k); 245 OCTAVE_LOCAL_BUFFER (float, rw, k);
244 for (volatile octave_idx_type i = 0; i < u.cols (); i++) 246 for (volatile octave_idx_type i = 0; i < u.cols (); i++)
245 { 247 {
246 FloatComplexColumnVector utmp = u.column (i), vtmp = v.column (i); 248 FloatComplexColumnVector utmp = u.column (i);
249 FloatComplexColumnVector vtmp = v.column (i);
247 F77_XFCN (cqr1up, CQR1UP, (m, n, k, q.fortran_vec (), 250 F77_XFCN (cqr1up, CQR1UP, (m, n, k, q.fortran_vec (),
248 m, r.fortran_vec (), k, 251 m, r.fortran_vec (), k,
249 utmp.fortran_vec (), vtmp.fortran_vec (), 252 utmp.fortran_vec (), vtmp.fortran_vec (),
250 w, rw)); 253 w, rw));
251 } 254 }