Mercurial > octave
diff liboctave/numeric/lu.cc @ 23475:d691ed308237
maint: Clean up #includes in liboctave/numeric directory.
* build-aux/mk-opts.pl: Change Perl to generate "" around local include
libraries rather than <>. Include "lo-math.h" rather than <cmath>.
* CollocWt.cc, DAERTFunc.h, DASPK.cc, DASPK.h, DASRT.cc, DASRT.h, DASSL.cc,
DASSL.h, DET.h, EIG.cc, EIG.h, LSODE.cc, LSODE.h, ODE.h, ODES.cc, ODESFunc.h,
Quad.cc, aepbalance.cc, base-de.h, base-min.h, bsxfun-decl.h, bsxfun-defs.cc,
bsxfun.h, chol.cc, eigs-base.cc, fEIG.cc, fEIG.h, gepbalance.cc, gsvd.cc,
hess.cc, lo-blas-proto.h, lo-lapack-proto.h, lo-mappers.cc, lo-mappers.h,
lo-qrupdate-proto.h, lo-slatec-proto.h, lo-specfun.cc, lo-specfun.h, lu.cc,
lu.h, oct-convn.cc, oct-convn.h, oct-fftw.cc, oct-fftw.h, oct-norm.cc,
oct-rand.cc, oct-rand.h, oct-spparms.cc, oct-spparms.h, qr.cc, qr.h, qrp.cc,
randgamma.cc, randpoisson.cc, schur.cc, schur.h, sparse-chol.cc, sparse-chol.h,
sparse-dmsolve.cc, sparse-lu.cc, sparse-lu.h, sparse-qr.cc, sparse-qr.h,
svd.cc:
Rationalize #includes. Use forward declarations of just classes where
possible. Reformat some long lines < 80 characters. Reformat some comments
for readabliity.
* mx-inlines.cc: Rationalize #includes for this file in liboctave/operators
used by many in liboctave/numeric.
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 09 May 2017 08:46:07 -0700 |
| parents | 092078913d54 |
| children | 08036a7f3660 |
line wrap: on
line diff
--- a/liboctave/numeric/lu.cc Mon May 08 20:58:14 2017 -0700 +++ b/liboctave/numeric/lu.cc Tue May 09 08:46:07 2017 -0700 @@ -25,8 +25,11 @@ # include "config.h" #endif +#include <algorithm> + #include "CColVector.h" #include "CMatrix.h" +#include "PermMatrix.h" #include "dColVector.h" #include "dMatrix.h" #include "fCColVector.h" @@ -294,8 +297,8 @@ ColumnVector utmp = u; ColumnVector vtmp = v; - F77_XFCN (dlu1up, DLU1UP, (m, n, l.fortran_vec (), m, r.fortran_vec (), k, - utmp.fortran_vec (), vtmp.fortran_vec ())); + F77_XFCN (dlu1up, DLU1UP, (m, n, l.fortran_vec (), m, r.fortran_vec (), + k, utmp.fortran_vec (), vtmp.fortran_vec ())); } template <> @@ -426,7 +429,8 @@ template <> void - lu<FloatMatrix>::update (const FloatColumnVector& u, const FloatColumnVector& v) + lu<FloatMatrix>::update (const FloatColumnVector& u, + const FloatColumnVector& v) { if (packed ()) unpack (); @@ -570,8 +574,8 @@ F77_INT info = 0; - F77_XFCN (zgetrf, ZGETRF, (a_nr, a_nc, F77_DBLE_CMPLX_ARG (tmp_data), a_nr, - pipvt, info)); + F77_XFCN (zgetrf, ZGETRF, (a_nr, a_nc, F77_DBLE_CMPLX_ARG (tmp_data), + a_nr, pipvt, info)); for (F77_INT i = 0; i < mn; i++) pipvt[i] -= 1; @@ -635,8 +639,10 @@ { ComplexColumnVector utmp = u.column (i); ComplexColumnVector vtmp = v.column (i); - F77_XFCN (zlu1up, ZLU1UP, (m, n, F77_DBLE_CMPLX_ARG (l.fortran_vec ()), - m, F77_DBLE_CMPLX_ARG (r.fortran_vec ()), k, + F77_XFCN (zlu1up, ZLU1UP, (m, n, + F77_DBLE_CMPLX_ARG (l.fortran_vec ()), + m, F77_DBLE_CMPLX_ARG (r.fortran_vec ()), + k, F77_DBLE_CMPLX_ARG (utmp.fortran_vec ()), F77_DBLE_CMPLX_ARG (vtmp.fortran_vec ()))); } @@ -671,13 +677,15 @@ m, F77_DBLE_CMPLX_ARG (r.fortran_vec ()), k, ipvt.fortran_vec (), F77_CONST_DBLE_CMPLX_ARG (utmp.data ()), - F77_CONST_DBLE_CMPLX_ARG (vtmp.data ()), F77_DBLE_CMPLX_ARG (w))); + F77_CONST_DBLE_CMPLX_ARG (vtmp.data ()), + F77_DBLE_CMPLX_ARG (w))); for (F77_INT i = 0; i < m; i++) ipvt(i) -= 1; // decrement } template <> void - lu<ComplexMatrix>::update_piv (const ComplexMatrix& u, const ComplexMatrix& v) + lu<ComplexMatrix>::update_piv (const ComplexMatrix& u, + const ComplexMatrix& v) { if (packed ()) unpack (); @@ -704,11 +712,14 @@ { ComplexColumnVector utmp = u.column (i); ComplexColumnVector vtmp = v.column (i); - F77_XFCN (zlup1up, ZLUP1UP, (m, n, F77_DBLE_CMPLX_ARG (l.fortran_vec ()), - m, F77_DBLE_CMPLX_ARG (r.fortran_vec ()), k, - ipvt.fortran_vec (), + F77_XFCN (zlup1up, ZLUP1UP, (m, n, + F77_DBLE_CMPLX_ARG (l.fortran_vec ()), + m, + F77_DBLE_CMPLX_ARG (r.fortran_vec ()), + k, ipvt.fortran_vec (), F77_CONST_DBLE_CMPLX_ARG (utmp.data ()), - F77_CONST_DBLE_CMPLX_ARG (vtmp.data ()), F77_DBLE_CMPLX_ARG (w))); + F77_CONST_DBLE_CMPLX_ARG (vtmp.data ()), + F77_DBLE_CMPLX_ARG (w))); } for (F77_INT i = 0; i < m; i++) ipvt(i) -= 1; // decrement } @@ -730,8 +741,8 @@ F77_INT info = 0; - F77_XFCN (cgetrf, CGETRF, (a_nr, a_nc, F77_CMPLX_ARG (tmp_data), a_nr, pipvt, - info)); + F77_XFCN (cgetrf, CGETRF, (a_nr, a_nc, F77_CMPLX_ARG (tmp_data), a_nr, + pipvt, info)); for (F77_INT i = 0; i < mn; i++) pipvt[i] -= 1; @@ -764,7 +775,8 @@ FloatComplexColumnVector vtmp = v; F77_XFCN (clu1up, CLU1UP, (m, n, F77_CMPLX_ARG (l.fortran_vec ()), m, F77_CMPLX_ARG (r.fortran_vec ()), k, - F77_CMPLX_ARG (utmp.fortran_vec ()), F77_CMPLX_ARG (vtmp.fortran_vec ()))); + F77_CMPLX_ARG (utmp.fortran_vec ()), + F77_CMPLX_ARG (vtmp.fortran_vec ()))); } template <> @@ -797,7 +809,8 @@ FloatComplexColumnVector vtmp = v.column (i); F77_XFCN (clu1up, CLU1UP, (m, n, F77_CMPLX_ARG (l.fortran_vec ()), m, F77_CMPLX_ARG (r.fortran_vec ()), k, - F77_CMPLX_ARG (utmp.fortran_vec ()), F77_CMPLX_ARG (vtmp.fortran_vec ()))); + F77_CMPLX_ARG (utmp.fortran_vec ()), + F77_CMPLX_ARG (vtmp.fortran_vec ()))); } } @@ -829,7 +842,8 @@ F77_XFCN (clup1up, CLUP1UP, (m, n, F77_CMPLX_ARG (l.fortran_vec ()), m, F77_CMPLX_ARG (r.fortran_vec ()), k, ipvt.fortran_vec (), - F77_CONST_CMPLX_ARG (utmp.data ()), F77_CONST_CMPLX_ARG (vtmp.data ()), + F77_CONST_CMPLX_ARG (utmp.data ()), + F77_CONST_CMPLX_ARG (vtmp.data ()), F77_CMPLX_ARG (w))); for (F77_INT i = 0; i < m; i++) ipvt(i) -= 1; // decrement } @@ -867,7 +881,8 @@ F77_XFCN (clup1up, CLUP1UP, (m, n, F77_CMPLX_ARG (l.fortran_vec ()), m, F77_CMPLX_ARG (r.fortran_vec ()), k, ipvt.fortran_vec (), - F77_CONST_CMPLX_ARG (utmp.data ()), F77_CONST_CMPLX_ARG (vtmp.data ()), + F77_CONST_CMPLX_ARG (utmp.data ()), + F77_CONST_CMPLX_ARG (vtmp.data ()), F77_CMPLX_ARG (w))); } for (F77_INT i = 0; i < m; i++) ipvt(i) -= 1; // decrement