Mercurial > octave

comparison liboctave/numeric/CmplxQR.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
135 } 135 }
136 136
137 void ComplexQR::form (octave_idx_type n, ComplexMatrix& afact, 137 void ComplexQR::form (octave_idx_type n, ComplexMatrix& afact,
138 Complex *tau, qr_type_t qr_type) 138 Complex *tau, qr_type_t qr_type)
139 { 139 {
140 octave_idx_type m = afact.rows (), min_mn = std::min (m, n); 140 octave_idx_type m = afact.rows ();
141 octave_idx_type min_mn = std::min (m, n);
141 octave_idx_type info; 142 octave_idx_type info;
142 143
143 if (qr_type == qr_type_raw) 144 if (qr_type == qr_type_raw)
144 { 145 {
145 for (octave_idx_type j = 0; j < min_mn; j++) 146 for (octave_idx_type j = 0; j < min_mn; j++)
211 octave_idx_type n = r.columns (); 212 octave_idx_type n = r.columns ();
212 octave_idx_type k = q.columns (); 213 octave_idx_type k = q.columns ();
213 214
214 if (u.length () == m && v.length () == n) 215 if (u.length () == m && v.length () == n)
215 { 216 {
216 ComplexColumnVector utmp = u, vtmp = v; 217 ComplexColumnVector utmp = u;
218 ComplexColumnVector vtmp = v;
217 OCTAVE_LOCAL_BUFFER (Complex, w, k); 219 OCTAVE_LOCAL_BUFFER (Complex, w, k);
218 OCTAVE_LOCAL_BUFFER (double, rw, k); 220 OCTAVE_LOCAL_BUFFER (double, rw, k);
219 F77_XFCN (zqr1up, ZQR1UP, (m, n, k, q.fortran_vec (), 221 F77_XFCN (zqr1up, ZQR1UP, (m, n, k, q.fortran_vec (),
220 m, r.fortran_vec (), k, 222 m, r.fortran_vec (), k,
221 utmp.fortran_vec (), vtmp.fortran_vec (), 223 utmp.fortran_vec (), vtmp.fortran_vec (),
236 { 238 {
237 OCTAVE_LOCAL_BUFFER (Complex, w, k); 239 OCTAVE_LOCAL_BUFFER (Complex, w, k);
238 OCTAVE_LOCAL_BUFFER (double, rw, k); 240 OCTAVE_LOCAL_BUFFER (double, rw, k);
239 for (volatile octave_idx_type i = 0; i < u.cols (); i++) 241 for (volatile octave_idx_type i = 0; i < u.cols (); i++)
240 { 242 {
241 ComplexColumnVector utmp = u.column (i), vtmp = v.column (i); 243 ComplexColumnVector utmp = u.column (i);
244 ComplexColumnVector vtmp = v.column (i);
242 F77_XFCN (zqr1up, ZQR1UP, (m, n, k, q.fortran_vec (), 245 F77_XFCN (zqr1up, ZQR1UP, (m, n, k, q.fortran_vec (),
243 m, r.fortran_vec (), k, 246 m, r.fortran_vec (), k,
244 utmp.fortran_vec (), vtmp.fortran_vec (), 247 utmp.fortran_vec (), vtmp.fortran_vec (),
245 w, rw)); 248 w, rw));
246 } 249 }