Mercurial > octave-nkf
diff liboctave/sparse-dmsolve.cc @ 15018:3d8ace26c5b4
maint: Use Octave coding conventions for cuddled parentheses in liboctave/.
* Array-util.cc, Array.cc, Array.h, CMatrix.cc, CNDArray.cc, CSparse.cc,
CmplxQR.cc, CollocWt.cc, DASPK.cc, DASRT.cc, DASSL.cc, EIG.cc, LSODE.cc,
MSparse.cc, MatrixType.cc, Sparse-op-defs.h, Sparse-perm-op-defs.h, Sparse.cc,
Sparse.h, SparseCmplxCHOL.cc, SparseCmplxLU.cc, SparseCmplxQR.cc, SparseQR.cc,
SparsedbleCHOL.cc, SparsedbleLU.cc, boolSparse.cc, cmd-hist.cc, dDiagMatrix.cc,
dMatrix.cc, dNDArray.cc, dSparse.cc, data-conv.cc, dbleQR.cc, dbleSVD.cc,
dim-vector.cc, eigs-base.cc, f2c-main.c, fCMatrix.cc, fCNDArray.cc,
fCmplxQR.cc, fEIG.cc, fMatrix.cc, fNDArray.cc, floatQR.cc, floatSVD.cc,
idx-vector.cc, kpse.cc, lo-specfun.cc, mx-inlines.cc, mx-op-defs.h,
oct-alloc.cc, oct-binmap.h, oct-fftw.cc, oct-group.h, oct-inttypes.cc,
oct-inttypes.h, oct-locbuf.cc, oct-md5.cc, oct-rand.cc, oct-sort.cc,
oct-syscalls.cc, randgamma.c, randmtzig.c, randpoisson.c, sparse-base-chol.cc,
sparse-base-lu.cc, sparse-dmsolve.cc, str-vec.cc, str-vec.h, tempnam.c,
tempname.c: Use Octave coding conventions for cuddled parentheses in liboctave/.
| author | Rik <rik@octave.org> |
|---|---|
| date | Thu, 26 Jul 2012 08:13:22 -0700 |
| parents | 460a3c6d8bf1 |
| children | 560317fd5977 |
line wrap: on
line diff
--- a/liboctave/sparse-dmsolve.cc Wed Jul 25 20:58:21 2012 -0700 +++ b/liboctave/sparse-dmsolve.cc Thu Jul 26 08:13:22 2012 -0700 @@ -54,16 +54,16 @@ nz = 0; for (octave_idx_type j = cst ; j < cend ; j++) { - octave_idx_type qq = (Q ? Q [j] : j); + octave_idx_type qq = (Q ? Q[j] : j); B.xcidx (j - cst) = nz; - for (octave_idx_type p = A.cidx(qq) ; p < A.cidx (qq+1) ; p++) + for (octave_idx_type p = A.cidx (qq) ; p < A.cidx (qq+1) ; p++) { octave_quit (); octave_idx_type r = (Pinv ? Pinv [A.ridx (p)] : A.ridx (p)); if (r >= rst && r < rend) { B.xdata (nz) = A.data (p); - B.xridx (nz++) = r - rst ; + B.xridx (nz++) = r - rst ; } } } @@ -77,16 +77,16 @@ nz = 0; for (octave_idx_type j = cst ; j < cend ; j++) { - octave_idx_type qq = (Q ? Q [j] : j); + octave_idx_type qq = (Q ? Q[j] : j); B.xcidx (j - cst) = nz; - for (octave_idx_type p = A.cidx(qq) ; p < A.cidx (qq+1) ; p++) + for (octave_idx_type p = A.cidx (qq) ; p < A.cidx (qq+1) ; p++) { octave_quit (); octave_idx_type r = (Pinv ? Pinv [A.ridx (p)] : A.ridx (p)); if (r >= rst && r < rend) { X [r-rst] = A.data (p); - B.xridx (nz++) = r - rst ; + B.xridx (nz++) = r - rst ; } } sort.sort (ri + B.xcidx (j - cst), nz - B.xcidx (j - cst)); @@ -197,17 +197,17 @@ OCTAVE_LOCAL_BUFFER (octave_idx_type, Qinv, nr); for (octave_idx_type i = 0; i < nr; i++) - Qinv [Q [i]] = i; + Qinv[Q[i]] = i; // First count the number of elements in the final array - octave_idx_type nel = a.xcidx(c) + b.nnz (); + octave_idx_type nel = a.xcidx (c) + b.nnz (); if (c + b_cols < nc) - nel += a.xcidx(nc) - a.xcidx(c + b_cols); + nel += a.xcidx (nc) - a.xcidx (c + b_cols); for (octave_idx_type i = c; i < c + b_cols; i++) - for (octave_idx_type j = a.xcidx(i); j < a.xcidx(i+1); j++) - if (Qinv [a.xridx(j)] < r || Qinv [a.xridx(j)] >= r + b_rows) + for (octave_idx_type j = a.xcidx (i); j < a.xcidx (i+1); j++) + if (Qinv [a.xridx (j)] < r || Qinv [a.xridx (j)] >= r + b_rows) nel++; OCTAVE_LOCAL_BUFFER (T, X, nr); @@ -216,49 +216,49 @@ a = MSparse<T> (nr, nc, nel); octave_idx_type *ri = a.xridx (); - for (octave_idx_type i = 0; i < tmp.cidx(c); i++) + for (octave_idx_type i = 0; i < tmp.cidx (c); i++) { - a.xdata(i) = tmp.xdata(i); - a.xridx(i) = tmp.xridx(i); + a.xdata (i) = tmp.xdata (i); + a.xridx (i) = tmp.xridx (i); } for (octave_idx_type i = 0; i < c + 1; i++) - a.xcidx(i) = tmp.xcidx(i); + a.xcidx (i) = tmp.xcidx (i); - octave_idx_type ii = a.xcidx(c); + octave_idx_type ii = a.xcidx (c); for (octave_idx_type i = c; i < c + b_cols; i++) { octave_quit (); - for (octave_idx_type j = tmp.xcidx(i); j < tmp.xcidx(i+1); j++) - if (Qinv [tmp.xridx(j)] < r || Qinv [tmp.xridx(j)] >= r + b_rows) + for (octave_idx_type j = tmp.xcidx (i); j < tmp.xcidx (i+1); j++) + if (Qinv [tmp.xridx (j)] < r || Qinv [tmp.xridx (j)] >= r + b_rows) { - X [tmp.xridx(j)] = tmp.xdata(j); - a.xridx(ii++) = tmp.xridx(j); + X [tmp.xridx (j)] = tmp.xdata (j); + a.xridx (ii++) = tmp.xridx (j); } octave_quit (); - for (octave_idx_type j = b.cidx(i-c); j < b.cidx(i-c+1); j++) + for (octave_idx_type j = b.cidx (i-c); j < b.cidx (i-c+1); j++) { - X [Q [r + b.ridx(j)]] = b.data(j); - a.xridx(ii++) = Q [r + b.ridx(j)]; + X [Q [r + b.ridx (j)]] = b.data (j); + a.xridx (ii++) = Q [r + b.ridx (j)]; } sort.sort (ri + a.xcidx (i), ii - a.xcidx (i)); for (octave_idx_type p = a.xcidx (i); p < ii; p++) a.xdata (p) = X [a.xridx (p)]; - a.xcidx(i+1) = ii; + a.xcidx (i+1) = ii; } for (octave_idx_type i = c + b_cols; i < nc; i++) { - for (octave_idx_type j = tmp.xcidx(i); j < tmp.cidx(i+1); j++) + for (octave_idx_type j = tmp.xcidx (i); j < tmp.cidx (i+1); j++) { - a.xdata(ii) = tmp.xdata(j); - a.xridx(ii++) = tmp.xridx(j); + a.xdata (ii) = tmp.xdata (j); + a.xridx (ii++) = tmp.xridx (j); } - a.xcidx(i+1) = ii; + a.xcidx (i+1) = ii; } } @@ -287,7 +287,7 @@ for (octave_idx_type i = 0; i < b_nr; i++) { octave_quit (); - Btx [p [i] + off] = Bx [ i + off]; + Btx[p[i] + off] = Bx[ i + off]; } } } @@ -318,15 +318,15 @@ octave_sort<octave_idx_type> sort; octave_idx_type *ri = a.xridx (); OCTAVE_LOCAL_BUFFER (RT, X, b_nr); - a.xcidx(0) = 0; + a.xcidx (0) = 0; for (octave_idx_type j = 0; j < b_nc; j++) { - for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) + for (octave_idx_type i = b.cidx (j); i < b.cidx (j+1); i++) { octave_quit (); - octave_idx_type r = p [b.ridx (i)]; - X [r] = b.data (i); - a.xridx(nz++) = p [b.ridx (i)]; + octave_idx_type r = p[b.ridx (i)]; + X[r] = b.data (i); + a.xridx (nz++) = p[b.ridx (i)]; } sort.sort (ri + a.xcidx (j), nz - a.xcidx (j)); for (octave_idx_type i = a.cidx (j); i < nz; i++) @@ -334,7 +334,7 @@ octave_quit (); a.xdata (i) = X [a.xridx (i)]; } - a.xcidx(j+1) = nz; + a.xcidx (j+1) = nz; } } @@ -389,7 +389,7 @@ csm.p = const_cast<octave_idx_type *>(a.cidx ()); csm.i = const_cast<octave_idx_type *>(a.ridx ()); -#if defined(CS_VER) && (CS_VER >= 2) +#if defined (CS_VER) && (CS_VER >= 2) CXSPARSE_DNAME (d) *dm = CXSPARSE_DNAME(_dmperm) (&csm, 0); octave_idx_type *p = dm->p; octave_idx_type *q = dm->q; @@ -400,26 +400,26 @@ #endif OCTAVE_LOCAL_BUFFER (octave_idx_type, pinv, nr); for (octave_idx_type i = 0; i < nr; i++) - pinv [p [i]] = i; + pinv[p[i]] = i; RT btmp; dmsolve_permute (btmp, b, pinv); info = 0; retval.resize (nc, b_nc); // Leading over-determined block - if (dm->rr [2] < nr && dm->cc [3] < nc) + if (dm->rr[2] < nr && dm->cc[3] < nc) { - ST m = dmsolve_extract (a, pinv, q, dm->rr [2], nr, dm->cc [3], nc, + ST m = dmsolve_extract (a, pinv, q, dm->rr[2], nr, dm->cc[3], nc, nnz_remaining, true); nnz_remaining -= m.nnz (); RT mtmp = qrsolve (m, dmsolve_extract (btmp, 0, 0, dm->rr[2], b_nr, 0, b_nc), info); - dmsolve_insert (retval, mtmp, q, dm->cc [3], 0); - if (dm->rr [2] > 0 && !info) + dmsolve_insert (retval, mtmp, q, dm->cc[3], 0); + if (dm->rr[2] > 0 && !info) { - m = dmsolve_extract (a, pinv, q, 0, dm->rr [2], - dm->cc [3], nc, nnz_remaining, true); + m = dmsolve_extract (a, pinv, q, 0, dm->rr[2], + dm->cc[3], nc, nnz_remaining, true); nnz_remaining -= m.nnz (); RT ctmp = dmsolve_extract (btmp, 0, 0, 0, dm->rr[2], 0, b_nc); @@ -429,12 +429,12 @@ // Structurally non-singular blocks // FIXME Should use fine Dulmange-Mendelsohn decomposition here. - if (dm->rr [1] < dm->rr [2] && dm->cc [2] < dm->cc [3] && !info) + if (dm->rr[1] < dm->rr[2] && dm->cc[2] < dm->cc[3] && !info) { - ST m = dmsolve_extract (a, pinv, q, dm->rr [1], dm->rr [2], - dm->cc [2], dm->cc [3], nnz_remaining, false); + ST m = dmsolve_extract (a, pinv, q, dm->rr[1], dm->rr[2], + dm->cc[2], dm->cc[3], nnz_remaining, false); nnz_remaining -= m.nnz (); - RT btmp2 = dmsolve_extract (btmp, 0, 0, dm->rr [1], dm->rr [2], + RT btmp2 = dmsolve_extract (btmp, 0, 0, dm->rr[1], dm->rr[2], 0, b_nc); double rcond = 0.0; MatrixType mtyp (MatrixType::Full); @@ -446,11 +446,11 @@ mtmp = qrsolve (m, btmp2, info); } - dmsolve_insert (retval, mtmp, q, dm->cc [2], 0); - if (dm->rr [1] > 0 && !info) + dmsolve_insert (retval, mtmp, q, dm->cc[2], 0); + if (dm->rr[1] > 0 && !info) { - m = dmsolve_extract (a, pinv, q, 0, dm->rr [1], dm->cc [2], - dm->cc [3], nnz_remaining, true); + m = dmsolve_extract (a, pinv, q, 0, dm->rr[1], dm->cc[2], + dm->cc[3], nnz_remaining, true); nnz_remaining -= m.nnz (); RT ctmp = dmsolve_extract (btmp, 0, 0, 0, dm->rr[1], 0, b_nc); @@ -459,13 +459,13 @@ } // Trailing under-determined block - if (dm->rr [1] > 0 && dm->cc [2] > 0 && !info) + if (dm->rr[1] > 0 && dm->cc[2] > 0 && !info) { - ST m = dmsolve_extract (a, pinv, q, 0, dm->rr [1], 0, - dm->cc [2], nnz_remaining, true); + ST m = dmsolve_extract (a, pinv, q, 0, dm->rr[1], 0, + dm->cc[2], nnz_remaining, true); RT mtmp = - qrsolve (m, dmsolve_extract(btmp, 0, 0, 0, dm->rr [1] , 0, - b_nc), info); + qrsolve (m, dmsolve_extract (btmp, 0, 0, 0, dm->rr[1] , 0, + b_nc), info); dmsolve_insert (retval, mtmp, q, 0, 0); }