Mercurial > octave-nkf

comparison liboctave/numeric/CmplxLU.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 4197fc428c7d
comparison
equal deleted inserted replaced
18083:938f01339043 18084:8e056300994b
98 octave_idx_type n = r.columns (); 98 octave_idx_type n = r.columns ();
99 octave_idx_type k = l.columns (); 99 octave_idx_type k = l.columns ();
100 100
101 if (u.length () == m && v.length () == n) 101 if (u.length () == m && v.length () == n)
102 { 102 {
103 ComplexColumnVector utmp = u, vtmp = v; 103 ComplexColumnVector utmp = u;
104 ComplexColumnVector vtmp = v;
104 F77_XFCN (zlu1up, ZLU1UP, (m, n, l.fortran_vec (), m, r.fortran_vec (), k, 105 F77_XFCN (zlu1up, ZLU1UP, (m, n, l.fortran_vec (), m, r.fortran_vec (), k,
105 utmp.fortran_vec (), vtmp.fortran_vec ())); 106 utmp.fortran_vec (), vtmp.fortran_vec ()));
106 } 107 }
107 else 108 else
108 (*current_liboctave_error_handler) ("luupdate: dimensions mismatch"); 109 (*current_liboctave_error_handler) ("luupdate: dimensions mismatch");
122 123
123 if (u.rows () == m && v.rows () == n && u.cols () == v.cols ()) 124 if (u.rows () == m && v.rows () == n && u.cols () == v.cols ())
124 { 125 {
125 for (volatile octave_idx_type i = 0; i < u.cols (); i++) 126 for (volatile octave_idx_type i = 0; i < u.cols (); i++)
126 { 127 {
127 ComplexColumnVector utmp = u.column (i), vtmp = v.column (i); 128 ComplexColumnVector utmp = u.column (i);
129 ComplexColumnVector vtmp = v.column (i);
128 F77_XFCN (zlu1up, ZLU1UP, (m, n, l.fortran_vec (), 130 F77_XFCN (zlu1up, ZLU1UP, (m, n, l.fortran_vec (),
129 m, r.fortran_vec (), k, 131 m, r.fortran_vec (), k,
130 utmp.fortran_vec (), vtmp.fortran_vec ())); 132 utmp.fortran_vec (), vtmp.fortran_vec ()));
131 } 133 }
132 } 134 }
147 octave_idx_type n = r.columns (); 149 octave_idx_type n = r.columns ();
148 octave_idx_type k = l.columns (); 150 octave_idx_type k = l.columns ();
149 151
150 if (u.length () == m && v.length () == n) 152 if (u.length () == m && v.length () == n)
151 { 153 {
152 ComplexColumnVector utmp = u, vtmp = v; 154 ComplexColumnVector utmp = u;
155 ComplexColumnVector vtmp = v;
153 OCTAVE_LOCAL_BUFFER (Complex, w, m); 156 OCTAVE_LOCAL_BUFFER (Complex, w, m);
154 for (octave_idx_type i = 0; i < m; i++) ipvt(i) += 1; // increment 157 for (octave_idx_type i = 0; i < m; i++) ipvt(i) += 1; // increment
155 F77_XFCN (zlup1up, ZLUP1UP, (m, n, l.fortran_vec (), 158 F77_XFCN (zlup1up, ZLUP1UP, (m, n, l.fortran_vec (),
156 m, r.fortran_vec (), k, 159 m, r.fortran_vec (), k,
157 ipvt.fortran_vec (), 160 ipvt.fortran_vec (),
178 { 181 {
179 OCTAVE_LOCAL_BUFFER (Complex, w, m); 182 OCTAVE_LOCAL_BUFFER (Complex, w, m);
180 for (octave_idx_type i = 0; i < m; i++) ipvt(i) += 1; // increment 183 for (octave_idx_type i = 0; i < m; i++) ipvt(i) += 1; // increment
181 for (volatile octave_idx_type i = 0; i < u.cols (); i++) 184 for (volatile octave_idx_type i = 0; i < u.cols (); i++)
182 { 185 {
183 ComplexColumnVector utmp = u.column (i), vtmp = v.column (i); 186 ComplexColumnVector utmp = u.column (i);
187 ComplexColumnVector vtmp = v.column (i);
184 F77_XFCN (zlup1up, ZLUP1UP, (m, n, l.fortran_vec (), 188 F77_XFCN (zlup1up, ZLUP1UP, (m, n, l.fortran_vec (),
185 m, r.fortran_vec (), k, 189 m, r.fortran_vec (), k,
186 ipvt.fortran_vec (), 190 ipvt.fortran_vec (),
187 utmp.data (), vtmp.data (), w)); 191 utmp.data (), vtmp.data (), w));
188 } 192 }