Mercurial > octave
diff liboctave/array/fMatrix.h @ 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 | ebb3ef964372 |
line wrap: on
line diff
--- a/liboctave/array/fMatrix.h Sat Oct 26 23:20:30 2013 +0200 +++ b/liboctave/array/fMatrix.h Sat Oct 26 18:57:05 2013 -0700 @@ -77,10 +77,10 @@ FloatMatrix& operator = (const FloatMatrix& a) - { - MArray<float>::operator = (a); - return *this; - } + { + MArray<float>::operator = (a); + return *this; + } bool operator == (const FloatMatrix& a) const; bool operator != (const FloatMatrix& a) const; @@ -89,13 +89,18 @@ // destructive insert/delete/reorder operations - FloatMatrix& insert (const FloatMatrix& a, octave_idx_type r, octave_idx_type c); - FloatMatrix& insert (const FloatRowVector& a, octave_idx_type r, octave_idx_type c); - FloatMatrix& insert (const FloatColumnVector& a, octave_idx_type r, octave_idx_type c); - FloatMatrix& insert (const FloatDiagMatrix& a, octave_idx_type r, octave_idx_type c); + FloatMatrix& insert (const FloatMatrix& a, + octave_idx_type r, octave_idx_type c); + FloatMatrix& insert (const FloatRowVector& a, + octave_idx_type r, octave_idx_type c); + FloatMatrix& insert (const FloatColumnVector& a, + octave_idx_type r, octave_idx_type c); + FloatMatrix& insert (const FloatDiagMatrix& a, + octave_idx_type r, octave_idx_type c); FloatMatrix& fill (float val); - FloatMatrix& fill (float val, octave_idx_type r1, octave_idx_type c1, octave_idx_type r2, octave_idx_type c2); + FloatMatrix& fill (float val, octave_idx_type r1, octave_idx_type c1, + octave_idx_type r2, octave_idx_type c2); FloatMatrix append (const FloatMatrix& a) const; FloatMatrix append (const FloatRowVector& a) const; @@ -116,9 +121,11 @@ // resize is the destructive equivalent for this one - FloatMatrix extract (octave_idx_type r1, octave_idx_type c1, octave_idx_type r2, octave_idx_type c2) const; + FloatMatrix extract (octave_idx_type r1, octave_idx_type c1, + octave_idx_type r2, octave_idx_type c2) const; - FloatMatrix extract_n (octave_idx_type r1, octave_idx_type c1, octave_idx_type nr, octave_idx_type nc) const; + FloatMatrix extract_n (octave_idx_type r1, octave_idx_type c1, + octave_idx_type nr, octave_idx_type nc) const; // extract row or column i. @@ -132,22 +139,22 @@ } private: - FloatMatrix tinverse (MatrixType &mattype, octave_idx_type& info, float& rcon, - int force, int calc_cond) const; + FloatMatrix tinverse (MatrixType &mattype, octave_idx_type& info, + float& rcon, int force, int calc_cond) const; - FloatMatrix finverse (MatrixType &mattype, octave_idx_type& info, float& rcon, - int force, int calc_cond) const; + FloatMatrix finverse (MatrixType &mattype, octave_idx_type& info, + float& rcon, int force, int calc_cond) const; public: FloatMatrix inverse (void) const; FloatMatrix inverse (octave_idx_type& info) const; FloatMatrix inverse (octave_idx_type& info, float& rcon, int force = 0, - int calc_cond = 1) const; + int calc_cond = 1) const; FloatMatrix inverse (MatrixType &mattype) const; FloatMatrix inverse (MatrixType &mattype, octave_idx_type& info) const; FloatMatrix inverse (MatrixType &mattype, octave_idx_type& info, float& rcon, - int force = 0, int calc_cond = 1) const; + int force = 0, int calc_cond = 1) const; FloatMatrix pseudo_inverse (float tol = 0.0) const; @@ -159,7 +166,8 @@ FloatDET determinant (void) const; FloatDET determinant (octave_idx_type& info) const; - FloatDET determinant (octave_idx_type& info, float& rcon, int calc_cond = 1) const; + FloatDET determinant (octave_idx_type& info, float& rcon, + int calc_cond = 1) const; FloatDET determinant (MatrixType &mattype, octave_idx_type& info, float& rcon, int calc_cond = 1) const; @@ -168,122 +176,149 @@ private: // Upper triangular matrix solvers - FloatMatrix utsolve (MatrixType &typ, const FloatMatrix& b, octave_idx_type& info, - float& rcon, solve_singularity_handler sing_handler, - bool calc_cond = false, blas_trans_type transt = blas_no_trans) const; + FloatMatrix utsolve (MatrixType &typ, const FloatMatrix& b, + octave_idx_type& info, + float& rcon, solve_singularity_handler sing_handler, + bool calc_cond = false, + blas_trans_type transt = blas_no_trans) const; // Lower triangular matrix solvers - FloatMatrix ltsolve (MatrixType &typ, const FloatMatrix& b, octave_idx_type& info, - float& rcon, solve_singularity_handler sing_handler, - bool calc_cond = false, blas_trans_type transt = blas_no_trans) const; + FloatMatrix ltsolve (MatrixType &typ, const FloatMatrix& b, + octave_idx_type& info, + float& rcon, solve_singularity_handler sing_handler, + bool calc_cond = false, + blas_trans_type transt = blas_no_trans) const; // Full matrix solvers (lu/cholesky) - FloatMatrix fsolve (MatrixType &typ, const FloatMatrix& b, octave_idx_type& info, - float& rcon, solve_singularity_handler sing_handler, - bool calc_cond = false) const; + FloatMatrix fsolve (MatrixType &typ, const FloatMatrix& b, + octave_idx_type& info, + float& rcon, solve_singularity_handler sing_handler, + bool calc_cond = false) const; public: // Generic interface to solver with no probing of type FloatMatrix solve (MatrixType &typ, const FloatMatrix& b) const; - FloatMatrix solve (MatrixType &typ, const FloatMatrix& b, octave_idx_type& info) const; - FloatMatrix solve (MatrixType &typ, const FloatMatrix& b, octave_idx_type& info, - float& rcon) const; - FloatMatrix solve (MatrixType &typ, const FloatMatrix& b, octave_idx_type& info, - float& rcon, solve_singularity_handler sing_handler, - bool singular_fallback = true, blas_trans_type transt = blas_no_trans) const; + FloatMatrix solve (MatrixType &typ, const FloatMatrix& b, + octave_idx_type& info) const; + FloatMatrix solve (MatrixType &typ, const FloatMatrix& b, + octave_idx_type& info, float& rcon) const; + FloatMatrix solve (MatrixType &typ, const FloatMatrix& b, + octave_idx_type& info, float& rcon, + solve_singularity_handler sing_handler, + bool singular_fallback = true, + blas_trans_type transt = blas_no_trans) const; FloatComplexMatrix solve (MatrixType &typ, const FloatComplexMatrix& b) const; FloatComplexMatrix solve (MatrixType &typ, const FloatComplexMatrix& b, - octave_idx_type& info) const; + octave_idx_type& info) const; FloatComplexMatrix solve (MatrixType &typ, const FloatComplexMatrix& b, - octave_idx_type& info, float& rcon) const; + octave_idx_type& info, float& rcon) const; FloatComplexMatrix solve (MatrixType &typ, const FloatComplexMatrix& b, - octave_idx_type& info, float& rcon, - solve_singularity_handler sing_handler, - bool singular_fallback = true, - blas_trans_type transt = blas_no_trans) const; + octave_idx_type& info, float& rcon, + solve_singularity_handler sing_handler, + bool singular_fallback = true, + blas_trans_type transt = blas_no_trans) const; FloatColumnVector solve (MatrixType &typ, const FloatColumnVector& b) const; FloatColumnVector solve (MatrixType &typ, const FloatColumnVector& b, - octave_idx_type& info) const; + octave_idx_type& info) const; FloatColumnVector solve (MatrixType &typ, const FloatColumnVector& b, - octave_idx_type& info, float& rcon) const; + octave_idx_type& info, float& rcon) const; FloatColumnVector solve (MatrixType &typ, const FloatColumnVector& b, - octave_idx_type& info, float& rcon, - solve_singularity_handler sing_handler, - blas_trans_type transt = blas_no_trans) const; + octave_idx_type& info, float& rcon, + solve_singularity_handler sing_handler, + blas_trans_type transt = blas_no_trans) const; FloatComplexColumnVector solve (MatrixType &typ, - const FloatComplexColumnVector& b) const; - FloatComplexColumnVector solve (MatrixType &typ, const FloatComplexColumnVector& b, - octave_idx_type& info) const; - FloatComplexColumnVector solve (MatrixType &typ, const FloatComplexColumnVector& b, - octave_idx_type& info, float& rcon) const; - FloatComplexColumnVector solve (MatrixType &typ, const FloatComplexColumnVector& b, - octave_idx_type& info, float& rcon, - solve_singularity_handler sing_handler, blas_trans_type transt = blas_no_trans) const; + const FloatComplexColumnVector& b) const; + FloatComplexColumnVector solve (MatrixType &typ, + const FloatComplexColumnVector& b, + octave_idx_type& info) const; + FloatComplexColumnVector solve (MatrixType &typ, + const FloatComplexColumnVector& b, + octave_idx_type& info, float& rcon) const; + FloatComplexColumnVector solve (MatrixType &typ, + const FloatComplexColumnVector& b, + octave_idx_type& info, float& rcon, + solve_singularity_handler sing_handler, + blas_trans_type transt = blas_no_trans) const; // Generic interface to solver with probing of type FloatMatrix solve (const FloatMatrix& b) const; FloatMatrix solve (const FloatMatrix& b, octave_idx_type& info) const; - FloatMatrix solve (const FloatMatrix& b, octave_idx_type& info, float& rcon) const; + FloatMatrix solve (const FloatMatrix& b, octave_idx_type& info, + float& rcon) const; FloatMatrix solve (const FloatMatrix& b, octave_idx_type& info, float& rcon, solve_singularity_handler sing_handler, blas_trans_type transt = blas_no_trans) const; FloatComplexMatrix solve (const FloatComplexMatrix& b) const; - FloatComplexMatrix solve (const FloatComplexMatrix& b, octave_idx_type& info) const; - FloatComplexMatrix solve (const FloatComplexMatrix& b, octave_idx_type& info, float& rcon) const; - FloatComplexMatrix solve (const FloatComplexMatrix& b, octave_idx_type& info, float& rcon, + FloatComplexMatrix solve (const FloatComplexMatrix& b, + octave_idx_type& info) const; + FloatComplexMatrix solve (const FloatComplexMatrix& b, octave_idx_type& info, + float& rcon) const; + FloatComplexMatrix solve (const FloatComplexMatrix& b, octave_idx_type& info, + float& rcon, solve_singularity_handler sing_handler, blas_trans_type transt = blas_no_trans) const; FloatColumnVector solve (const FloatColumnVector& b) const; - FloatColumnVector solve (const FloatColumnVector& b, octave_idx_type& info) const; - FloatColumnVector solve (const FloatColumnVector& b, octave_idx_type& info, float& rcon) const; - FloatColumnVector solve (const FloatColumnVector& b, octave_idx_type& info, float& rcon, + FloatColumnVector solve (const FloatColumnVector& b, + octave_idx_type& info) const; + FloatColumnVector solve (const FloatColumnVector& b, octave_idx_type& info, + float& rcon) const; + FloatColumnVector solve (const FloatColumnVector& b, octave_idx_type& info, + float& rcon, solve_singularity_handler sing_handler, blas_trans_type transt = blas_no_trans) const; FloatComplexColumnVector solve (const FloatComplexColumnVector& b) const; - FloatComplexColumnVector solve (const FloatComplexColumnVector& b, octave_idx_type& info) const; - FloatComplexColumnVector solve (const FloatComplexColumnVector& b, octave_idx_type& info, + FloatComplexColumnVector solve (const FloatComplexColumnVector& b, + octave_idx_type& info) const; + FloatComplexColumnVector solve (const FloatComplexColumnVector& b, + octave_idx_type& info, float& rcon) const; - FloatComplexColumnVector solve (const FloatComplexColumnVector& b, octave_idx_type& info, - float& rcon, solve_singularity_handler sing_handler, + FloatComplexColumnVector solve (const FloatComplexColumnVector& b, + octave_idx_type& info, + float& rcon, + solve_singularity_handler sing_handler, blas_trans_type transt = blas_no_trans) const; // Singular solvers FloatMatrix lssolve (const FloatMatrix& b) const; FloatMatrix lssolve (const FloatMatrix& b, octave_idx_type& info) const; FloatMatrix lssolve (const FloatMatrix& b, octave_idx_type& info, - octave_idx_type& rank) const; + octave_idx_type& rank) const; FloatMatrix lssolve (const FloatMatrix& b, octave_idx_type& info, - octave_idx_type& rank, float& rcon) const; + octave_idx_type& rank, float& rcon) const; FloatComplexMatrix lssolve (const FloatComplexMatrix& b) const; - FloatComplexMatrix lssolve (const FloatComplexMatrix& b, octave_idx_type& info) const; - FloatComplexMatrix lssolve (const FloatComplexMatrix& b, octave_idx_type& info, - octave_idx_type& rank) const; - FloatComplexMatrix lssolve (const FloatComplexMatrix& b, octave_idx_type& info, - octave_idx_type& rank, float &rcon) const; + FloatComplexMatrix lssolve (const FloatComplexMatrix& b, + octave_idx_type& info) const; + FloatComplexMatrix lssolve (const FloatComplexMatrix& b, + octave_idx_type& info, + octave_idx_type& rank) const; + FloatComplexMatrix lssolve (const FloatComplexMatrix& b, + octave_idx_type& info, octave_idx_type& rank, + float &rcon) const; FloatColumnVector lssolve (const FloatColumnVector& b) const; - FloatColumnVector lssolve (const FloatColumnVector& b, octave_idx_type& info) const; + FloatColumnVector lssolve (const FloatColumnVector& b, + octave_idx_type& info) const; FloatColumnVector lssolve (const FloatColumnVector& b, octave_idx_type& info, - octave_idx_type& rank) const; + octave_idx_type& rank) const; FloatColumnVector lssolve (const FloatColumnVector& b, octave_idx_type& info, - octave_idx_type& rank, float& rcon) const; + octave_idx_type& rank, float& rcon) const; FloatComplexColumnVector lssolve (const FloatComplexColumnVector& b) const; FloatComplexColumnVector lssolve (const FloatComplexColumnVector& b, - octave_idx_type& info) const; + octave_idx_type& info) const; FloatComplexColumnVector lssolve (const FloatComplexColumnVector& b, - octave_idx_type& info, - octave_idx_type& rank) const; + octave_idx_type& info, + octave_idx_type& rank) const; FloatComplexColumnVector lssolve (const FloatComplexColumnVector& b, - octave_idx_type& info, - octave_idx_type& rank, float& rcon) const; + octave_idx_type& info, + octave_idx_type& rank, float& rcon) const; FloatMatrix& operator += (const FloatDiagMatrix& a); FloatMatrix& operator -= (const FloatDiagMatrix& a); @@ -331,8 +366,10 @@ // i/o - friend OCTAVE_API std::ostream& operator << (std::ostream& os, const FloatMatrix& a); - friend OCTAVE_API std::istream& operator >> (std::istream& is, FloatMatrix& a); + friend OCTAVE_API std::ostream& operator << (std::ostream& os, + const FloatMatrix& a); + friend OCTAVE_API std::istream& operator >> (std::istream& is, + FloatMatrix& a); }; // Publish externally used friend functions. @@ -342,19 +379,22 @@ // column vector by row vector -> matrix operations -extern OCTAVE_API FloatMatrix operator * (const FloatColumnVector& a, const FloatRowVector& b); +extern OCTAVE_API FloatMatrix operator * (const FloatColumnVector& a, + const FloatRowVector& b); // Other functions. extern OCTAVE_API FloatMatrix Givens (float, float); -extern OCTAVE_API FloatMatrix Sylvester (const FloatMatrix&, const FloatMatrix&, const FloatMatrix&); +extern OCTAVE_API FloatMatrix Sylvester (const FloatMatrix&, const FloatMatrix&, + const FloatMatrix&); extern OCTAVE_API FloatMatrix xgemm (const FloatMatrix& a, const FloatMatrix& b, blas_trans_type transa = blas_no_trans, blas_trans_type transb = blas_no_trans); -extern OCTAVE_API FloatMatrix operator * (const FloatMatrix& a, const FloatMatrix& b); +extern OCTAVE_API FloatMatrix operator * (const FloatMatrix& a, + const FloatMatrix& b); extern OCTAVE_API FloatMatrix min (float d, const FloatMatrix& m); extern OCTAVE_API FloatMatrix min (const FloatMatrix& m, float d);