Mercurial > hg > octave-nkf
diff liboctave/eigs-base.cc @ 14846: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 | f5c3de9502b2 |
| children | 3d8ace26c5b4 |
line wrap: on
line diff
--- a/liboctave/eigs-base.cc +++ b/liboctave/eigs-base.cc @@ -226,14 +226,14 @@ static M ltsolve (const SM& L, const ColumnVector& Q, const M& m) { - octave_idx_type n = L.cols(); - octave_idx_type b_nc = m.cols(); + octave_idx_type n = L.cols (); + octave_idx_type b_nc = m.cols (); octave_idx_type err = 0; double rcond; MatrixType ltyp (MatrixType::Lower); M tmp = L.solve (ltyp, m, err, rcond, 0); M retval; - const double* qv = Q.fortran_vec(); + const double* qv = Q.fortran_vec (); if (!err) { @@ -253,14 +253,14 @@ static M utsolve (const SM& U, const ColumnVector& Q, const M& m) { - octave_idx_type n = U.cols(); - octave_idx_type b_nc = m.cols(); + octave_idx_type n = U.cols (); + octave_idx_type b_nc = m.cols (); octave_idx_type err = 0; double rcond; MatrixType utyp (MatrixType::Upper); M retval (n, b_nc); - const double* qv = Q.fortran_vec(); + const double* qv = Q.fortran_vec (); for (octave_idx_type j = 0; j < b_nc; j++) { for (octave_idx_type i = 0; i < n; i++) @@ -347,14 +347,14 @@ { octave_idx_type info; CHOL fact (b, info); - octave_idx_type n = b.cols(); + octave_idx_type n = b.cols (); if (info != 0) return false; else { bt = fact.chol_matrix (); - b = bt.transpose(); + b = bt.transpose (); permB = ColumnVector(n); for (octave_idx_type i = 0; i < n; i++) permB(i) = i; @@ -368,13 +368,13 @@ octave_idx_type info; SparseCHOL fact (b, info, false); - if (fact.P() != 0) + if (fact.P () != 0) return false; else { - b = fact.L(); - bt = b.transpose(); - permB = fact.perm() - 1.0; + b = fact.L (); + bt = b.transpose (); + permB = fact.perm () - 1.0; return true; } } @@ -384,14 +384,14 @@ { octave_idx_type info; ComplexCHOL fact (b, info); - octave_idx_type n = b.cols(); + octave_idx_type n = b.cols (); if (info != 0) return false; else { bt = fact.chol_matrix (); - b = bt.hermitian(); + b = bt.hermitian (); permB = ColumnVector(n); for (octave_idx_type i = 0; i < n; i++) permB(i) = i; @@ -406,13 +406,13 @@ octave_idx_type info; SparseComplexCHOL fact (b, info, false); - if (fact.P() != 0) + if (fact.P () != 0) return false; else { - b = fact.L(); - bt = b.hermitian(); - permB = fact.perm() - 1.0; + b = fact.L (); + bt = b.hermitian (); + permB = fact.perm () - 1.0; return true; } } @@ -424,7 +424,7 @@ octave_idx_type *Q) { bool have_b = ! b.is_empty (); - octave_idx_type n = m.rows(); + octave_idx_type n = m.rows (); // Caclulate LU decomposition of 'A - sigma * B' SparseMatrix AminusSigmaB (m); @@ -433,7 +433,7 @@ { if (cholB) { - if (permB.length()) + if (permB.length ()) { SparseMatrix tmp(n,n,n); for (octave_idx_type i = 0; i < n; i++) @@ -446,11 +446,11 @@ tmp.xcidx(n) = n; AminusSigmaB = AminusSigmaB - sigma * tmp * - b.transpose() * b * tmp.transpose(); + b.transpose () * b * tmp.transpose (); } else AminusSigmaB = AminusSigmaB - sigma * - b.transpose() * b; + b.transpose () * b; } else AminusSigmaB = AminusSigmaB - sigma * b; @@ -522,7 +522,7 @@ octave_idx_type *Q) { bool have_b = ! b.is_empty (); - octave_idx_type n = m.cols(); + octave_idx_type n = m.cols (); // Caclulate LU decomposition of 'A - sigma * B' Matrix AminusSigmaB (m); @@ -531,16 +531,16 @@ { if (cholB) { - Matrix tmp = sigma * b.transpose() * b; - const double *pB = permB.fortran_vec(); - double *p = AminusSigmaB.fortran_vec(); - - if (permB.length()) + Matrix tmp = sigma * b.transpose () * b; + const double *pB = permB.fortran_vec (); + double *p = AminusSigmaB.fortran_vec (); + + if (permB.length ()) { for (octave_idx_type j = 0; - j < b.cols(); j++) + j < b.cols (); j++) for (octave_idx_type i = 0; - i < b.rows(); i++) + i < b.rows (); i++) *p++ -= tmp.xelem (static_cast<octave_idx_type>(pB[i]), static_cast<octave_idx_type>(pB[j])); } @@ -552,7 +552,7 @@ } else { - double *p = AminusSigmaB.fortran_vec(); + double *p = AminusSigmaB.fortran_vec (); for (octave_idx_type i = 0; i < n; i++) p[i*(n+1)] -= sigma; @@ -560,7 +560,7 @@ LU fact (AminusSigmaB); - L = fact.P().transpose() * fact.L (); + L = fact.P ().transpose () * fact.L (); U = fact.U (); for (octave_idx_type j = 0; j < n; j++) P[j] = Q[j] = j; @@ -599,7 +599,7 @@ octave_idx_type *P, octave_idx_type *Q) { bool have_b = ! b.is_empty (); - octave_idx_type n = m.rows(); + octave_idx_type n = m.rows (); // Caclulate LU decomposition of 'A - sigma * B' SparseComplexMatrix AminusSigmaB (m); @@ -608,7 +608,7 @@ { if (cholB) { - if (permB.length()) + if (permB.length ()) { SparseMatrix tmp(n,n,n); for (octave_idx_type i = 0; i < n; i++) @@ -620,11 +620,11 @@ } tmp.xcidx(n) = n; - AminusSigmaB = AminusSigmaB - tmp * b.hermitian() * b * - tmp.transpose() * sigma; + AminusSigmaB = AminusSigmaB - tmp * b.hermitian () * b * + tmp.transpose () * sigma; } else - AminusSigmaB = AminusSigmaB - sigma * b.hermitian() * b; + AminusSigmaB = AminusSigmaB - sigma * b.hermitian () * b; } else AminusSigmaB = AminusSigmaB - sigma * b; @@ -696,7 +696,7 @@ octave_idx_type *Q) { bool have_b = ! b.is_empty (); - octave_idx_type n = m.cols(); + octave_idx_type n = m.cols (); // Caclulate LU decomposition of 'A - sigma * B' ComplexMatrix AminusSigmaB (m); @@ -705,16 +705,16 @@ { if (cholB) { - ComplexMatrix tmp = sigma * b.hermitian() * b; - const double *pB = permB.fortran_vec(); - Complex *p = AminusSigmaB.fortran_vec(); - - if (permB.length()) + ComplexMatrix tmp = sigma * b.hermitian () * b; + const double *pB = permB.fortran_vec (); + Complex *p = AminusSigmaB.fortran_vec (); + + if (permB.length ()) { for (octave_idx_type j = 0; - j < b.cols(); j++) + j < b.cols (); j++) for (octave_idx_type i = 0; - i < b.rows(); i++) + i < b.rows (); i++) *p++ -= tmp.xelem (static_cast<octave_idx_type>(pB[i]), static_cast<octave_idx_type>(pB[j])); } @@ -726,7 +726,7 @@ } else { - Complex *p = AminusSigmaB.fortran_vec(); + Complex *p = AminusSigmaB.fortran_vec (); for (octave_idx_type i = 0; i < n; i++) p[i*(n+1)] -= sigma; @@ -734,7 +734,7 @@ ComplexLU fact (AminusSigmaB); - L = fact.P().transpose() * fact.L (); + L = fact.P ().transpose () * fact.L (); U = fact.U (); for (octave_idx_type j = 0; j < n; j++) P[j] = Q[j] = j; @@ -779,27 +779,27 @@ M b(_b); octave_idx_type n = m.cols (); octave_idx_type mode = 1; - bool have_b = ! b.is_empty(); + bool have_b = ! b.is_empty (); bool note3 = false; char bmat = 'I'; double sigma = 0.; M bt; - if (m.rows() != m.cols()) + if (m.rows () != m.cols ()) { (*current_liboctave_error_handler) ("eigs: A must be square"); return -1; } - if (have_b && (m.rows() != b.rows() || m.rows() != b.cols())) + if (have_b && (m.rows () != b.rows () || m.rows () != b.cols ())) { (*current_liboctave_error_handler) ("eigs: B must be square and the same size as A"); return -1; } - if (resid.is_empty()) + if (resid.is_empty ()) { - std::string rand_dist = octave_rand::distribution(); + std::string rand_dist = octave_rand::distribution (); octave_rand::distribution("uniform"); resid = ColumnVector (octave_rand::vector(n)); octave_rand::distribution(rand_dist); @@ -838,10 +838,10 @@ return -1; } - if (have_b && cholB && permB.length() != 0) + if (have_b && cholB && permB.length () != 0) { // Check the we really have a permutation vector - if (permB.length() != n) + if (permB.length () != n) { (*current_liboctave_error_handler) ("eigs: permB vector invalid"); @@ -888,8 +888,8 @@ if (cholB) { bt = b; - b = b.transpose(); - if (permB.length() == 0) + b = b.transpose (); + if (permB.length () == 0) { permB = ColumnVector(n); for (octave_idx_type i = 0; i < n; i++) @@ -939,7 +939,7 @@ { F77_FUNC (dsaupd, DSAUPD) (ido, F77_CONST_CHAR_ARG2 (&bmat, 1), n, - F77_CONST_CHAR_ARG2 ((typ.c_str()), 2), + F77_CONST_CHAR_ARG2 ((typ.c_str ()), 2), k, tol, presid, p, v, n, iparam, ipntr, workd, workl, lwork, info F77_CHAR_ARG_LEN(1) F77_CHAR_ARG_LEN(2)); @@ -1100,15 +1100,15 @@ M b(_b); octave_idx_type n = m.cols (); octave_idx_type mode = 3; - bool have_b = ! b.is_empty(); + bool have_b = ! b.is_empty (); std::string typ = "LM"; - if (m.rows() != m.cols()) + if (m.rows () != m.cols ()) { (*current_liboctave_error_handler) ("eigs: A must be square"); return -1; } - if (have_b && (m.rows() != b.rows() || m.rows() != b.cols())) + if (have_b && (m.rows () != b.rows () || m.rows () != b.cols ())) { (*current_liboctave_error_handler) ("eigs: B must be square and the same size as A"); @@ -1121,9 +1121,9 @@ // _b, permB, resid, os, tol, rvec, cholB, // disp, maxit); - if (resid.is_empty()) + if (resid.is_empty ()) { - std::string rand_dist = octave_rand::distribution(); + std::string rand_dist = octave_rand::distribution (); octave_rand::distribution("uniform"); resid = ColumnVector (octave_rand::vector(n)); octave_rand::distribution(rand_dist); @@ -1162,10 +1162,10 @@ return -1; } - if (have_b && cholB && permB.length() != 0) + if (have_b && cholB && permB.length () != 0) { // Check the we really have a permutation vector - if (permB.length() != n) + if (permB.length () != n) { (*current_liboctave_error_handler) ("eigs: permB vector invalid"); return -1; @@ -1215,8 +1215,8 @@ int iter = 0; M L, U; - OCTAVE_LOCAL_BUFFER (octave_idx_type, P, (have_b ? b.rows() : m.rows())); - OCTAVE_LOCAL_BUFFER (octave_idx_type, Q, (have_b ? b.cols() : m.cols())); + OCTAVE_LOCAL_BUFFER (octave_idx_type, P, (have_b ? b.rows () : m.rows ())); + OCTAVE_LOCAL_BUFFER (octave_idx_type, Q, (have_b ? b.cols () : m.cols ())); if (! LuAminusSigmaB(m, b, cholB, permB, sigma, L, U, P, Q)) return -1; @@ -1232,7 +1232,7 @@ { F77_FUNC (dsaupd, DSAUPD) (ido, F77_CONST_CHAR_ARG2 (&bmat, 1), n, - F77_CONST_CHAR_ARG2 ((typ.c_str()), 2), + F77_CONST_CHAR_ARG2 ((typ.c_str ()), 2), k, tol, presid, p, v, n, iparam, ipntr, workd, workl, lwork, info F77_CHAR_ARG_LEN(1) F77_CHAR_ARG_LEN(2)); @@ -1430,9 +1430,9 @@ octave_idx_type mode = 1; int err = 0; - if (resid.is_empty()) + if (resid.is_empty ()) { - std::string rand_dist = octave_rand::distribution(); + std::string rand_dist = octave_rand::distribution (); octave_rand::distribution("uniform"); resid = ColumnVector (octave_rand::vector(n)); octave_rand::distribution(rand_dist); @@ -1533,7 +1533,7 @@ { F77_FUNC (dsaupd, DSAUPD) (ido, F77_CONST_CHAR_ARG2 (&bmat, 1), n, - F77_CONST_CHAR_ARG2 ((typ.c_str()), 2), + F77_CONST_CHAR_ARG2 ((typ.c_str ()), 2), k, tol, presid, p, v, n, iparam, ipntr, workd, workl, lwork, info F77_CHAR_ARG_LEN(1) F77_CHAR_ARG_LEN(2)); @@ -1692,28 +1692,28 @@ M b(_b); octave_idx_type n = m.cols (); octave_idx_type mode = 1; - bool have_b = ! b.is_empty(); + bool have_b = ! b.is_empty (); bool note3 = false; char bmat = 'I'; double sigmar = 0.; double sigmai = 0.; M bt; - if (m.rows() != m.cols()) + if (m.rows () != m.cols ()) { (*current_liboctave_error_handler) ("eigs: A must be square"); return -1; } - if (have_b && (m.rows() != b.rows() || m.rows() != b.cols())) + if (have_b && (m.rows () != b.rows () || m.rows () != b.cols ())) { (*current_liboctave_error_handler) ("eigs: B must be square and the same size as A"); return -1; } - if (resid.is_empty()) + if (resid.is_empty ()) { - std::string rand_dist = octave_rand::distribution(); + std::string rand_dist = octave_rand::distribution (); octave_rand::distribution("uniform"); resid = ColumnVector (octave_rand::vector(n)); octave_rand::distribution(rand_dist); @@ -1752,10 +1752,10 @@ return -1; } - if (have_b && cholB && permB.length() != 0) + if (have_b && cholB && permB.length () != 0) { // Check the we really have a permutation vector - if (permB.length() != n) + if (permB.length () != n) { (*current_liboctave_error_handler) ("eigs: permB vector invalid"); @@ -1802,8 +1802,8 @@ if (cholB) { bt = b; - b = b.transpose(); - if (permB.length() == 0) + b = b.transpose (); + if (permB.length () == 0) { permB = ColumnVector(n); for (octave_idx_type i = 0; i < n; i++) @@ -1853,7 +1853,7 @@ { F77_FUNC (dnaupd, DNAUPD) (ido, F77_CONST_CHAR_ARG2 (&bmat, 1), n, - F77_CONST_CHAR_ARG2 ((typ.c_str()), 2), + F77_CONST_CHAR_ARG2 ((typ.c_str ()), 2), k, tol, presid, p, v, n, iparam, ipntr, workd, workl, lwork, info F77_CHAR_ARG_LEN(1) F77_CHAR_ARG_LEN(2)); @@ -2062,16 +2062,16 @@ M b(_b); octave_idx_type n = m.cols (); octave_idx_type mode = 3; - bool have_b = ! b.is_empty(); + bool have_b = ! b.is_empty (); std::string typ = "LM"; double sigmai = 0.; - if (m.rows() != m.cols()) + if (m.rows () != m.cols ()) { (*current_liboctave_error_handler) ("eigs: A must be square"); return -1; } - if (have_b && (m.rows() != b.rows() || m.rows() != b.cols())) + if (have_b && (m.rows () != b.rows () || m.rows () != b.cols ())) { (*current_liboctave_error_handler) ("eigs: B must be square and the same size as A"); @@ -2084,9 +2084,9 @@ // _b, permB, resid, os, tol, rvec, cholB, // disp, maxit); - if (resid.is_empty()) + if (resid.is_empty ()) { - std::string rand_dist = octave_rand::distribution(); + std::string rand_dist = octave_rand::distribution (); octave_rand::distribution("uniform"); resid = ColumnVector (octave_rand::vector(n)); octave_rand::distribution(rand_dist); @@ -2125,10 +2125,10 @@ return -1; } - if (have_b && cholB && permB.length() != 0) + if (have_b && cholB && permB.length () != 0) { // Check that we really have a permutation vector - if (permB.length() != n) + if (permB.length () != n) { (*current_liboctave_error_handler) ("eigs: permB vector invalid"); return -1; @@ -2178,8 +2178,8 @@ int iter = 0; M L, U; - OCTAVE_LOCAL_BUFFER (octave_idx_type, P, (have_b ? b.rows() : m.rows())); - OCTAVE_LOCAL_BUFFER (octave_idx_type, Q, (have_b ? b.cols() : m.cols())); + OCTAVE_LOCAL_BUFFER (octave_idx_type, P, (have_b ? b.rows () : m.rows ())); + OCTAVE_LOCAL_BUFFER (octave_idx_type, Q, (have_b ? b.cols () : m.cols ())); if (! LuAminusSigmaB(m, b, cholB, permB, sigmar, L, U, P, Q)) return -1; @@ -2195,7 +2195,7 @@ { F77_FUNC (dnaupd, DNAUPD) (ido, F77_CONST_CHAR_ARG2 (&bmat, 1), n, - F77_CONST_CHAR_ARG2 ((typ.c_str()), 2), + F77_CONST_CHAR_ARG2 ((typ.c_str ()), 2), k, tol, presid, p, v, n, iparam, ipntr, workd, workl, lwork, info F77_CHAR_ARG_LEN(1) F77_CHAR_ARG_LEN(2)); @@ -2447,9 +2447,9 @@ octave_idx_type mode = 1; int err = 0; - if (resid.is_empty()) + if (resid.is_empty ()) { - std::string rand_dist = octave_rand::distribution(); + std::string rand_dist = octave_rand::distribution (); octave_rand::distribution("uniform"); resid = ColumnVector (octave_rand::vector(n)); octave_rand::distribution(rand_dist); @@ -2551,7 +2551,7 @@ { F77_FUNC (dnaupd, DNAUPD) (ido, F77_CONST_CHAR_ARG2 (&bmat, 1), n, - F77_CONST_CHAR_ARG2 ((typ.c_str()), 2), + F77_CONST_CHAR_ARG2 ((typ.c_str ()), 2), k, tol, presid, p, v, n, iparam, ipntr, workd, workl, lwork, info F77_CHAR_ARG_LEN(1) F77_CHAR_ARG_LEN(2)); @@ -2757,27 +2757,27 @@ M b(_b); octave_idx_type n = m.cols (); octave_idx_type mode = 1; - bool have_b = ! b.is_empty(); + bool have_b = ! b.is_empty (); bool note3 = false; char bmat = 'I'; Complex sigma = 0.; M bt; - if (m.rows() != m.cols()) + if (m.rows () != m.cols ()) { (*current_liboctave_error_handler) ("eigs: A must be square"); return -1; } - if (have_b && (m.rows() != b.rows() || m.rows() != b.cols())) + if (have_b && (m.rows () != b.rows () || m.rows () != b.cols ())) { (*current_liboctave_error_handler) ("eigs: B must be square and the same size as A"); return -1; } - if (cresid.is_empty()) + if (cresid.is_empty ()) { - std::string rand_dist = octave_rand::distribution(); + std::string rand_dist = octave_rand::distribution (); octave_rand::distribution("uniform"); Array<double> rr (octave_rand::vector(n)); Array<double> ri (octave_rand::vector(n)); @@ -2820,10 +2820,10 @@ return -1; } - if (have_b && cholB && permB.length() != 0) + if (have_b && cholB && permB.length () != 0) { // Check the we really have a permutation vector - if (permB.length() != n) + if (permB.length () != n) { (*current_liboctave_error_handler) ("eigs: permB vector invalid"); @@ -2870,8 +2870,8 @@ if (cholB) { bt = b; - b = b.hermitian(); - if (permB.length() == 0) + b = b.hermitian (); + if (permB.length () == 0) { permB = ColumnVector(n); for (octave_idx_type i = 0; i < n; i++) @@ -2922,7 +2922,7 @@ { F77_FUNC (znaupd, ZNAUPD) (ido, F77_CONST_CHAR_ARG2 (&bmat, 1), n, - F77_CONST_CHAR_ARG2 ((typ.c_str()), 2), + F77_CONST_CHAR_ARG2 ((typ.c_str ()), 2), k, tol, presid, p, v, n, iparam, ipntr, workd, workl, lwork, rwork, info F77_CHAR_ARG_LEN(1) F77_CHAR_ARG_LEN(2)); @@ -3079,15 +3079,15 @@ M b(_b); octave_idx_type n = m.cols (); octave_idx_type mode = 3; - bool have_b = ! b.is_empty(); + bool have_b = ! b.is_empty (); std::string typ = "LM"; - if (m.rows() != m.cols()) + if (m.rows () != m.cols ()) { (*current_liboctave_error_handler) ("eigs: A must be square"); return -1; } - if (have_b && (m.rows() != b.rows() || m.rows() != b.cols())) + if (have_b && (m.rows () != b.rows () || m.rows () != b.cols ())) { (*current_liboctave_error_handler) ("eigs: B must be square and the same size as A"); @@ -3100,9 +3100,9 @@ // eig_val, _b, permB, cresid, os, tol, // rvec, cholB, disp, maxit); - if (cresid.is_empty()) + if (cresid.is_empty ()) { - std::string rand_dist = octave_rand::distribution(); + std::string rand_dist = octave_rand::distribution (); octave_rand::distribution("uniform"); Array<double> rr (octave_rand::vector(n)); Array<double> ri (octave_rand::vector(n)); @@ -3145,10 +3145,10 @@ return -1; } - if (have_b && cholB && permB.length() != 0) + if (have_b && cholB && permB.length () != 0) { // Check that we really have a permutation vector - if (permB.length() != n) + if (permB.length () != n) { (*current_liboctave_error_handler) ("eigs: permB vector invalid"); return -1; @@ -3198,8 +3198,8 @@ int iter = 0; M L, U; - OCTAVE_LOCAL_BUFFER (octave_idx_type, P, (have_b ? b.rows() : m.rows())); - OCTAVE_LOCAL_BUFFER (octave_idx_type, Q, (have_b ? b.cols() : m.cols())); + OCTAVE_LOCAL_BUFFER (octave_idx_type, P, (have_b ? b.rows () : m.rows ())); + OCTAVE_LOCAL_BUFFER (octave_idx_type, Q, (have_b ? b.cols () : m.cols ())); if (! LuAminusSigmaB(m, b, cholB, permB, sigma, L, U, P, Q)) return -1; @@ -3216,7 +3216,7 @@ { F77_FUNC (znaupd, ZNAUPD) (ido, F77_CONST_CHAR_ARG2 (&bmat, 1), n, - F77_CONST_CHAR_ARG2 ((typ.c_str()), 2), + F77_CONST_CHAR_ARG2 ((typ.c_str ()), 2), k, tol, presid, p, v, n, iparam, ipntr, workd, workl, lwork, rwork, info F77_CHAR_ARG_LEN(1) F77_CHAR_ARG_LEN(2)); @@ -3417,9 +3417,9 @@ octave_idx_type mode = 1; int err = 0; - if (cresid.is_empty()) + if (cresid.is_empty ()) { - std::string rand_dist = octave_rand::distribution(); + std::string rand_dist = octave_rand::distribution (); octave_rand::distribution("uniform"); Array<double> rr (octave_rand::vector(n)); Array<double> ri (octave_rand::vector(n)); @@ -3525,7 +3525,7 @@ { F77_FUNC (znaupd, ZNAUPD) (ido, F77_CONST_CHAR_ARG2 (&bmat, 1), n, - F77_CONST_CHAR_ARG2 ((typ.c_str()), 2), + F77_CONST_CHAR_ARG2 ((typ.c_str ()), 2), k, tol, presid, p, v, n, iparam, ipntr, workd, workl, lwork, rwork, info F77_CHAR_ARG_LEN(1) F77_CHAR_ARG_LEN(2));