Mercurial > octave
diff liboctave/numeric/sparse-lu.cc @ 22402:4caa7b28d183
maint: Style check C++ code in liboctave/
* Array-C.cc, Array-b.cc, Array-ch.cc, Array-d.cc, Array-f.cc, Array-fC.cc,
Array-i.cc, Array-idx-vec.cc, Array-s.cc, Array-str.cc, Array-util.cc,
Array-util.h, Array-voidp.cc, Array.cc, Array.h, CColVector.cc, CColVector.h,
CDiagMatrix.cc, CDiagMatrix.h, CMatrix.cc, CMatrix.h, CNDArray.cc, CNDArray.h,
CRowVector.cc, CRowVector.h, CSparse.cc, CSparse.h, DiagArray2.cc,
DiagArray2.h, MArray-C.cc, MArray-d.cc, MArray-f.cc, MArray-fC.cc, MArray-i.cc,
MArray-s.cc, MArray.cc, MArray.h, MDiagArray2.cc, MDiagArray2.h, MSparse-C.cc,
MSparse-d.cc, MSparse.cc, MSparse.h, Matrix.h, MatrixType.cc, MatrixType.h,
PermMatrix.cc, PermMatrix.h, Range.cc, Range.h, Sparse-C.cc, Sparse-b.cc,
Sparse-d.cc, Sparse.cc, Sparse.h, boolMatrix.cc, boolMatrix.h, boolNDArray.cc,
boolNDArray.h, boolSparse.cc, boolSparse.h, chMatrix.cc, chMatrix.h,
chNDArray.cc, chNDArray.h, dColVector.cc, dColVector.h, dDiagMatrix.cc,
dDiagMatrix.h, dMatrix.cc, dMatrix.h, dNDArray.cc, dNDArray.h, dRowVector.cc,
dRowVector.h, dSparse.cc, dSparse.h, dim-vector.cc, dim-vector.h,
fCColVector.cc, fCColVector.h, fCDiagMatrix.cc, fCDiagMatrix.h, fCMatrix.cc,
fCMatrix.h, fCNDArray.cc, fCNDArray.h, fCRowVector.cc, fCRowVector.h,
fColVector.cc, fColVector.h, fDiagMatrix.cc, fDiagMatrix.h, fMatrix.cc,
fMatrix.h, fNDArray.cc, fNDArray.h, fRowVector.cc, fRowVector.h, idx-vector.cc,
idx-vector.h, int16NDArray.cc, int16NDArray.h, int32NDArray.cc, int32NDArray.h,
int64NDArray.cc, int64NDArray.h, int8NDArray.cc, int8NDArray.h, intNDArray.cc,
intNDArray.h, uint16NDArray.cc, uint16NDArray.h, uint32NDArray.cc,
uint32NDArray.h, uint64NDArray.h, uint8NDArray.h, blaswrap.c, cquit.c,
f77-extern.cc, f77-fcn.c, f77-fcn.h, lo-error.c, lo-error.h, quit.cc, quit.h,
liboctave-build-info.h, liboctave-build-info.in.cc, CollocWt.cc, CollocWt.h,
DAE.h, DAEFunc.h, DAERT.h, DAERTFunc.h, DASPK.cc, DASPK.h, DASRT.cc, DASRT.h,
DASSL.cc, DASSL.h, DET.h, EIG.cc, EIG.h, LSODE.cc, LSODE.h, ODE.h, ODEFunc.h,
ODES.cc, ODES.h, ODESFunc.h, Quad.cc, Quad.h, aepbalance.cc, aepbalance.h,
base-dae.h, base-de.h, base-min.h, bsxfun-decl.h, bsxfun-defs.cc, bsxfun.h,
chol.cc, chol.h, eigs-base.cc, eigs-base.h, fEIG.cc, fEIG.h, gepbalance.cc,
gepbalance.h, gsvd.cc, gsvd.h, hess.cc, hess.h, lo-amos-proto.h,
lo-arpack-proto.h, lo-blas-proto.h, lo-fftpack-proto.h, lo-lapack-proto.h,
lo-mappers.cc, lo-mappers.h, lo-qrupdate-proto.h, lo-ranlib-proto.h,
lo-slatec-proto.h, lo-specfun.cc, lo-specfun.h, lu.cc, lu.h, oct-convn.cc,
oct-fftw.cc, oct-fftw.h, oct-norm.h, oct-rand.cc, oct-rand.h, oct-spparms.cc,
oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randgamma.cc, randgamma.h,
randmtzig.cc, randmtzig.h, randpoisson.cc, randpoisson.h, schur.cc, schur.h,
sparse-chol.cc, sparse-chol.h, sparse-dmsolve.cc, sparse-dmsolve.h,
sparse-lu.cc, sparse-lu.h, sparse-qr.cc, sparse-qr.h, svd.cc, svd.h,
Sparse-diag-op-defs.h, Sparse-op-decls.h, Sparse-op-defs.h,
Sparse-perm-op-defs.h, mx-base.h, mx-defs.h, mx-ext.h, mx-inlines.cc,
mx-op-decl.h, mx-op-defs.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h,
file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h,
mach-info.cc, mach-info.h, oct-env.cc, oct-env.h, oct-group.cc, oct-group.h,
oct-passwd.cc, oct-passwd.h, oct-syscalls.cc, oct-time.cc, oct-time.h,
oct-uname.cc, oct-uname.h, action-container.h, base-list.h, byte-swap.h,
caseless-str.h, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, data-conv.cc,
data-conv.h, f2c-main.c, functor.h, glob-match.cc, glob-match.h, kpse.cc,
kpse.h, lo-array-errwarn.cc, lo-array-errwarn.h, lo-array-gripes.cc,
lo-array-gripes.h, lo-cutils.c, lo-cutils.h, lo-hash.cc, lo-hash.h, lo-ieee.cc,
lo-ieee.h, lo-macros.h, lo-math.h, lo-regexp.cc, lo-regexp.h, lo-traits.h,
lo-utils.cc, lo-utils.h, oct-alloc.h, oct-base64.cc, oct-binmap.h, oct-cmplx.h,
oct-glob.cc, oct-glob.h, oct-inttypes-fwd.h, oct-inttypes.cc, oct-inttypes.h,
oct-locbuf.cc, oct-mutex.cc, oct-mutex.h, oct-refcount.h, oct-rl-edit.c,
oct-rl-edit.h, oct-rl-hist.c, oct-rl-hist.h, oct-shlib.cc, oct-shlib.h,
oct-sort.cc, oct-sort.h, oct-sparse.h, oct-string.cc, oct-string.h,
pathsearch.cc, pathsearch.h, singleton-cleanup.cc, singleton-cleanup.h,
sparse-sort.cc, sparse-sort.h, sparse-util.cc, sparse-util.h, str-vec.cc,
str-vec.h, sun-utils.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc,
url-transfer.h, areadlink-wrapper.c, areadlink-wrapper.h,
async-system-wrapper.c, async-system-wrapper.h, base64-wrappers.c,
base64-wrappers.h, canonicalize-file-name-wrapper.c,
canonicalize-file-name-wrapper.h, dirent-wrappers.c, dirent-wrappers.h,
fcntl-wrappers.c, fcntl-wrappers.h, filepos-wrappers.c, filepos-wrappers.h,
fpucw-wrappers.c, fpucw-wrappers.h, gen-tempname-wrapper.c,
gen-tempname-wrapper.h, getopt-wrapper.c, glob-wrappers.c, hash-wrappers.c,
hash-wrappers.h, math-wrappers.c, math-wrappers.h, mkostemp-wrapper.c,
mkostemp-wrapper.h, nanosleep-wrapper.c, nanosleep-wrapper.h, nproc-wrapper.c,
nproc-wrapper.h, octave-popen2.c, octave-popen2.h, putenv-wrapper.c,
putenv-wrapper.h, set-program-name-wrapper.c, set-program-name-wrapper.h,
signal-wrappers.c, signal-wrappers.h, stat-wrappers.c, stat-wrappers.h,
strdup-wrapper.c, strdup-wrapper.h, strftime-wrapper.c, strftime-wrapper.h,
strmode-wrapper.c, strmode-wrapper.h, strptime-wrapper.c, strptime-wrapper.h,
time-wrappers.c, time-wrappers.h, tmpfile-wrapper.c, tmpfile-wrapper.h,
uname-wrapper.c, uname-wrapper.h, unistd-wrappers.c, unistd-wrappers.h,
unsetenv-wrapper.c, unsetenv-wrapper.h, vasprintf-wrapper.c,
vasprintf-wrapper.h, wait-for-input.c, wait-for-input.h, wait-wrappers.c,
wait-wrappers.h:
Wrap long lines < 80 characters. Update incorrect indentation.
| author | Rik <rik@octave.org> |
|---|---|
| date | Mon, 29 Aug 2016 11:09:25 -0700 |
| parents | 7f3c7a8bd131 |
| children | 3a2b891d0b33 e9a0469dedd9 |
line wrap: on
line diff
--- a/liboctave/numeric/sparse-lu.cc Mon Aug 29 12:27:08 2016 +0200 +++ b/liboctave/numeric/sparse-lu.cc Mon Aug 29 11:09:25 2016 -0700 @@ -59,7 +59,8 @@ template <typename T> octave_idx_type - umfpack_get_lunz (octave_idx_type *lnz, octave_idx_type *unz, void *Numeric); + umfpack_get_lunz (octave_idx_type *lnz, octave_idx_type *unz, + void *Numeric); template <typename T> octave_idx_type @@ -97,7 +98,8 @@ template <typename T> void umfpack_report_matrix (octave_idx_type n_row, octave_idx_type n_col, - const octave_idx_type *Ap, const octave_idx_type *Ai, + const octave_idx_type *Ap, + const octave_idx_type *Ai, const T *Ax, // Or Az_packed octave_idx_type col_form, const double *Control); @@ -210,7 +212,8 @@ const octave_idx_type *Ai, const double *Ax, octave_idx_type col_form, const double *Control) { - UMFPACK_DNAME (report_matrix) (n_row, n_col, Ap, Ai, Ax, col_form, Control); + UMFPACK_DNAME (report_matrix) (n_row, n_col, Ap, Ai, Ax, + col_form, Control); } template <> @@ -431,12 +434,15 @@ const octave_idx_type *Ai = a.ridx (); const lu_elt_type *Ax = a.data (); - umfpack_report_matrix<lu_elt_type> (nr, nc, Ap, Ai, Ax, static_cast<octave_idx_type> (1), control); + umfpack_report_matrix<lu_elt_type> (nr, nc, Ap, Ai, Ax, + static_cast<octave_idx_type> (1), + control); void *Symbolic; Matrix Info (1, UMFPACK_INFO); double *info = Info.fortran_vec (); - int status = umfpack_qsymbolic<lu_elt_type> (nr, nc, Ap, Ai, Ax, 0, &Symbolic, control, info); + int status = umfpack_qsymbolic<lu_elt_type> (nr, nc, Ap, Ai, Ax, 0, + &Symbolic, control, info); if (status < 0) { @@ -453,7 +459,8 @@ umfpack_report_symbolic<lu_elt_type> (Symbolic, control); void *Numeric; - status = umfpack_numeric<lu_elt_type> (Ap, Ai, Ax, Symbolic, &Numeric, control, info); + status = umfpack_numeric<lu_elt_type> (Ap, Ai, Ax, Symbolic, + &Numeric, control, info); umfpack_free_symbolic<lu_elt_type> (&Symbolic); cond = Info (UMFPACK_RCOND); @@ -490,7 +497,8 @@ octave_idx_type n_inner = (nr < nc ? nr : nc); if (lnz < 1) - Lfact = lu_type (n_inner, nr, static_cast<octave_idx_type> (1)); + Lfact = lu_type (n_inner, nr, + static_cast<octave_idx_type> (1)); else Lfact = lu_type (n_inner, nr, lnz); @@ -499,7 +507,8 @@ lu_elt_type *Ltx = Lfact.data (); if (unz < 1) - Ufact = lu_type (n_inner, nc, static_cast<octave_idx_type> (1)); + Ufact = lu_type (n_inner, nc, + static_cast<octave_idx_type> (1)); else Ufact = lu_type (n_inner, nc, unz); @@ -523,7 +532,11 @@ octave_idx_type *q = Q.fortran_vec (); octave_idx_type do_recip; - status = umfpack_get_numeric<lu_elt_type> (Ltp, Ltj, Ltx, Up, Uj, Ux, p, q, 0, &do_recip, Rx, Numeric); + status = umfpack_get_numeric<lu_elt_type> (Ltp, Ltj, Ltx, + Up, Uj, Ux, + p, q, 0, + &do_recip, Rx, + Numeric); umfpack_free_numeric<lu_elt_type> (&Numeric); @@ -542,8 +555,18 @@ for (octave_idx_type i = 0; i < nr; i++) Rx[i] = 1.0 / Rx[i]; - umfpack_report_matrix<lu_elt_type> (nr, n_inner, Lfact.cidx (), Lfact.ridx (), Lfact.data (), static_cast<octave_idx_type> (1), control); - umfpack_report_matrix<lu_elt_type> (n_inner, nc, Ufact.cidx (), Ufact.ridx (), Ufact.data (), static_cast<octave_idx_type> (1), control); + umfpack_report_matrix<lu_elt_type> (nr, n_inner, + Lfact.cidx (), + Lfact.ridx (), + Lfact.data (), + static_cast<octave_idx_type> (1), + control); + umfpack_report_matrix<lu_elt_type> (n_inner, nc, + Ufact.cidx (), + Ufact.ridx (), + Ufact.data (), + static_cast<octave_idx_type> (1), + control); umfpack_report_perm<lu_elt_type> (nr, p, control); umfpack_report_perm<lu_elt_type> (nc, q, control); } @@ -636,7 +659,9 @@ const octave_idx_type *Ai = a.ridx (); const lu_elt_type *Ax = a.data (); - umfpack_report_matrix<lu_elt_type> (nr, nc, Ap, Ai, Ax, static_cast<octave_idx_type> (1), control); + umfpack_report_matrix<lu_elt_type> (nr, nc, Ap, Ai, Ax, + static_cast<octave_idx_type> (1), + control); void *Symbolic; Matrix Info (1, UMFPACK_INFO); @@ -651,7 +676,9 @@ for (octave_idx_type i = 0; i < nc; i++) qinit[i] = static_cast<octave_idx_type> (Qinit (i)); - status = umfpack_qsymbolic<lu_elt_type> (nr, nc, Ap, Ai, Ax, qinit, &Symbolic, control, info); + status = umfpack_qsymbolic<lu_elt_type> (nr, nc, Ap, Ai, Ax, + qinit, &Symbolic, control, + info); } while (0); @@ -670,7 +697,8 @@ umfpack_report_symbolic<lu_elt_type> (Symbolic, control); void *Numeric; - status = umfpack_numeric<lu_elt_type> (Ap, Ai, Ax, Symbolic, &Numeric, control, info); + status = umfpack_numeric<lu_elt_type> (Ap, Ai, Ax, Symbolic, + &Numeric, control, info); umfpack_free_symbolic<lu_elt_type> (&Symbolic); cond = Info (UMFPACK_RCOND); @@ -707,7 +735,8 @@ octave_idx_type n_inner = (nr < nc ? nr : nc); if (lnz < 1) - Lfact = lu_type (n_inner, nr, static_cast<octave_idx_type> (1)); + Lfact = lu_type (n_inner, nr, + static_cast<octave_idx_type> (1)); else Lfact = lu_type (n_inner, nr, lnz); @@ -716,7 +745,8 @@ lu_elt_type *Ltx = Lfact.data (); if (unz < 1) - Ufact = lu_type (n_inner, nc, static_cast<octave_idx_type> (1)); + Ufact = lu_type (n_inner, nc, + static_cast<octave_idx_type> (1)); else Ufact = lu_type (n_inner, nc, unz); @@ -740,7 +770,11 @@ octave_idx_type *q = Q.fortran_vec (); octave_idx_type do_recip; - status = umfpack_get_numeric<lu_elt_type> (Ltp, Ltj, Ltx, Up, Uj, Ux, p, q, 0, &do_recip, Rx, Numeric); + status = umfpack_get_numeric<lu_elt_type> (Ltp, Ltj, Ltx, + Up, Uj, Ux, + p, q, 0, + &do_recip, + Rx, Numeric); umfpack_free_numeric<lu_elt_type> (&Numeric); @@ -759,8 +793,18 @@ for (octave_idx_type i = 0; i < nr; i++) Rx[i] = 1.0 / Rx[i]; - umfpack_report_matrix<lu_elt_type> (nr, n_inner, Lfact.cidx (), Lfact.ridx (), Lfact.data (), static_cast<octave_idx_type> (1), control); - umfpack_report_matrix<lu_elt_type> (n_inner, nc, Ufact.cidx (), Ufact.ridx (), Ufact.data (), static_cast<octave_idx_type> (1), control); + umfpack_report_matrix<lu_elt_type> (nr, n_inner, + Lfact.cidx (), + Lfact.ridx (), + Lfact.data (), + static_cast<octave_idx_type> (1), + control); + umfpack_report_matrix<lu_elt_type> (n_inner, nc, + Ufact.cidx (), + Ufact.ridx (), + Ufact.data (), + static_cast<octave_idx_type> (1), + control); umfpack_report_perm<lu_elt_type> (nr, p, control); umfpack_report_perm<lu_elt_type> (nc, q, control); } @@ -917,3 +961,4 @@ template class sparse_lu<SparseComplexMatrix>; } } +