Mercurial > octave-nkf

comparison liboctave/numeric/dbleLU.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
97 octave_idx_type n = r.columns (); 97 octave_idx_type n = r.columns ();
98 octave_idx_type k = l.columns (); 98 octave_idx_type k = l.columns ();
99 99
100 if (u.length () == m && v.length () == n) 100 if (u.length () == m && v.length () == n)
101 { 101 {
102 ColumnVector utmp = u, vtmp = v; 102 ColumnVector utmp = u;
103 ColumnVector vtmp = v;
103 F77_XFCN (dlu1up, DLU1UP, (m, n, l.fortran_vec (), m, r.fortran_vec (), k, 104 F77_XFCN (dlu1up, DLU1UP, (m, n, l.fortran_vec (), m, r.fortran_vec (), k,
104 utmp.fortran_vec (), vtmp.fortran_vec ())); 105 utmp.fortran_vec (), vtmp.fortran_vec ()));
105 } 106 }
106 else 107 else
107 (*current_liboctave_error_handler) ("luupdate: dimensions mismatch"); 108 (*current_liboctave_error_handler) ("luupdate: dimensions mismatch");
121 122
122 if (u.rows () == m && v.rows () == n && u.cols () == v.cols ()) 123 if (u.rows () == m && v.rows () == n && u.cols () == v.cols ())
123 { 124 {
124 for (volatile octave_idx_type i = 0; i < u.cols (); i++) 125 for (volatile octave_idx_type i = 0; i < u.cols (); i++)
125 { 126 {
126 ColumnVector utmp = u.column (i), vtmp = v.column (i); 127 ColumnVector utmp = u.column (i);
128 ColumnVector vtmp = v.column (i);
127 F77_XFCN (dlu1up, DLU1UP, (m, n, l.fortran_vec (), 129 F77_XFCN (dlu1up, DLU1UP, (m, n, l.fortran_vec (),
128 m, r.fortran_vec (), k, 130 m, r.fortran_vec (), k,
129 utmp.fortran_vec (), vtmp.fortran_vec ())); 131 utmp.fortran_vec (), vtmp.fortran_vec ()));
130 } 132 }
131 } 133 }
145 octave_idx_type n = r.columns (); 147 octave_idx_type n = r.columns ();
146 octave_idx_type k = l.columns (); 148 octave_idx_type k = l.columns ();
147 149
148 if (u.length () == m && v.length () == n) 150 if (u.length () == m && v.length () == n)
149 { 151 {
150 ColumnVector utmp = u, vtmp = v; 152 ColumnVector utmp = u;
153 ColumnVector vtmp = v;
151 OCTAVE_LOCAL_BUFFER (double, w, m); 154 OCTAVE_LOCAL_BUFFER (double, w, m);
152 for (octave_idx_type i = 0; i < m; i++) ipvt(i) += 1; // increment 155 for (octave_idx_type i = 0; i < m; i++) ipvt(i) += 1; // increment
153 F77_XFCN (dlup1up, DLUP1UP, (m, n, l.fortran_vec (), 156 F77_XFCN (dlup1up, DLUP1UP, (m, n, l.fortran_vec (),
154 m, r.fortran_vec (), k, 157 m, r.fortran_vec (), k,
155 ipvt.fortran_vec (), 158 ipvt.fortran_vec (),
176 { 179 {
177 OCTAVE_LOCAL_BUFFER (double, w, m); 180 OCTAVE_LOCAL_BUFFER (double, w, m);
178 for (octave_idx_type i = 0; i < m; i++) ipvt(i) += 1; // increment 181 for (octave_idx_type i = 0; i < m; i++) ipvt(i) += 1; // increment
179 for (volatile octave_idx_type i = 0; i < u.cols (); i++) 182 for (volatile octave_idx_type i = 0; i < u.cols (); i++)
180 { 183 {
181 ColumnVector utmp = u.column (i), vtmp = v.column (i); 184 ColumnVector utmp = u.column (i);
185 ColumnVector vtmp = v.column (i);
182 F77_XFCN (dlup1up, DLUP1UP, (m, n, l.fortran_vec (), 186 F77_XFCN (dlup1up, DLUP1UP, (m, n, l.fortran_vec (),
183 m, r.fortran_vec (), k, 187 m, r.fortran_vec (), k,
184 ipvt.fortran_vec (), 188 ipvt.fortran_vec (),
185 utmp.data (), vtmp.data (), w)); 189 utmp.data (), vtmp.data (), w));
186 } 190 }