Mercurial > octave
diff liboctave/array/fCMatrix.cc @ 17769:49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
* liboctave/array/Array-C.cc, liboctave/array/Array-b.cc,
liboctave/array/Array-ch.cc, liboctave/array/Array-d.cc,
liboctave/array/Array-f.cc, liboctave/array/Array-fC.cc,
liboctave/array/Array-util.cc, liboctave/array/Array-util.h,
liboctave/array/Array.cc, liboctave/array/Array.h, liboctave/array/Array3.h,
liboctave/array/CColVector.cc, liboctave/array/CColVector.h,
liboctave/array/CDiagMatrix.cc, liboctave/array/CDiagMatrix.h,
liboctave/array/CMatrix.cc, liboctave/array/CMatrix.h,
liboctave/array/CNDArray.cc, liboctave/array/CNDArray.h,
liboctave/array/CRowVector.cc, liboctave/array/CRowVector.h,
liboctave/array/CSparse.cc, liboctave/array/CSparse.h,
liboctave/array/DiagArray2.h, liboctave/array/MArray.cc,
liboctave/array/MArray.h, liboctave/array/MDiagArray2.cc,
liboctave/array/MDiagArray2.h, liboctave/array/MSparse.cc,
liboctave/array/MSparse.h, liboctave/array/MatrixType.cc,
liboctave/array/MatrixType.h, liboctave/array/PermMatrix.h,
liboctave/array/Range.cc, liboctave/array/Range.h, liboctave/array/Sparse.cc,
liboctave/array/Sparse.h, liboctave/array/boolMatrix.cc,
liboctave/array/boolMatrix.h, liboctave/array/boolNDArray.cc,
liboctave/array/boolNDArray.h, liboctave/array/boolSparse.cc,
liboctave/array/boolSparse.h, liboctave/array/chMatrix.cc,
liboctave/array/chMatrix.h, liboctave/array/chNDArray.cc,
liboctave/array/chNDArray.h, liboctave/array/dColVector.h,
liboctave/array/dDiagMatrix.cc, liboctave/array/dDiagMatrix.h,
liboctave/array/dMatrix.cc, liboctave/array/dMatrix.h,
liboctave/array/dNDArray.cc, liboctave/array/dNDArray.h,
liboctave/array/dRowVector.h, liboctave/array/dSparse.cc,
liboctave/array/dSparse.h, liboctave/array/dim-vector.cc,
liboctave/array/dim-vector.h, liboctave/array/fCColVector.cc,
liboctave/array/fCColVector.h, liboctave/array/fCDiagMatrix.cc,
liboctave/array/fCDiagMatrix.h, liboctave/array/fCMatrix.cc,
liboctave/array/fCMatrix.h, liboctave/array/fCNDArray.cc,
liboctave/array/fCNDArray.h, liboctave/array/fCRowVector.cc,
liboctave/array/fCRowVector.h, liboctave/array/fColVector.h,
liboctave/array/fDiagMatrix.cc, liboctave/array/fDiagMatrix.h,
liboctave/array/fMatrix.cc, liboctave/array/fMatrix.h,
liboctave/array/fNDArray.cc, liboctave/array/fNDArray.h,
liboctave/array/fRowVector.h, liboctave/array/idx-vector.cc,
liboctave/array/idx-vector.h, liboctave/array/intNDArray.cc,
liboctave/array/intNDArray.h, liboctave/cruft/misc/blaswrap.c,
liboctave/cruft/misc/quit.cc, liboctave/numeric/CmplxCHOL.cc,
liboctave/numeric/CmplxCHOL.h, liboctave/numeric/CmplxGEPBAL.cc,
liboctave/numeric/CmplxGEPBAL.h, liboctave/numeric/CmplxHESS.h,
liboctave/numeric/CmplxLU.cc, liboctave/numeric/CmplxLU.h,
liboctave/numeric/CmplxQR.cc, liboctave/numeric/CmplxQRP.cc,
liboctave/numeric/CmplxQRP.h, liboctave/numeric/CmplxSCHUR.h,
liboctave/numeric/CmplxSVD.cc, liboctave/numeric/CmplxSVD.h,
liboctave/numeric/CollocWt.h, liboctave/numeric/DAE.h,
liboctave/numeric/DAEFunc.h, liboctave/numeric/DAERT.h,
liboctave/numeric/DAERTFunc.h, liboctave/numeric/DASPK.cc,
liboctave/numeric/DASRT.cc, liboctave/numeric/DASRT.h,
liboctave/numeric/DASSL.cc, liboctave/numeric/DET.h, liboctave/numeric/EIG.cc,
liboctave/numeric/EIG.h, liboctave/numeric/LSODE.cc, liboctave/numeric/ODE.h,
liboctave/numeric/ODEFunc.h, liboctave/numeric/ODES.h,
liboctave/numeric/ODESFunc.h, liboctave/numeric/Quad.cc,
liboctave/numeric/Quad.h, liboctave/numeric/SparseCmplxCHOL.h,
liboctave/numeric/SparseCmplxLU.cc, liboctave/numeric/SparseCmplxLU.h,
liboctave/numeric/SparseCmplxQR.cc, liboctave/numeric/SparseCmplxQR.h,
liboctave/numeric/SparseQR.cc, liboctave/numeric/SparseQR.h,
liboctave/numeric/SparsedbleCHOL.h, liboctave/numeric/SparsedbleLU.cc,
liboctave/numeric/SparsedbleLU.h, liboctave/numeric/base-aepbal.h,
liboctave/numeric/base-dae.h, liboctave/numeric/base-de.h,
liboctave/numeric/base-lu.cc, liboctave/numeric/base-lu.h,
liboctave/numeric/base-min.h, liboctave/numeric/base-qr.h,
liboctave/numeric/bsxfun.h, liboctave/numeric/dbleCHOL.cc,
liboctave/numeric/dbleCHOL.h, liboctave/numeric/dbleGEPBAL.h,
liboctave/numeric/dbleHESS.h, liboctave/numeric/dbleLU.cc,
liboctave/numeric/dbleLU.h, liboctave/numeric/dbleQR.cc,
liboctave/numeric/dbleQRP.cc, liboctave/numeric/dbleQRP.h,
liboctave/numeric/dbleSCHUR.cc, liboctave/numeric/dbleSCHUR.h,
liboctave/numeric/dbleSVD.cc, liboctave/numeric/dbleSVD.h,
liboctave/numeric/eigs-base.cc, liboctave/numeric/fCmplxAEPBAL.cc,
liboctave/numeric/fCmplxAEPBAL.h, liboctave/numeric/fCmplxCHOL.cc,
liboctave/numeric/fCmplxCHOL.h, liboctave/numeric/fCmplxGEPBAL.cc,
liboctave/numeric/fCmplxGEPBAL.h, liboctave/numeric/fCmplxHESS.h,
liboctave/numeric/fCmplxLU.cc, liboctave/numeric/fCmplxLU.h,
liboctave/numeric/fCmplxQR.cc, liboctave/numeric/fCmplxQR.h,
liboctave/numeric/fCmplxQRP.cc, liboctave/numeric/fCmplxQRP.h,
liboctave/numeric/fCmplxSCHUR.cc, liboctave/numeric/fCmplxSCHUR.h,
liboctave/numeric/fCmplxSVD.h, liboctave/numeric/fEIG.cc,
liboctave/numeric/fEIG.h, liboctave/numeric/floatCHOL.cc,
liboctave/numeric/floatCHOL.h, liboctave/numeric/floatGEPBAL.cc,
liboctave/numeric/floatGEPBAL.h, liboctave/numeric/floatHESS.h,
liboctave/numeric/floatLU.cc, liboctave/numeric/floatLU.h,
liboctave/numeric/floatQR.cc, liboctave/numeric/floatQRP.cc,
liboctave/numeric/floatQRP.h, liboctave/numeric/floatSCHUR.cc,
liboctave/numeric/floatSCHUR.h, liboctave/numeric/floatSVD.cc,
liboctave/numeric/floatSVD.h, liboctave/numeric/lo-mappers.cc,
liboctave/numeric/lo-mappers.h, liboctave/numeric/lo-specfun.cc,
liboctave/numeric/lo-specfun.h, liboctave/numeric/oct-convn.cc,
liboctave/numeric/oct-fftw.cc, liboctave/numeric/oct-fftw.h,
liboctave/numeric/oct-norm.cc, liboctave/numeric/oct-rand.cc,
liboctave/numeric/oct-rand.h, liboctave/numeric/randgamma.c,
liboctave/numeric/randgamma.h, liboctave/numeric/randmtzig.c,
liboctave/numeric/randpoisson.c, liboctave/numeric/randpoisson.h,
liboctave/numeric/sparse-base-chol.h, liboctave/numeric/sparse-base-lu.h,
liboctave/numeric/sparse-dmsolve.cc, liboctave/operators/Sparse-diag-op-defs.h,
liboctave/operators/Sparse-op-defs.h, liboctave/operators/mx-inlines.cc,
liboctave/system/dir-ops.h, liboctave/system/file-ops.cc,
liboctave/system/file-stat.cc, liboctave/system/file-stat.h,
liboctave/system/lo-sysdep.cc, liboctave/system/lo-sysdep.h,
liboctave/system/mach-info.cc, liboctave/system/mach-info.h,
liboctave/system/oct-env.cc, liboctave/system/oct-group.cc,
liboctave/system/oct-syscalls.cc, liboctave/system/oct-syscalls.h,
liboctave/system/oct-time.h, liboctave/system/tempname.c,
liboctave/util/action-container.h, liboctave/util/base-list.h,
liboctave/util/cmd-edit.cc, liboctave/util/cmd-edit.h,
liboctave/util/cmd-hist.cc, liboctave/util/cmd-hist.h,
liboctave/util/data-conv.cc, liboctave/util/data-conv.h,
liboctave/util/kpse.cc, liboctave/util/lo-array-gripes.cc,
liboctave/util/lo-cieee.c, liboctave/util/lo-regexp.cc,
liboctave/util/lo-utils.cc, liboctave/util/oct-alloc.cc,
liboctave/util/oct-base64.cc, liboctave/util/oct-binmap.h,
liboctave/util/oct-cmplx.h, liboctave/util/oct-glob.cc,
liboctave/util/oct-inttypes.cc, liboctave/util/oct-inttypes.h,
liboctave/util/oct-locbuf.cc, liboctave/util/oct-locbuf.h,
liboctave/util/oct-mem.h, liboctave/util/oct-mutex.cc,
liboctave/util/oct-refcount.h, liboctave/util/oct-shlib.cc,
liboctave/util/oct-shlib.h, liboctave/util/oct-sort.cc,
liboctave/util/oct-sort.h, liboctave/util/pathsearch.cc,
liboctave/util/pathsearch.h, liboctave/util/sparse-util.cc,
liboctave/util/str-vec.cc, liboctave/util/str-vec.h,
liboctave/util/unwind-prot.h, liboctave/util/url-transfer.cc,
liboctave/util/url-transfer.h: Use GNU style coding conventions.
| author | Rik <rik@octave.org> |
|---|---|
| date | Sat, 26 Oct 2013 18:57:05 -0700 |
| parents | d63878346099 |
| children | 938f01339043 0fa235a252a5 |
line wrap: on
line diff
--- a/liboctave/array/fCMatrix.cc Sat Oct 26 23:20:30 2013 +0200 +++ b/liboctave/array/fCMatrix.cc Sat Oct 26 18:57:05 2013 -0700 @@ -258,7 +258,8 @@ F77_CHAR_ARG_LEN_DECL); } -static const FloatComplex FloatComplex_NaN_result (octave_Float_NaN, octave_Float_NaN); +static const FloatComplex FloatComplex_NaN_result (octave_Float_NaN, + octave_Float_NaN); // FloatComplex Matrix class @@ -301,7 +302,7 @@ elem (i, i) = a.elem (i, i); } -// FIXME -- could we use a templated mixed-type copy function +// FIXME: could we use a templated mixed-type copy function // here? FloatComplexMatrix::FloatComplexMatrix (const boolMatrix& a) @@ -366,7 +367,8 @@ // destructive insert/delete/reorder operations FloatComplexMatrix& -FloatComplexMatrix::insert (const FloatMatrix& a, octave_idx_type r, octave_idx_type c) +FloatComplexMatrix::insert (const FloatMatrix& a, + octave_idx_type r, octave_idx_type c) { octave_idx_type a_nr = a.rows (); octave_idx_type a_nc = a.cols (); @@ -390,7 +392,8 @@ } FloatComplexMatrix& -FloatComplexMatrix::insert (const FloatRowVector& a, octave_idx_type r, octave_idx_type c) +FloatComplexMatrix::insert (const FloatRowVector& a, + octave_idx_type r, octave_idx_type c) { octave_idx_type a_len = a.length (); @@ -412,7 +415,8 @@ } FloatComplexMatrix& -FloatComplexMatrix::insert (const FloatColumnVector& a, octave_idx_type r, octave_idx_type c) +FloatComplexMatrix::insert (const FloatColumnVector& a, + octave_idx_type r, octave_idx_type c) { octave_idx_type a_len = a.length (); @@ -434,7 +438,8 @@ } FloatComplexMatrix& -FloatComplexMatrix::insert (const FloatDiagMatrix& a, octave_idx_type r, octave_idx_type c) +FloatComplexMatrix::insert (const FloatDiagMatrix& a, + octave_idx_type r, octave_idx_type c) { octave_idx_type a_nr = a.rows (); octave_idx_type a_nc = a.cols (); @@ -461,14 +466,16 @@ } FloatComplexMatrix& -FloatComplexMatrix::insert (const FloatComplexMatrix& a, octave_idx_type r, octave_idx_type c) +FloatComplexMatrix::insert (const FloatComplexMatrix& a, + octave_idx_type r, octave_idx_type c) { Array<FloatComplex>::insert (a, r, c); return *this; } FloatComplexMatrix& -FloatComplexMatrix::insert (const FloatComplexRowVector& a, octave_idx_type r, octave_idx_type c) +FloatComplexMatrix::insert (const FloatComplexRowVector& a, + octave_idx_type r, octave_idx_type c) { octave_idx_type a_len = a.length (); if (r < 0 || r >= rows () || c < 0 || c + a_len > cols ()) @@ -484,7 +491,8 @@ } FloatComplexMatrix& -FloatComplexMatrix::insert (const FloatComplexColumnVector& a, octave_idx_type r, octave_idx_type c) +FloatComplexMatrix::insert (const FloatComplexColumnVector& a, + octave_idx_type r, octave_idx_type c) { octave_idx_type a_len = a.length (); @@ -506,7 +514,8 @@ } FloatComplexMatrix& -FloatComplexMatrix::insert (const FloatComplexDiagMatrix& a, octave_idx_type r, octave_idx_type c) +FloatComplexMatrix::insert (const FloatComplexDiagMatrix& a, + octave_idx_type r, octave_idx_type c) { octave_idx_type a_nr = a.rows (); octave_idx_type a_nc = a.cols (); @@ -569,7 +578,8 @@ } FloatComplexMatrix& -FloatComplexMatrix::fill (float val, octave_idx_type r1, octave_idx_type c1, octave_idx_type r2, octave_idx_type c2) +FloatComplexMatrix::fill (float val, octave_idx_type r1, octave_idx_type c1, + octave_idx_type r2, octave_idx_type c2) { octave_idx_type nr = rows (); octave_idx_type nc = cols (); @@ -597,7 +607,9 @@ } FloatComplexMatrix& -FloatComplexMatrix::fill (const FloatComplex& val, octave_idx_type r1, octave_idx_type c1, octave_idx_type r2, octave_idx_type c2) +FloatComplexMatrix::fill (const FloatComplex& val, + octave_idx_type r1, octave_idx_type c1, + octave_idx_type r2, octave_idx_type c2) { octave_idx_type nr = rows (); octave_idx_type nc = cols (); @@ -929,7 +941,8 @@ // resize is the destructive equivalent for this one FloatComplexMatrix -FloatComplexMatrix::extract (octave_idx_type r1, octave_idx_type c1, octave_idx_type r2, octave_idx_type c2) const +FloatComplexMatrix::extract (octave_idx_type r1, octave_idx_type c1, + octave_idx_type r2, octave_idx_type c2) const { if (r1 > r2) { std::swap (r1, r2); } if (c1 > c2) { std::swap (c1, c2); } @@ -938,7 +951,8 @@ } FloatComplexMatrix -FloatComplexMatrix::extract_n (octave_idx_type r1, octave_idx_type c1, octave_idx_type nr, octave_idx_type nc) const +FloatComplexMatrix::extract_n (octave_idx_type r1, octave_idx_type c1, + octave_idx_type nr, octave_idx_type nc) const { return index (idx_vector (r1, r1 + nr), idx_vector (c1, c1 + nc)); } @@ -976,7 +990,7 @@ FloatComplexMatrix FloatComplexMatrix::inverse (octave_idx_type& info, float& rcon, int force, - int calc_cond) const + int calc_cond) const { MatrixType mattype (*this); return inverse (mattype, info, rcon, force, calc_cond); @@ -999,7 +1013,7 @@ FloatComplexMatrix FloatComplexMatrix::tinverse (MatrixType &mattype, octave_idx_type& info, - float& rcon, int force, int calc_cond) const + float& rcon, int force, int calc_cond) const { FloatComplexMatrix retval; @@ -1056,7 +1070,7 @@ FloatComplexMatrix FloatComplexMatrix::finverse (MatrixType &mattype, octave_idx_type& info, - float& rcon, int force, int calc_cond) const + float& rcon, int force, int calc_cond) const { FloatComplexMatrix retval; @@ -1091,7 +1105,8 @@ // Calculate the norm of the matrix, for later use. float anorm; if (calc_cond) - anorm = retval.abs ().sum ().row (static_cast<octave_idx_type>(0)).max (); + anorm = retval.abs ().sum ().row (static_cast<octave_idx_type>(0)) + .max (); F77_XFCN (cgetrf, CGETRF, (nc, nc, tmp_data, nr, pipvt, info)); @@ -1137,7 +1152,7 @@ FloatComplexMatrix FloatComplexMatrix::inverse (MatrixType &mattype, octave_idx_type& info, - float& rcon, int force, int calc_cond) const + float& rcon, int force, int calc_cond) const { int typ = mattype.type (false); FloatComplexMatrix ret; @@ -1168,7 +1183,8 @@ ret = finverse (mattype, info, rcon, force, calc_cond); if ((mattype.is_hermitian () || calc_cond) && rcon == 0.) - ret = FloatComplexMatrix (rows (), columns (), FloatComplex (octave_Float_Inf, 0.)); + ret = FloatComplexMatrix (rows (), columns (), + FloatComplex (octave_Float_Inf, 0.)); } return ret; @@ -1311,10 +1327,12 @@ F77_FUNC (cffti, CFFTI) (const octave_idx_type&, FloatComplex*); F77_RET_T - F77_FUNC (cfftf, CFFTF) (const octave_idx_type&, FloatComplex*, FloatComplex*); + F77_FUNC (cfftf, CFFTF) (const octave_idx_type&, FloatComplex*, + FloatComplex*); F77_RET_T - F77_FUNC (cfftb, CFFTB) (const octave_idx_type&, FloatComplex*, FloatComplex*); + F77_FUNC (cfftb, CFFTB) (const octave_idx_type&, FloatComplex*, + FloatComplex*); } FloatComplexMatrix @@ -1555,7 +1573,8 @@ } FloatComplexDET -FloatComplexMatrix::determinant (octave_idx_type& info, float& rcon, int calc_cond) const +FloatComplexMatrix::determinant (octave_idx_type& info, float& rcon, + int calc_cond) const { MatrixType mattype (*this); return determinant (mattype, info, rcon, calc_cond); @@ -1563,7 +1582,8 @@ FloatComplexDET FloatComplexMatrix::determinant (MatrixType& mattype, - octave_idx_type& info, float& rcon, int calc_cond) const + octave_idx_type& info, float& rcon, + int calc_cond) const { FloatComplexDET retval (1.0); @@ -1792,7 +1812,7 @@ FloatComplex *tmp_data = atmp.fortran_vec (); anorm = atmp.abs().sum(). - row(static_cast<octave_idx_type>(0)).max(); + row(static_cast<octave_idx_type>(0)).max(); F77_XFCN (cpotrf, CPOTRF, (F77_CONST_CHAR_ARG2 (&job, 1), nr, tmp_data, nr, info @@ -1835,7 +1855,7 @@ if (anorm < 0.) anorm = atmp.abs ().sum (). - row(static_cast<octave_idx_type>(0)).max (); + row(static_cast<octave_idx_type>(0)).max (); Array<FloatComplex> z (dim_vector (2 * nc, 1)); FloatComplex *pz = z.fortran_vec (); @@ -1871,9 +1891,9 @@ FloatComplexMatrix FloatComplexMatrix::utsolve (MatrixType &mattype, const FloatComplexMatrix& b, - octave_idx_type& info, float& rcon, - solve_singularity_handler sing_handler, - bool calc_cond, blas_trans_type transt) const + octave_idx_type& info, float& rcon, + solve_singularity_handler sing_handler, + bool calc_cond, blas_trans_type transt) const { FloatComplexMatrix retval; @@ -1972,9 +1992,9 @@ FloatComplexMatrix FloatComplexMatrix::ltsolve (MatrixType &mattype, const FloatComplexMatrix& b, - octave_idx_type& info, float& rcon, - solve_singularity_handler sing_handler, - bool calc_cond, blas_trans_type transt) const + octave_idx_type& info, float& rcon, + solve_singularity_handler sing_handler, + bool calc_cond, blas_trans_type transt) const { FloatComplexMatrix retval; @@ -2073,9 +2093,9 @@ FloatComplexMatrix FloatComplexMatrix::fsolve (MatrixType &mattype, const FloatComplexMatrix& b, - octave_idx_type& info, float& rcon, - solve_singularity_handler sing_handler, - bool calc_cond) const + octave_idx_type& info, float& rcon, + solve_singularity_handler sing_handler, + bool calc_cond) const { FloatComplexMatrix retval; @@ -2092,7 +2112,7 @@ { volatile int typ = mattype.type (); - // Calculate the norm of the matrix, for later use. + // Calculate the norm of the matrix, for later use. float anorm = -1.; if (typ == MatrixType::Hermitian) @@ -2187,7 +2207,8 @@ // Calculate the norm of the matrix, for later use. if (anorm < 0.) - anorm = atmp.abs ().sum ().row (static_cast<octave_idx_type>(0)).max (); + anorm = atmp.abs ().sum ().row (static_cast<octave_idx_type>(0)) + .max (); F77_XFCN (cgetrf, CGETRF, (nr, nr, tmp_data, nr, pipvt, info)); @@ -2267,23 +2288,25 @@ FloatComplexMatrix FloatComplexMatrix::solve (MatrixType &typ, const FloatMatrix& b, - octave_idx_type& info) const + octave_idx_type& info) const { float rcon; return solve (typ, b, info, rcon, 0); } FloatComplexMatrix -FloatComplexMatrix::solve (MatrixType &typ, const FloatMatrix& b, octave_idx_type& info, - float& rcon) const +FloatComplexMatrix::solve (MatrixType &typ, const FloatMatrix& b, + octave_idx_type& info, + float& rcon) const { return solve (typ, b, info, rcon, 0); } FloatComplexMatrix -FloatComplexMatrix::solve (MatrixType &typ, const FloatMatrix& b, octave_idx_type& info, - float& rcon, solve_singularity_handler sing_handler, - bool singular_fallback, blas_trans_type transt) const +FloatComplexMatrix::solve (MatrixType &typ, const FloatMatrix& b, + octave_idx_type& info, + float& rcon, solve_singularity_handler sing_handler, + bool singular_fallback, blas_trans_type transt) const { FloatComplexMatrix tmp (b); return solve (typ, tmp, info, rcon, sing_handler, singular_fallback, transt); @@ -2299,7 +2322,7 @@ FloatComplexMatrix FloatComplexMatrix::solve (MatrixType &typ, const FloatComplexMatrix& b, - octave_idx_type& info) const + octave_idx_type& info) const { float rcon; return solve (typ, b, info, rcon, 0); @@ -2307,16 +2330,16 @@ FloatComplexMatrix FloatComplexMatrix::solve (MatrixType &typ, const FloatComplexMatrix& b, - octave_idx_type& info, float& rcon) const + octave_idx_type& info, float& rcon) const { return solve (typ, b, info, rcon, 0); } FloatComplexMatrix FloatComplexMatrix::solve (MatrixType &mattype, const FloatComplexMatrix& b, - octave_idx_type& info, float& rcon, - solve_singularity_handler sing_handler, - bool singular_fallback, blas_trans_type transt) const + octave_idx_type& info, float& rcon, + solve_singularity_handler sing_handler, + bool singular_fallback, blas_trans_type transt) const { FloatComplexMatrix retval; int typ = mattype.type (); @@ -2330,9 +2353,11 @@ else if (typ == MatrixType::Lower || typ == MatrixType::Permuted_Lower) retval = ltsolve (mattype, b, info, rcon, sing_handler, false, transt); else if (transt == blas_trans) - return transpose ().solve (mattype, b, info, rcon, sing_handler, singular_fallback); + return transpose ().solve (mattype, b, info, rcon, sing_handler, + singular_fallback); else if (transt == blas_conj_trans) - retval = hermitian ().solve (mattype, b, info, rcon, sing_handler, singular_fallback); + retval = hermitian ().solve (mattype, b, info, rcon, sing_handler, + singular_fallback); else if (typ == MatrixType::Full || typ == MatrixType::Hermitian) retval = fsolve (mattype, b, info, rcon, sing_handler, true); else if (typ != MatrixType::Rectangular) @@ -2361,7 +2386,7 @@ FloatComplexColumnVector FloatComplexMatrix::solve (MatrixType &typ, const FloatColumnVector& b, - octave_idx_type& info) const + octave_idx_type& info) const { float rcon; return solve (typ, FloatComplexColumnVector (b), info, rcon, 0); @@ -2369,21 +2394,24 @@ FloatComplexColumnVector FloatComplexMatrix::solve (MatrixType &typ, const FloatColumnVector& b, - octave_idx_type& info, float& rcon) const + octave_idx_type& info, float& rcon) const { return solve (typ, FloatComplexColumnVector (b), info, rcon, 0); } FloatComplexColumnVector FloatComplexMatrix::solve (MatrixType &typ, const FloatColumnVector& b, - octave_idx_type& info, float& rcon, - solve_singularity_handler sing_handler, blas_trans_type transt) const + octave_idx_type& info, float& rcon, + solve_singularity_handler sing_handler, + blas_trans_type transt) const { - return solve (typ, FloatComplexColumnVector (b), info, rcon, sing_handler, transt); + return solve (typ, FloatComplexColumnVector (b), info, rcon, sing_handler, + transt); } FloatComplexColumnVector -FloatComplexMatrix::solve (MatrixType &typ, const FloatComplexColumnVector& b) const +FloatComplexMatrix::solve (MatrixType &typ, + const FloatComplexColumnVector& b) const { octave_idx_type info; float rcon; @@ -2392,7 +2420,7 @@ FloatComplexColumnVector FloatComplexMatrix::solve (MatrixType &typ, const FloatComplexColumnVector& b, - octave_idx_type& info) const + octave_idx_type& info) const { float rcon; return solve (typ, b, info, rcon, 0); @@ -2400,15 +2428,16 @@ FloatComplexColumnVector FloatComplexMatrix::solve (MatrixType &typ, const FloatComplexColumnVector& b, - octave_idx_type& info, float& rcon) const + octave_idx_type& info, float& rcon) const { return solve (typ, b, info, rcon, 0); } FloatComplexColumnVector FloatComplexMatrix::solve (MatrixType &typ, const FloatComplexColumnVector& b, - octave_idx_type& info, float& rcon, - solve_singularity_handler sing_handler, blas_trans_type transt) const + octave_idx_type& info, float& rcon, + solve_singularity_handler sing_handler, + blas_trans_type transt) const { FloatComplexMatrix tmp (b); @@ -2432,14 +2461,17 @@ } FloatComplexMatrix -FloatComplexMatrix::solve (const FloatMatrix& b, octave_idx_type& info, float& rcon) const +FloatComplexMatrix::solve (const FloatMatrix& b, octave_idx_type& info, + float& rcon) const { return solve (b, info, rcon, 0); } FloatComplexMatrix -FloatComplexMatrix::solve (const FloatMatrix& b, octave_idx_type& info, float& rcon, - solve_singularity_handler sing_handler, blas_trans_type transt) const +FloatComplexMatrix::solve (const FloatMatrix& b, octave_idx_type& info, + float& rcon, + solve_singularity_handler sing_handler, + blas_trans_type transt) const { FloatComplexMatrix tmp (b); return solve (tmp, info, rcon, sing_handler, transt); @@ -2454,21 +2486,25 @@ } FloatComplexMatrix -FloatComplexMatrix::solve (const FloatComplexMatrix& b, octave_idx_type& info) const +FloatComplexMatrix::solve (const FloatComplexMatrix& b, + octave_idx_type& info) const { float rcon; return solve (b, info, rcon, 0); } FloatComplexMatrix -FloatComplexMatrix::solve (const FloatComplexMatrix& b, octave_idx_type& info, float& rcon) const +FloatComplexMatrix::solve (const FloatComplexMatrix& b, octave_idx_type& info, + float& rcon) const { return solve (b, info, rcon, 0); } FloatComplexMatrix -FloatComplexMatrix::solve (const FloatComplexMatrix& b, octave_idx_type& info, float& rcon, - solve_singularity_handler sing_handler, blas_trans_type transt) const +FloatComplexMatrix::solve (const FloatComplexMatrix& b, octave_idx_type& info, + float& rcon, + solve_singularity_handler sing_handler, + blas_trans_type transt) const { MatrixType mattype (*this); return solve (mattype, b, info, rcon, sing_handler, true, transt); @@ -2483,7 +2519,8 @@ } FloatComplexColumnVector -FloatComplexMatrix::solve (const FloatColumnVector& b, octave_idx_type& info) const +FloatComplexMatrix::solve (const FloatColumnVector& b, + octave_idx_type& info) const { float rcon; return solve (FloatComplexColumnVector (b), info, rcon, 0); @@ -2491,15 +2528,16 @@ FloatComplexColumnVector FloatComplexMatrix::solve (const FloatColumnVector& b, octave_idx_type& info, - float& rcon) const + float& rcon) const { return solve (FloatComplexColumnVector (b), info, rcon, 0); } FloatComplexColumnVector FloatComplexMatrix::solve (const FloatColumnVector& b, octave_idx_type& info, - float& rcon, - solve_singularity_handler sing_handler, blas_trans_type transt) const + float& rcon, + solve_singularity_handler sing_handler, + blas_trans_type transt) const { return solve (FloatComplexColumnVector (b), info, rcon, sing_handler, transt); } @@ -2513,23 +2551,27 @@ } FloatComplexColumnVector -FloatComplexMatrix::solve (const FloatComplexColumnVector& b, octave_idx_type& info) const +FloatComplexMatrix::solve (const FloatComplexColumnVector& b, + octave_idx_type& info) const { float rcon; return solve (b, info, rcon, 0); } FloatComplexColumnVector -FloatComplexMatrix::solve (const FloatComplexColumnVector& b, octave_idx_type& info, - float& rcon) const +FloatComplexMatrix::solve (const FloatComplexColumnVector& b, + octave_idx_type& info, + float& rcon) const { return solve (b, info, rcon, 0); } FloatComplexColumnVector -FloatComplexMatrix::solve (const FloatComplexColumnVector& b, octave_idx_type& info, - float& rcon, - solve_singularity_handler sing_handler, blas_trans_type transt) const +FloatComplexMatrix::solve (const FloatComplexColumnVector& b, + octave_idx_type& info, + float& rcon, + solve_singularity_handler sing_handler, + blas_trans_type transt) const { MatrixType mattype (*this); return solve (mattype, b, info, rcon, sing_handler, transt); @@ -2554,7 +2596,7 @@ FloatComplexMatrix FloatComplexMatrix::lssolve (const FloatMatrix& b, octave_idx_type& info, - octave_idx_type& rank) const + octave_idx_type& rank) const { float rcon; return lssolve (FloatComplexMatrix (b), info, rank, rcon); @@ -2562,7 +2604,7 @@ FloatComplexMatrix FloatComplexMatrix::lssolve (const FloatMatrix& b, octave_idx_type& info, - octave_idx_type& rank, float& rcon) const + octave_idx_type& rank, float& rcon) const { return lssolve (FloatComplexMatrix (b), info, rank, rcon); } @@ -2577,7 +2619,8 @@ } FloatComplexMatrix -FloatComplexMatrix::lssolve (const FloatComplexMatrix& b, octave_idx_type& info) const +FloatComplexMatrix::lssolve (const FloatComplexMatrix& b, + octave_idx_type& info) const { octave_idx_type rank; float rcon; @@ -2586,7 +2629,7 @@ FloatComplexMatrix FloatComplexMatrix::lssolve (const FloatComplexMatrix& b, octave_idx_type& info, - octave_idx_type& rank) const + octave_idx_type& rank) const { float rcon; return lssolve (b, info, rank, rcon); @@ -2594,7 +2637,7 @@ FloatComplexMatrix FloatComplexMatrix::lssolve (const FloatComplexMatrix& b, octave_idx_type& info, - octave_idx_type& rank, float& rcon) const + octave_idx_type& rank, float& rcon) const { FloatComplexMatrix retval; @@ -2666,8 +2709,9 @@ nlvl = 0; octave_idx_type lrwork = minmn*(10 + 2*smlsiz + 8*nlvl) - + 3*smlsiz*nrhs + std::max ((smlsiz+1)*(smlsiz+1), - n*(1+nrhs) + 2*nrhs); + + 3*smlsiz*nrhs + + std::max ((smlsiz+1)*(smlsiz+1), + n*(1+nrhs) + 2*nrhs); if (lrwork < 1) lrwork = 1; Array<float> rwork (dim_vector (lrwork, 1)); @@ -2742,7 +2786,8 @@ } FloatComplexColumnVector -FloatComplexMatrix::lssolve (const FloatColumnVector& b, octave_idx_type& info) const +FloatComplexMatrix::lssolve (const FloatColumnVector& b, + octave_idx_type& info) const { octave_idx_type rank; float rcon; @@ -2751,7 +2796,7 @@ FloatComplexColumnVector FloatComplexMatrix::lssolve (const FloatColumnVector& b, octave_idx_type& info, - octave_idx_type& rank) const + octave_idx_type& rank) const { float rcon; return lssolve (FloatComplexColumnVector (b), info, rank, rcon); @@ -2759,7 +2804,7 @@ FloatComplexColumnVector FloatComplexMatrix::lssolve (const FloatColumnVector& b, octave_idx_type& info, - octave_idx_type& rank, float& rcon) const + octave_idx_type& rank, float& rcon) const { return lssolve (FloatComplexColumnVector (b), info, rank, rcon); } @@ -2774,7 +2819,8 @@ } FloatComplexColumnVector -FloatComplexMatrix::lssolve (const FloatComplexColumnVector& b, octave_idx_type& info) const +FloatComplexMatrix::lssolve (const FloatComplexColumnVector& b, + octave_idx_type& info) const { octave_idx_type rank; float rcon; @@ -2782,8 +2828,9 @@ } FloatComplexColumnVector -FloatComplexMatrix::lssolve (const FloatComplexColumnVector& b, octave_idx_type& info, - octave_idx_type& rank) const +FloatComplexMatrix::lssolve (const FloatComplexColumnVector& b, + octave_idx_type& info, + octave_idx_type& rank) const { float rcon; return lssolve (b, info, rank, rcon); @@ -2791,8 +2838,9 @@ } FloatComplexColumnVector -FloatComplexMatrix::lssolve (const FloatComplexColumnVector& b, octave_idx_type& info, - octave_idx_type& rank, float& rcon) const +FloatComplexMatrix::lssolve (const FloatComplexColumnVector& b, + octave_idx_type& info, + octave_idx_type& rank, float& rcon) const { FloatComplexColumnVector retval; @@ -2856,7 +2904,7 @@ nlvl = 0; octave_idx_type lrwork = minmn*(10 + 2*smlsiz + 8*nlvl) - + 3*smlsiz*nrhs + (smlsiz+1)*(smlsiz+1); + + 3*smlsiz*nrhs + (smlsiz+1)*(smlsiz+1); if (lrwork < 1) lrwork = 1; Array<float> rwork (dim_vector (lrwork, 1)); @@ -3043,7 +3091,7 @@ if (nr == 0 || nc == 0) return *this; - FloatComplex *d = fortran_vec (); // Ensures only one reference to my privates! + FloatComplex *d = fortran_vec (); // Ensures only 1 reference to my privates! mx_inline_add2 (length (), d, a.data ()); return *this; @@ -3067,7 +3115,7 @@ if (nr == 0 || nc == 0) return *this; - FloatComplex *d = fortran_vec (); // Ensures only one reference to my privates! + FloatComplex *d = fortran_vec (); // Ensures only 1 reference to my privates! mx_inline_sub2 (length (), d, a.data ()); return *this; @@ -3168,7 +3216,7 @@ return false; } -// FIXME Do these really belong here? Maybe they should be +// FIXME: Do these really belong here? Maybe they should be // in a base class? boolMatrix @@ -3186,13 +3234,15 @@ FloatComplexMatrix FloatComplexMatrix::cumprod (int dim) const { - return do_mx_cum_op<FloatComplex, FloatComplex> (*this, dim, mx_inline_cumprod); + return do_mx_cum_op<FloatComplex, FloatComplex> (*this, dim, + mx_inline_cumprod); } FloatComplexMatrix FloatComplexMatrix::cumsum (int dim) const { - return do_mx_cum_op<FloatComplex, FloatComplex> (*this, dim, mx_inline_cumsum); + return do_mx_cum_op<FloatComplex, FloatComplex> (*this, dim, + mx_inline_cumsum); } FloatComplexMatrix @@ -3315,7 +3365,8 @@ if (! xisnan (tmp_min)) { - abs_min = real_only ? std::real (tmp_min) : std::abs (tmp_min); + abs_min = real_only ? std::real (tmp_min) + : std::abs (tmp_min); break; } } @@ -3389,7 +3440,8 @@ if (! xisnan (tmp_max)) { - abs_max = real_only ? std::real (tmp_max) : std::abs (tmp_max); + abs_max = real_only ? std::real (tmp_max) + : std::abs (tmp_max); break; } } @@ -3463,7 +3515,8 @@ if (! xisnan (tmp_min)) { - abs_min = real_only ? std::real (tmp_min) : std::abs (tmp_min); + abs_min = real_only ? std::real (tmp_min) + : std::abs (tmp_min); break; } } @@ -3537,7 +3590,8 @@ if (! xisnan (tmp_max)) { - abs_max = real_only ? std::real (tmp_max) : std::abs (tmp_max); + abs_max = real_only ? std::real (tmp_max) + : std::abs (tmp_max); break; } } @@ -3641,7 +3695,7 @@ { FloatComplexMatrix retval; - // FIXME -- need to check that a, b, and c are all the same + // FIXME: need to check that a, b, and c are all the same // size. // Compute Schur decompositions @@ -3679,7 +3733,7 @@ F77_CHAR_ARG_LEN (1) F77_CHAR_ARG_LEN (1))); - // FIXME -- check info? + // FIXME: check info? retval = -ua * cx * ub.hermitian (); @@ -3760,7 +3814,7 @@ { octave_idx_type lda = a.rows (); - // FIXME -- looking at the reference BLAS, it appears that it + // FIXME: looking at the reference BLAS, it appears that it // should not be necessary to initialize the output matrix if // BETA is 0 in the call to CHERK, but ATLAS appears to // use the result matrix before zeroing the elements. @@ -3808,13 +3862,16 @@ { if (cja == cjb) { - F77_FUNC (xcdotu, XCDOTU) (a_nc, a.data (), 1, b.data (), 1, *c); + F77_FUNC (xcdotu, XCDOTU) (a_nc, a.data (), 1, b.data (), 1, + *c); if (cja) *c = std::conj (*c); } else if (cja) - F77_FUNC (xcdotc, XCDOTC) (a_nc, a.data (), 1, b.data (), 1, *c); + F77_FUNC (xcdotc, XCDOTC) (a_nc, a.data (), 1, b.data (), 1, + *c); else - F77_FUNC (xcdotc, XCDOTC) (a_nc, b.data (), 1, a.data (), 1, *c); + F77_FUNC (xcdotc, XCDOTC) (a_nc, b.data (), 1, a.data (), 1, + *c); } else if (b_nc == 1 && ! cjb) { @@ -3855,7 +3912,7 @@ return xgemm (a, b); } -// FIXME -- it would be nice to share code among the min/max +// FIXME: it would be nice to share code among the min/max // functions below. #define EMPTY_RETURN_CHECK(T) \ @@ -4051,7 +4108,8 @@ octave_idx_type m = x1.length (); if (x2.length () != m) - (*current_liboctave_error_handler) ("linspace: vectors must be of equal length"); + (*current_liboctave_error_handler) + ("linspace: vectors must be of equal length"); NoAlias<FloatComplexMatrix> retval;