Mercurial > hg > octave-max
diff liboctave/dSparse.cc @ 14928:460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Example: func() => func ()
* dynamic.txi, func.txi, oop.txi, var.txi, embedded.cc, fortdemo.cc,
funcdemo.cc, paramdemo.cc, stringdemo.cc, unwinddemo.cc, Array.cc, Array.h,
CColVector.cc, CDiagMatrix.h, CMatrix.cc, CNDArray.cc, CRowVector.cc,
CSparse.cc, CmplxGEPBAL.cc, EIG.cc, MSparse.cc, MatrixType.cc,
Sparse-op-defs.h, Sparse-perm-op-defs.h, Sparse.cc, Sparse.h,
SparseCmplxCHOL.cc, SparseCmplxCHOL.h, SparseCmplxLU.cc, SparseCmplxQR.cc,
SparseCmplxQR.h, SparseQR.cc, SparseQR.h, SparsedbleCHOL.cc, SparsedbleCHOL.h,
SparsedbleLU.cc, SparsedbleLU.h, base-lu.cc, cmd-hist.cc, dColVector.cc,
dDiagMatrix.h, dMatrix.cc, dNDArray.cc, dRowVector.cc, dSparse.cc, dbleCHOL.cc,
dbleGEPBAL.cc, dim-vector.cc, eigs-base.cc, f2c-main.c, fCColVector.cc,
fCDiagMatrix.h, fCMatrix.cc, fCNDArray.cc, fCRowVector.cc, fCmplxGEPBAL.cc,
fColVector.cc, fDiagMatrix.h, fEIG.cc, fMatrix.cc, fNDArray.cc, fRowVector.cc,
file-ops.cc, file-stat.cc, floatCHOL.cc, floatGEPBAL.cc, idx-vector.h,
lo-specfun.cc, lo-sysdep.cc, mx-inlines.cc, oct-binmap.h, oct-convn.cc,
oct-md5.cc, oct-mem.h, oct-rand.cc, oct-syscalls.cc, randgamma.c, randmtzig.c,
sparse-base-chol.cc, sparse-base-chol.h, sparse-base-lu.cc, sparse-dmsolve.cc,
tempname.c, curl.m, divergence.m, randi.m, dlmwrite.m, edit.m, getappdata.m,
what.m, getarchdir.m, install.m, installed_packages.m, repackage.m,
unload_packages.m, colorbar.m, figure.m, isosurface.m, legend.m, loglog.m,
plot.m, plot3.m, plotyy.m, polar.m, __errplot__.m, __ghostscript__.m,
__marching_cube__.m, __plt__.m, __scatter__.m, semilogx.m, semilogy.m,
trimesh.m, trisurf.m, demo.m, test.m, datetick.m, __delaunayn__.cc,
__dsearchn__.cc, __fltk_uigetfile__.cc, __glpk__.cc, __init_fltk__.cc,
__lin_interpn__.cc, __magick_read__.cc, __pchip_deriv__.cc, balance.cc,
bsxfun.cc, ccolamd.cc, cellfun.cc, chol.cc, daspk.cc, dasrt.cc, dassl.cc,
dmperm.cc, eig.cc, eigs.cc, fftw.cc, filter.cc, find.cc, kron.cc, lookup.cc,
lsode.cc, matrix_type.cc, md5sum.cc, mgorth.cc, qr.cc, quad.cc, rand.cc,
regexp.cc, symbfact.cc, tril.cc, urlwrite.cc, op-bm-bm.cc, op-cdm-cdm.cc,
op-cell.cc, op-chm.cc, op-cm-cm.cc, op-cm-scm.cc, op-cm-sm.cc, op-cs-scm.cc,
op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc, op-fcdm-fcdm.cc,
op-fcm-fcm.cc, op-fdm-fdm.cc, op-fm-fm.cc, op-int.h, op-m-m.cc, op-m-scm.cc,
op-m-sm.cc, op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-range.cc, op-s-scm.cc,
op-s-sm.cc, op-sbm-sbm.cc, op-scm-cm.cc, op-scm-cs.cc, op-scm-m.cc,
op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc, op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc,
op-sm-s.cc, op-sm-scm.cc, op-sm-sm.cc, op-str-str.cc, op-struct.cc, bitfcns.cc,
data.cc, debug.cc, dynamic-ld.cc, error.cc, gl-render.cc, graphics.cc,
graphics.in.h, load-path.cc, ls-hdf5.cc, ls-mat5.cc, ls-mat5.h,
ls-oct-ascii.cc, ls-oct-ascii.h, mex.cc, mk-errno-list, oct-map.cc, oct-obj.h,
oct-parse.yy, octave-config.in.cc, ov-base-int.cc, ov-base-mat.cc, ov-base.cc,
ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-cell.cc, ov-class.cc,
ov-class.h, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-flt-cx-mat.cc,
ov-flt-re-mat.cc, ov-intx.h, ov-range.h, ov-re-mat.cc, ov-re-sparse.cc,
ov-str-mat.cc, ov-struct.cc, ov-usr-fcn.h, ov.h, pr-output.cc, pt-id.cc,
pt-id.h, pt-mat.cc, pt-select.cc, sparse.cc, symtab.cc, symtab.h, syscalls.cc,
toplev.cc, txt-eng-ft.cc, variables.cc, zfstream.cc, zfstream.h, Dork.m,
getStash.m, myStash.m, Gork.m, Pork.m, myStash.m, getStash.m, myStash.m,
getStash.m, myStash.m, fntests.m: Use Octave coding convention for
cuddled parenthis in function calls with empty argument lists.
| author | Rik <octave@nomad.inbox5.com> |
|---|---|
| date | Sun, 08 Jul 2012 11:28:50 -0700 |
| parents | 5bc9b9cb4362 |
| children | 3d8ace26c5b4 |
line wrap: on
line diff
--- a/liboctave/dSparse.cc +++ b/liboctave/dSparse.cc @@ -719,7 +719,7 @@ { SparseMatrix r; - if ((x.rows() == y.rows()) && (x.cols() == y.cols())) + if ((x.rows () == y.rows ()) && (x.cols () == y.cols ())) { octave_idx_type x_nr = x.rows (); octave_idx_type x_nc = x.cols (); @@ -837,12 +837,12 @@ typ == MatrixType::Permuted_Diagonal) { if (typ == MatrixType::Permuted_Diagonal) - retval = transpose(); + retval = transpose (); else retval = *this; // Force make_unique to be called - double *v = retval.data(); + double *v = retval.data (); if (calccond) { @@ -1022,7 +1022,7 @@ OCTAVE_LOCAL_BUFFER (double, work, nr); OCTAVE_LOCAL_BUFFER (octave_idx_type, rperm, nr); - octave_idx_type *perm = mattyp.triangular_perm(); + octave_idx_type *perm = mattyp.triangular_perm (); if (typ == MatrixType::Permuted_Upper) { for (octave_idx_type i = 0; i < nr; i++) @@ -1142,7 +1142,7 @@ return retval; inverse_singular: - return SparseMatrix(); + return SparseMatrix (); } SparseMatrix @@ -1158,26 +1158,26 @@ if (typ == MatrixType::Diagonal || typ == MatrixType::Permuted_Diagonal) ret = dinverse (mattype, info, rcond, true, calc_cond); else if (typ == MatrixType::Upper || typ == MatrixType::Permuted_Upper) - ret = tinverse (mattype, info, rcond, true, calc_cond).transpose(); + ret = tinverse (mattype, info, rcond, true, calc_cond).transpose (); else if (typ == MatrixType::Lower || typ == MatrixType::Permuted_Lower) { - MatrixType newtype = mattype.transpose(); - ret = transpose().tinverse (newtype, info, rcond, true, calc_cond); + MatrixType newtype = mattype.transpose (); + ret = transpose ().tinverse (newtype, info, rcond, true, calc_cond); } else { - if (mattype.is_hermitian()) + if (mattype.is_hermitian ()) { MatrixType tmp_typ (MatrixType::Upper); SparseCHOL fact (*this, info, false); - rcond = fact.rcond(); + rcond = fact.rcond (); if (info == 0) { double rcond2; - SparseMatrix Q = fact.Q(); - SparseMatrix InvL = fact.L().transpose().tinverse(tmp_typ, + SparseMatrix Q = fact.Q (); + SparseMatrix InvL = fact.L ().transpose ().tinverse(tmp_typ, info, rcond2, true, false); - ret = Q * InvL.transpose() * InvL * Q.transpose(); + ret = Q * InvL.transpose () * InvL * Q.transpose (); } else { @@ -1187,22 +1187,22 @@ } } - if (!mattype.is_hermitian()) + if (!mattype.is_hermitian ()) { - octave_idx_type n = rows(); + octave_idx_type n = rows (); ColumnVector Qinit(n); for (octave_idx_type i = 0; i < n; i++) Qinit(i) = i; MatrixType tmp_typ (MatrixType::Upper); - SparseLU fact (*this, Qinit, Matrix(), false, false); - rcond = fact.rcond(); + SparseLU fact (*this, Qinit, Matrix (), false, false); + rcond = fact.rcond (); double rcond2; - SparseMatrix InvL = fact.L().transpose().tinverse(tmp_typ, + SparseMatrix InvL = fact.L ().transpose ().tinverse(tmp_typ, info, rcond2, true, false); - SparseMatrix InvU = fact.U().tinverse(tmp_typ, info, rcond2, - true, false).transpose(); - ret = fact.Pc().transpose() * InvU * InvL * fact.Pr(); + SparseMatrix InvU = fact.U ().tinverse(tmp_typ, info, rcond2, + true, false).transpose (); + ret = fact.Pc ().transpose () * InvU * InvL * fact.Pr (); } } @@ -1366,13 +1366,13 @@ if (typ == MatrixType::Diagonal || typ == MatrixType::Permuted_Diagonal) { - retval.resize (nc, b.cols(), 0.); + retval.resize (nc, b.cols (), 0.); if (typ == MatrixType::Diagonal) - for (octave_idx_type j = 0; j < b.cols(); j++) + for (octave_idx_type j = 0; j < b.cols (); j++) for (octave_idx_type i = 0; i < nm; i++) retval(i,j) = b(i,j) / data (i); else - for (octave_idx_type j = 0; j < b.cols(); j++) + for (octave_idx_type j = 0; j < b.cols (); j++) for (octave_idx_type k = 0; k < nc; k++) for (octave_idx_type i = cidx(k); i < cidx(k+1); i++) retval(k,j) = b(ridx(i),j) / data (i); @@ -1516,13 +1516,13 @@ if (typ == MatrixType::Diagonal || typ == MatrixType::Permuted_Diagonal) { - retval.resize (nc, b.cols(), 0); + retval.resize (nc, b.cols (), 0); if (typ == MatrixType::Diagonal) - for (octave_idx_type j = 0; j < b.cols(); j++) + for (octave_idx_type j = 0; j < b.cols (); j++) for (octave_idx_type i = 0; i < nm; i++) retval(i,j) = b(i,j) / data (i); else - for (octave_idx_type j = 0; j < b.cols(); j++) + for (octave_idx_type j = 0; j < b.cols (); j++) for (octave_idx_type k = 0; k < nc; k++) for (octave_idx_type i = cidx(k); i < cidx(k+1); i++) retval(k,j) = b(ridx(i),j) / data (i); @@ -1583,7 +1583,7 @@ retval.xcidx(0) = 0; octave_idx_type ii = 0; if (typ == MatrixType::Diagonal) - for (octave_idx_type j = 0; j < b.cols(); j++) + for (octave_idx_type j = 0; j < b.cols (); j++) { for (octave_idx_type i = b.cidx(j); i < b.cidx(j+1); i++) { @@ -1595,7 +1595,7 @@ retval.xcidx(j+1) = ii; } else - for (octave_idx_type j = 0; j < b.cols(); j++) + for (octave_idx_type j = 0; j < b.cols (); j++) { for (octave_idx_type l = 0; l < nc; l++) for (octave_idx_type i = cidx(l); i < cidx(l+1); i++) @@ -3889,12 +3889,12 @@ } } - octave_idx_type b_nc = b.cols(); + octave_idx_type b_nc = b.cols (); retval = b; double *result = retval.fortran_vec (); F77_XFCN (dptsv, DPTSV, (nr, b_nc, D, DL, result, - b.rows(), err)); + b.rows (), err)); if (err != 0) { @@ -3946,12 +3946,12 @@ } } - octave_idx_type b_nc = b.cols(); + octave_idx_type b_nc = b.cols (); retval = b; double *result = retval.fortran_vec (); F77_XFCN (dgtsv, DGTSV, (nr, b_nc, DL, D, DU, result, - b.rows(), err)); + b.rows (), err)); if (err != 0) { @@ -4188,7 +4188,7 @@ } octave_idx_type b_nr = b.rows (); - octave_idx_type b_nc = b.cols(); + octave_idx_type b_nc = b.cols (); rcond = 1.; retval = b; @@ -4245,8 +4245,8 @@ } } - octave_idx_type b_nr = b.rows(); - octave_idx_type b_nc = b.cols(); + octave_idx_type b_nr = b.rows (); + octave_idx_type b_nc = b.cols (); rcond = 1.; retval = b; @@ -4506,7 +4506,7 @@ // Calculate the norm of the matrix, for later use. double anorm; if (calc_cond) - anorm = m_band.abs().sum().row(0).max(); + anorm = m_band.abs ().sum ().row(0).max (); char job = 'L'; F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -4570,7 +4570,7 @@ F77_XFCN (dpbtrs, DPBTRS, (F77_CONST_CHAR_ARG2 (&job, 1), nr, n_lower, b_nc, tmp_data, - ldm, result, b.rows(), err + ldm, result, b.rows (), err F77_CHAR_ARG_LEN (1))); if (err != 0) @@ -4693,7 +4693,7 @@ F77_XFCN (dgbtrs, DGBTRS, (F77_CONST_CHAR_ARG2 (&job, 1), nr, n_lower, n_upper, b_nc, tmp_data, - ldm, pipvt, result, b.rows(), err + ldm, pipvt, result, b.rows (), err F77_CHAR_ARG_LEN (1))); } } @@ -4756,7 +4756,7 @@ // Calculate the norm of the matrix, for later use. double anorm; if (calc_cond) - anorm = m_band.abs().sum().row(0).max(); + anorm = m_band.abs ().sum ().row(0).max (); char job = 'L'; F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -5074,7 +5074,7 @@ // Calculate the norm of the matrix, for later use. double anorm; if (calc_cond) - anorm = m_band.abs().sum().row(0).max(); + anorm = m_band.abs ().sum ().row(0).max (); char job = 'L'; F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -5164,7 +5164,7 @@ F77_XFCN (dpbtrs, DPBTRS, (F77_CONST_CHAR_ARG2 (&job, 1), nr, n_lower, 1, tmp_data, - ldm, Bz, b.rows(), err + ldm, Bz, b.rows (), err F77_CHAR_ARG_LEN (1))); if (err != 0) @@ -5373,7 +5373,7 @@ // Calculate the norm of the matrix, for later use. double anorm; if (calc_cond) - anorm = m_band.abs().sum().row(0).max(); + anorm = m_band.abs ().sum ().row(0).max (); char job = 'L'; F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -5853,9 +5853,9 @@ A->nrow = nr; A->ncol = nc; - A->p = cidx(); - A->i = ridx(); - A->nzmax = nnz(); + A->p = cidx (); + A->i = ridx (); + A->nzmax = nnz (); A->packed = true; A->sorted = true; A->nz = 0; @@ -5871,21 +5871,21 @@ if (nr < 1) A->x = &dummy; else - A->x = data(); + A->x = data (); cholmod_dense Bstore; cholmod_dense *B = &Bstore; - B->nrow = b.rows(); - B->ncol = b.cols(); + B->nrow = b.rows (); + B->ncol = b.cols (); B->d = B->nrow; B->nzmax = B->nrow * B->ncol; B->dtype = CHOLMOD_DOUBLE; B->xtype = CHOLMOD_REAL; - if (nc < 1 || b.cols() < 1) + if (nc < 1 || b.cols () < 1) B->x = &dummy; else // We won't alter it, honest :-) - B->x = const_cast<double *>(b.fortran_vec()); + B->x = const_cast<double *>(b.fortran_vec ()); cholmod_factor *L; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -5930,11 +5930,11 @@ X = CHOLMOD_NAME(solve) (CHOLMOD_A, L, B, cm); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; - retval.resize (b.rows (), b.cols()); - for (octave_idx_type j = 0; j < b.cols(); j++) - { - octave_idx_type jr = j * b.rows(); - for (octave_idx_type i = 0; i < b.rows(); i++) + retval.resize (b.rows (), b.cols ()); + for (octave_idx_type j = 0; j < b.cols (); j++) + { + octave_idx_type jr = j * b.rows (); + for (octave_idx_type i = 0; i < b.rows (); i++) retval.xelem(i,j) = static_cast<double *>(X->x)[jr + i]; } @@ -5965,7 +5965,7 @@ if (err == 0) { const double *Bx = b.fortran_vec (); - retval.resize (b.rows (), b.cols()); + retval.resize (b.rows (), b.cols ()); double *result = retval.fortran_vec (); octave_idx_type b_nr = b.rows (); octave_idx_type b_nc = b.cols (); @@ -6069,9 +6069,9 @@ A->nrow = nr; A->ncol = nc; - A->p = cidx(); - A->i = ridx(); - A->nzmax = nnz(); + A->p = cidx (); + A->i = ridx (); + A->nzmax = nnz (); A->packed = true; A->sorted = true; A->nz = 0; @@ -6087,15 +6087,15 @@ if (nr < 1) A->x = &dummy; else - A->x = data(); + A->x = data (); cholmod_sparse Bstore; cholmod_sparse *B = &Bstore; - B->nrow = b.rows(); - B->ncol = b.cols(); - B->p = b.cidx(); - B->i = b.ridx(); - B->nzmax = b.nnz(); + B->nrow = b.rows (); + B->ncol = b.cols (); + B->p = b.cidx (); + B->i = b.ridx (); + B->nzmax = b.nnz (); B->packed = true; B->sorted = true; B->nz = 0; @@ -6108,10 +6108,10 @@ B->stype = 0; B->xtype = CHOLMOD_REAL; - if (b.rows() < 1 || b.cols() < 1) + if (b.rows () < 1 || b.cols () < 1) B->x = &dummy; else - B->x = b.data(); + B->x = b.data (); cholmod_factor *L; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -6331,9 +6331,9 @@ A->nrow = nr; A->ncol = nc; - A->p = cidx(); - A->i = ridx(); - A->nzmax = nnz(); + A->p = cidx (); + A->i = ridx (); + A->nzmax = nnz (); A->packed = true; A->sorted = true; A->nz = 0; @@ -6349,21 +6349,21 @@ if (nr < 1) A->x = &dummy; else - A->x = data(); + A->x = data (); cholmod_dense Bstore; cholmod_dense *B = &Bstore; - B->nrow = b.rows(); - B->ncol = b.cols(); + B->nrow = b.rows (); + B->ncol = b.cols (); B->d = B->nrow; B->nzmax = B->nrow * B->ncol; B->dtype = CHOLMOD_DOUBLE; B->xtype = CHOLMOD_COMPLEX; - if (nc < 1 || b.cols() < 1) + if (nc < 1 || b.cols () < 1) B->x = &dummy; else // We won't alter it, honest :-) - B->x = const_cast<Complex *>(b.fortran_vec()); + B->x = const_cast<Complex *>(b.fortran_vec ()); cholmod_factor *L; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -6407,11 +6407,11 @@ X = CHOLMOD_NAME(solve) (CHOLMOD_A, L, B, cm); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; - retval.resize (b.rows (), b.cols()); - for (octave_idx_type j = 0; j < b.cols(); j++) - { - octave_idx_type jr = j * b.rows(); - for (octave_idx_type i = 0; i < b.rows(); i++) + retval.resize (b.rows (), b.cols ()); + for (octave_idx_type j = 0; j < b.cols (); j++) + { + octave_idx_type jr = j * b.rows (); + for (octave_idx_type i = 0; i < b.rows (); i++) retval.xelem(i,j) = static_cast<Complex *>(X->x)[jr + i]; } @@ -6565,9 +6565,9 @@ A->nrow = nr; A->ncol = nc; - A->p = cidx(); - A->i = ridx(); - A->nzmax = nnz(); + A->p = cidx (); + A->i = ridx (); + A->nzmax = nnz (); A->packed = true; A->sorted = true; A->nz = 0; @@ -6583,15 +6583,15 @@ if (nr < 1) A->x = &dummy; else - A->x = data(); + A->x = data (); cholmod_sparse Bstore; cholmod_sparse *B = &Bstore; - B->nrow = b.rows(); - B->ncol = b.cols(); - B->p = b.cidx(); - B->i = b.ridx(); - B->nzmax = b.nnz(); + B->nrow = b.rows (); + B->ncol = b.cols (); + B->p = b.cidx (); + B->i = b.ridx (); + B->nzmax = b.nnz (); B->packed = true; B->sorted = true; B->nz = 0; @@ -6604,10 +6604,10 @@ B->stype = 0; B->xtype = CHOLMOD_COMPLEX; - if (b.rows() < 1 || b.cols() < 1) + if (b.rows () < 1 || b.cols () < 1) B->x = &dummy; else - B->x = b.data(); + B->x = b.data (); cholmod_factor *L; BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; @@ -7495,8 +7495,8 @@ SparseMatrix SparseMatrix::prod (int dim) const { - if ((rows() == 1 && dim == -1) || dim == 1) - return transpose (). prod (0). transpose(); + if ((rows () == 1 && dim == -1) || dim == 1) + return transpose (). prod (0). transpose (); else { SPARSE_REDUCTION_OP (SparseMatrix, double, *=, @@ -7765,7 +7765,7 @@ { SparseMatrix r; - if ((a.rows() == b.rows()) && (a.cols() == b.cols())) + if ((a.rows () == b.rows ()) && (a.cols () == b.cols ())) { octave_idx_type a_nr = a.rows (); octave_idx_type a_nc = a.cols (); @@ -7915,7 +7915,7 @@ { SparseMatrix r; - if ((a.rows() == b.rows()) && (a.cols() == b.cols())) + if ((a.rows () == b.rows ()) && (a.cols () == b.cols ())) { octave_idx_type a_nr = a.rows (); octave_idx_type a_nc = a.cols ();