Mercurial > hg > octave-lyh
view liboctave/array/MatrixType.cc @ 15271:648dabbb4c6b
build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
* array/Array-C.cc, array/Array-b.cc, array/Array-ch.cc, array/Array-d.cc,
array/Array-f.cc, array/Array-fC.cc, array/Array-i.cc, array/Array-idx-vec.cc,
array/Array-s.cc, array/Array-str.cc, array/Array-util.cc, array/Array-util.h,
array/Array-voidp.cc, array/Array.cc, array/Array.h, array/Array2.h,
array/Array3.h, array/ArrayN.h, array/CColVector.cc, array/CColVector.h,
array/CDiagMatrix.cc, array/CDiagMatrix.h, array/CMatrix.cc, array/CMatrix.h,
array/CNDArray.cc, array/CNDArray.h, array/CRowVector.cc, array/CRowVector.h,
array/CSparse.cc, array/CSparse.h, array/DiagArray2.cc, array/DiagArray2.h,
array/MArray-C.cc, array/MArray-d.cc, array/MArray-decl.h, array/MArray-defs.h,
array/MArray-f.cc, array/MArray-fC.cc, array/MArray-i.cc, array/MArray-s.cc,
array/MArray.cc, array/MArray.h, array/MArray2.h, array/MArrayN.h,
array/MDiagArray2.cc, array/MDiagArray2.h, array/MSparse-C.cc,
array/MSparse-d.cc, array/MSparse-defs.h, array/MSparse.cc, array/MSparse.h,
array/Matrix.h, array/MatrixType.cc, array/MatrixType.h, array/PermMatrix.cc,
array/PermMatrix.h, array/Range.cc, array/Range.h, array/Sparse-C.cc,
array/Sparse-b.cc, array/Sparse-d.cc, array/Sparse.cc, array/Sparse.h,
array/boolMatrix.cc, array/boolMatrix.h, array/boolNDArray.cc,
array/boolNDArray.h, array/boolSparse.cc, array/boolSparse.h,
array/chMatrix.cc, array/chMatrix.h, array/chNDArray.cc, array/chNDArray.h,
array/dColVector.cc, array/dColVector.h, array/dDiagMatrix.cc,
array/dDiagMatrix.h, array/dMatrix.cc, array/dMatrix.h, array/dNDArray.cc,
array/dNDArray.h, array/dRowVector.cc, array/dRowVector.h, array/dSparse.cc,
array/dSparse.h, array/dim-vector.cc, array/dim-vector.h, array/fCColVector.cc,
array/fCColVector.h, array/fCDiagMatrix.cc, array/fCDiagMatrix.h,
array/fCMatrix.cc, array/fCMatrix.h, array/fCNDArray.cc, array/fCNDArray.h,
array/fCRowVector.cc, array/fCRowVector.h, array/fColVector.cc,
array/fColVector.h, array/fDiagMatrix.cc, array/fDiagMatrix.h,
array/fMatrix.cc, array/fMatrix.h, array/fNDArray.cc, array/fNDArray.h,
array/fRowVector.cc, array/fRowVector.h, array/idx-vector.cc,
array/idx-vector.h, array/int16NDArray.cc, array/int16NDArray.h,
array/int32NDArray.cc, array/int32NDArray.h, array/int64NDArray.cc,
array/int64NDArray.h, array/int8NDArray.cc, array/int8NDArray.h,
array/intNDArray.cc, array/intNDArray.h, array/module.mk,
array/uint16NDArray.cc, array/uint16NDArray.h, array/uint32NDArray.cc,
array/uint32NDArray.h, array/uint64NDArray.cc, array/uint64NDArray.h,
array/uint8NDArray.cc, array/uint8NDArray.h:
Moved from liboctave dir to array subdirectory.
* cruft/Makefile.am, cruft/amos/README, cruft/amos/cacai.f, cruft/amos/cacon.f,
cruft/amos/cairy.f, cruft/amos/casyi.f, cruft/amos/cbesh.f, cruft/amos/cbesi.f,
cruft/amos/cbesj.f, cruft/amos/cbesk.f, cruft/amos/cbesy.f, cruft/amos/cbinu.f,
cruft/amos/cbiry.f, cruft/amos/cbknu.f, cruft/amos/cbuni.f, cruft/amos/cbunk.f,
cruft/amos/ckscl.f, cruft/amos/cmlri.f, cruft/amos/crati.f, cruft/amos/cs1s2.f,
cruft/amos/cseri.f, cruft/amos/cshch.f, cruft/amos/cuchk.f, cruft/amos/cunhj.f,
cruft/amos/cuni1.f, cruft/amos/cuni2.f, cruft/amos/cunik.f, cruft/amos/cunk1.f,
cruft/amos/cunk2.f, cruft/amos/cuoik.f, cruft/amos/cwrsk.f,
cruft/amos/dgamln.f, cruft/amos/gamln.f, cruft/amos/module.mk,
cruft/amos/xzabs.f, cruft/amos/xzexp.f, cruft/amos/xzlog.f,
cruft/amos/xzsqrt.f, cruft/amos/zacai.f, cruft/amos/zacon.f,
cruft/amos/zairy.f, cruft/amos/zasyi.f, cruft/amos/zbesh.f, cruft/amos/zbesi.f,
cruft/amos/zbesj.f, cruft/amos/zbesk.f, cruft/amos/zbesy.f, cruft/amos/zbinu.f,
cruft/amos/zbiry.f, cruft/amos/zbknu.f, cruft/amos/zbuni.f, cruft/amos/zbunk.f,
cruft/amos/zdiv.f, cruft/amos/zkscl.f, cruft/amos/zmlri.f, cruft/amos/zmlt.f,
cruft/amos/zrati.f, cruft/amos/zs1s2.f, cruft/amos/zseri.f, cruft/amos/zshch.f,
cruft/amos/zuchk.f, cruft/amos/zunhj.f, cruft/amos/zuni1.f, cruft/amos/zuni2.f,
cruft/amos/zunik.f, cruft/amos/zunk1.f, cruft/amos/zunk2.f, cruft/amos/zuoik.f,
cruft/amos/zwrsk.f, cruft/blas-xtra/cconv2.f, cruft/blas-xtra/cdotc3.f,
cruft/blas-xtra/cmatm3.f, cruft/blas-xtra/csconv2.f, cruft/blas-xtra/dconv2.f,
cruft/blas-xtra/ddot3.f, cruft/blas-xtra/dmatm3.f, cruft/blas-xtra/module.mk,
cruft/blas-xtra/sconv2.f, cruft/blas-xtra/sdot3.f, cruft/blas-xtra/smatm3.f,
cruft/blas-xtra/xcdotc.f, cruft/blas-xtra/xcdotu.f, cruft/blas-xtra/xddot.f,
cruft/blas-xtra/xdnrm2.f, cruft/blas-xtra/xdznrm2.f, cruft/blas-xtra/xerbla.f,
cruft/blas-xtra/xscnrm2.f, cruft/blas-xtra/xsdot.f, cruft/blas-xtra/xsnrm2.f,
cruft/blas-xtra/xzdotc.f, cruft/blas-xtra/xzdotu.f, cruft/blas-xtra/zconv2.f,
cruft/blas-xtra/zdconv2.f, cruft/blas-xtra/zdotc3.f, cruft/blas-xtra/zmatm3.f,
cruft/daspk/datv.f, cruft/daspk/dcnst0.f, cruft/daspk/dcnstr.f,
cruft/daspk/ddasic.f, cruft/daspk/ddasid.f, cruft/daspk/ddasik.f,
cruft/daspk/ddaspk.f, cruft/daspk/ddstp.f, cruft/daspk/ddwnrm.f,
cruft/daspk/dfnrmd.f, cruft/daspk/dfnrmk.f, cruft/daspk/dhels.f,
cruft/daspk/dheqr.f, cruft/daspk/dinvwt.f, cruft/daspk/dlinsd.f,
cruft/daspk/dlinsk.f, cruft/daspk/dmatd.f, cruft/daspk/dnedd.f,
cruft/daspk/dnedk.f, cruft/daspk/dnsd.f, cruft/daspk/dnsid.f,
cruft/daspk/dnsik.f, cruft/daspk/dnsk.f, cruft/daspk/dorth.f,
cruft/daspk/dslvd.f, cruft/daspk/dslvk.f, cruft/daspk/dspigm.f,
cruft/daspk/dyypnw.f, cruft/daspk/module.mk, cruft/dasrt/ddasrt.f,
cruft/dasrt/drchek.f, cruft/dasrt/droots.f, cruft/dasrt/module.mk,
cruft/dassl/ddaini.f, cruft/dassl/ddajac.f, cruft/dassl/ddanrm.f,
cruft/dassl/ddaslv.f, cruft/dassl/ddassl.f, cruft/dassl/ddastp.f,
cruft/dassl/ddatrp.f, cruft/dassl/ddawts.f, cruft/dassl/module.mk,
cruft/fftpack/cfftb.f, cruft/fftpack/cfftb1.f, cruft/fftpack/cfftf.f,
cruft/fftpack/cfftf1.f, cruft/fftpack/cffti.f, cruft/fftpack/cffti1.f,
cruft/fftpack/fftpack.doc, cruft/fftpack/module.mk, cruft/fftpack/passb.f,
cruft/fftpack/passb2.f, cruft/fftpack/passb3.f, cruft/fftpack/passb4.f,
cruft/fftpack/passb5.f, cruft/fftpack/passf.f, cruft/fftpack/passf2.f,
cruft/fftpack/passf3.f, cruft/fftpack/passf4.f, cruft/fftpack/passf5.f,
cruft/fftpack/zfftb.f, cruft/fftpack/zfftb1.f, cruft/fftpack/zfftf.f,
cruft/fftpack/zfftf1.f, cruft/fftpack/zffti.f, cruft/fftpack/zffti1.f,
cruft/fftpack/zpassb.f, cruft/fftpack/zpassb2.f, cruft/fftpack/zpassb3.f,
cruft/fftpack/zpassb4.f, cruft/fftpack/zpassb5.f, cruft/fftpack/zpassf.f,
cruft/fftpack/zpassf2.f, cruft/fftpack/zpassf3.f, cruft/fftpack/zpassf4.f,
cruft/fftpack/zpassf5.f, cruft/lapack-xtra/crsf2csf.f,
cruft/lapack-xtra/module.mk, cruft/lapack-xtra/xclange.f,
cruft/lapack-xtra/xdlamch.f, cruft/lapack-xtra/xdlange.f,
cruft/lapack-xtra/xilaenv.f, cruft/lapack-xtra/xslamch.f,
cruft/lapack-xtra/xslange.f, cruft/lapack-xtra/xzlange.f,
cruft/lapack-xtra/zrsf2csf.f, cruft/link-deps.mk, cruft/misc/blaswrap.c,
cruft/misc/cquit.c, cruft/misc/d1mach-tst.for, cruft/misc/d1mach.f,
cruft/misc/f77-extern.cc, cruft/misc/f77-fcn.c, cruft/misc/f77-fcn.h,
cruft/misc/i1mach.f, cruft/misc/lo-error.c, cruft/misc/lo-error.h,
cruft/misc/module.mk, cruft/misc/quit.cc, cruft/misc/quit.h,
cruft/misc/r1mach.f, cruft/mkf77def.in, cruft/odepack/cfode.f,
cruft/odepack/dlsode.f, cruft/odepack/ewset.f, cruft/odepack/intdy.f,
cruft/odepack/module.mk, cruft/odepack/prepj.f, cruft/odepack/scfode.f,
cruft/odepack/sewset.f, cruft/odepack/sintdy.f, cruft/odepack/slsode.f,
cruft/odepack/solsy.f, cruft/odepack/sprepj.f, cruft/odepack/ssolsy.f,
cruft/odepack/sstode.f, cruft/odepack/stode.f, cruft/odepack/svnorm.f,
cruft/odepack/vnorm.f, cruft/ordered-qz/README, cruft/ordered-qz/dsubsp.f,
cruft/ordered-qz/exchqz.f, cruft/ordered-qz/module.mk,
cruft/ordered-qz/sexchqz.f, cruft/ordered-qz/ssubsp.f, cruft/quadpack/dqagi.f,
cruft/quadpack/dqagie.f, cruft/quadpack/dqagp.f, cruft/quadpack/dqagpe.f,
cruft/quadpack/dqelg.f, cruft/quadpack/dqk15i.f, cruft/quadpack/dqk21.f,
cruft/quadpack/dqpsrt.f, cruft/quadpack/module.mk, cruft/quadpack/qagi.f,
cruft/quadpack/qagie.f, cruft/quadpack/qagp.f, cruft/quadpack/qagpe.f,
cruft/quadpack/qelg.f, cruft/quadpack/qk15i.f, cruft/quadpack/qk21.f,
cruft/quadpack/qpsrt.f, cruft/quadpack/xerror.f, cruft/ranlib/Basegen.doc,
cruft/ranlib/HOWTOGET, cruft/ranlib/README, cruft/ranlib/advnst.f,
cruft/ranlib/genbet.f, cruft/ranlib/genchi.f, cruft/ranlib/genexp.f,
cruft/ranlib/genf.f, cruft/ranlib/gengam.f, cruft/ranlib/genmn.f,
cruft/ranlib/genmul.f, cruft/ranlib/gennch.f, cruft/ranlib/gennf.f,
cruft/ranlib/gennor.f, cruft/ranlib/genprm.f, cruft/ranlib/genunf.f,
cruft/ranlib/getcgn.f, cruft/ranlib/getsd.f, cruft/ranlib/ignbin.f,
cruft/ranlib/ignlgi.f, cruft/ranlib/ignnbn.f, cruft/ranlib/ignpoi.f,
cruft/ranlib/ignuin.f, cruft/ranlib/initgn.f, cruft/ranlib/inrgcm.f,
cruft/ranlib/lennob.f, cruft/ranlib/mltmod.f, cruft/ranlib/module.mk,
cruft/ranlib/phrtsd.f, cruft/ranlib/qrgnin.f, cruft/ranlib/randlib.chs,
cruft/ranlib/randlib.fdoc, cruft/ranlib/ranf.f, cruft/ranlib/setall.f,
cruft/ranlib/setant.f, cruft/ranlib/setgmn.f, cruft/ranlib/setsd.f,
cruft/ranlib/sexpo.f, cruft/ranlib/sgamma.f, cruft/ranlib/snorm.f,
cruft/ranlib/tstbot.for, cruft/ranlib/tstgmn.for, cruft/ranlib/tstmid.for,
cruft/ranlib/wrap.f, cruft/slatec-err/fdump.f, cruft/slatec-err/ixsav.f,
cruft/slatec-err/j4save.f, cruft/slatec-err/module.mk,
cruft/slatec-err/xerclr.f, cruft/slatec-err/xercnt.f,
cruft/slatec-err/xerhlt.f, cruft/slatec-err/xermsg.f,
cruft/slatec-err/xerprn.f, cruft/slatec-err/xerrwd.f,
cruft/slatec-err/xersve.f, cruft/slatec-err/xgetf.f, cruft/slatec-err/xgetua.f,
cruft/slatec-err/xsetf.f, cruft/slatec-err/xsetua.f, cruft/slatec-fn/acosh.f,
cruft/slatec-fn/albeta.f, cruft/slatec-fn/algams.f, cruft/slatec-fn/alngam.f,
cruft/slatec-fn/alnrel.f, cruft/slatec-fn/asinh.f, cruft/slatec-fn/atanh.f,
cruft/slatec-fn/betai.f, cruft/slatec-fn/csevl.f, cruft/slatec-fn/d9gmit.f,
cruft/slatec-fn/d9lgic.f, cruft/slatec-fn/d9lgit.f, cruft/slatec-fn/d9lgmc.f,
cruft/slatec-fn/dacosh.f, cruft/slatec-fn/dasinh.f, cruft/slatec-fn/datanh.f,
cruft/slatec-fn/dbetai.f, cruft/slatec-fn/dcsevl.f, cruft/slatec-fn/derf.f,
cruft/slatec-fn/derfc.in.f, cruft/slatec-fn/dgami.f, cruft/slatec-fn/dgamit.f,
cruft/slatec-fn/dgamlm.f, cruft/slatec-fn/dgamma.f, cruft/slatec-fn/dgamr.f,
cruft/slatec-fn/dlbeta.f, cruft/slatec-fn/dlgams.f, cruft/slatec-fn/dlngam.f,
cruft/slatec-fn/dlnrel.f, cruft/slatec-fn/dpchim.f, cruft/slatec-fn/dpchst.f,
cruft/slatec-fn/erf.f, cruft/slatec-fn/erfc.in.f, cruft/slatec-fn/gami.f,
cruft/slatec-fn/gamit.f, cruft/slatec-fn/gamlim.f, cruft/slatec-fn/gamma.f,
cruft/slatec-fn/gamr.f, cruft/slatec-fn/initds.f, cruft/slatec-fn/inits.f,
cruft/slatec-fn/module.mk, cruft/slatec-fn/pchim.f, cruft/slatec-fn/pchst.f,
cruft/slatec-fn/r9gmit.f, cruft/slatec-fn/r9lgic.f, cruft/slatec-fn/r9lgit.f,
cruft/slatec-fn/r9lgmc.f, cruft/slatec-fn/xacosh.f, cruft/slatec-fn/xasinh.f,
cruft/slatec-fn/xatanh.f, cruft/slatec-fn/xbetai.f, cruft/slatec-fn/xdacosh.f,
cruft/slatec-fn/xdasinh.f, cruft/slatec-fn/xdatanh.f,
cruft/slatec-fn/xdbetai.f, cruft/slatec-fn/xderf.f, cruft/slatec-fn/xderfc.f,
cruft/slatec-fn/xdgami.f, cruft/slatec-fn/xdgamit.f, cruft/slatec-fn/xdgamma.f,
cruft/slatec-fn/xerf.f, cruft/slatec-fn/xerfc.f, cruft/slatec-fn/xgamma.f,
cruft/slatec-fn/xgmainc.f, cruft/slatec-fn/xsgmainc.f:
Moved from top-level libcruft to cruft directory below liboctave.
* numeric/CmplxAEPBAL.cc, numeric/CmplxAEPBAL.h, numeric/CmplxCHOL.cc,
numeric/CmplxCHOL.h, numeric/CmplxGEPBAL.cc, numeric/CmplxGEPBAL.h,
numeric/CmplxHESS.cc, numeric/CmplxHESS.h, numeric/CmplxLU.cc,
numeric/CmplxLU.h, numeric/CmplxQR.cc, numeric/CmplxQR.h, numeric/CmplxQRP.cc,
numeric/CmplxQRP.h, numeric/CmplxSCHUR.cc, numeric/CmplxSCHUR.h,
numeric/CmplxSVD.cc, numeric/CmplxSVD.h, numeric/CollocWt.cc,
numeric/CollocWt.h, numeric/DAE.h, numeric/DAEFunc.h, numeric/DAERT.h,
numeric/DAERTFunc.h, numeric/DASPK-opts.in, numeric/DASPK.cc, numeric/DASPK.h,
numeric/DASRT-opts.in, numeric/DASRT.cc, numeric/DASRT.h,
numeric/DASSL-opts.in, numeric/DASSL.cc, numeric/DASSL.h, numeric/DET.h,
numeric/EIG.cc, numeric/EIG.h, numeric/LSODE-opts.in, numeric/LSODE.cc,
numeric/LSODE.h, numeric/ODE.h, numeric/ODEFunc.h, numeric/ODES.cc,
numeric/ODES.h, numeric/ODESFunc.h, numeric/Quad-opts.in, numeric/Quad.cc,
numeric/Quad.h, numeric/SparseCmplxCHOL.cc, numeric/SparseCmplxCHOL.h,
numeric/SparseCmplxLU.cc, numeric/SparseCmplxLU.h, numeric/SparseCmplxQR.cc,
numeric/SparseCmplxQR.h, numeric/SparseQR.cc, numeric/SparseQR.h,
numeric/SparsedbleCHOL.cc, numeric/SparsedbleCHOL.h, numeric/SparsedbleLU.cc,
numeric/SparsedbleLU.h, numeric/base-aepbal.h, numeric/base-dae.h,
numeric/base-de.h, numeric/base-lu.cc, numeric/base-lu.h, numeric/base-min.h,
numeric/base-qr.cc, numeric/base-qr.h, numeric/bsxfun-decl.h,
numeric/bsxfun-defs.cc, numeric/bsxfun.h, numeric/dbleAEPBAL.cc,
numeric/dbleAEPBAL.h, numeric/dbleCHOL.cc, numeric/dbleCHOL.h,
numeric/dbleGEPBAL.cc, numeric/dbleGEPBAL.h, numeric/dbleHESS.cc,
numeric/dbleHESS.h, numeric/dbleLU.cc, numeric/dbleLU.h, numeric/dbleQR.cc,
numeric/dbleQR.h, numeric/dbleQRP.cc, numeric/dbleQRP.h, numeric/dbleSCHUR.cc,
numeric/dbleSCHUR.h, numeric/dbleSVD.cc, numeric/dbleSVD.h,
numeric/eigs-base.cc, numeric/fCmplxAEPBAL.cc, numeric/fCmplxAEPBAL.h,
numeric/fCmplxCHOL.cc, numeric/fCmplxCHOL.h, numeric/fCmplxGEPBAL.cc,
numeric/fCmplxGEPBAL.h, numeric/fCmplxHESS.cc, numeric/fCmplxHESS.h,
numeric/fCmplxLU.cc, numeric/fCmplxLU.h, numeric/fCmplxQR.cc,
numeric/fCmplxQR.h, numeric/fCmplxQRP.cc, numeric/fCmplxQRP.h,
numeric/fCmplxSCHUR.cc, numeric/fCmplxSCHUR.h, numeric/fCmplxSVD.cc,
numeric/fCmplxSVD.h, numeric/fEIG.cc, numeric/fEIG.h, numeric/floatAEPBAL.cc,
numeric/floatAEPBAL.h, numeric/floatCHOL.cc, numeric/floatCHOL.h,
numeric/floatGEPBAL.cc, numeric/floatGEPBAL.h, numeric/floatHESS.cc,
numeric/floatHESS.h, numeric/floatLU.cc, numeric/floatLU.h, numeric/floatQR.cc,
numeric/floatQR.h, numeric/floatQRP.cc, numeric/floatQRP.h,
numeric/floatSCHUR.cc, numeric/floatSCHUR.h, numeric/floatSVD.cc,
numeric/floatSVD.h, numeric/lo-mappers.cc, numeric/lo-mappers.h,
numeric/lo-specfun.cc, numeric/lo-specfun.h, numeric/module.mk,
numeric/oct-convn.cc, numeric/oct-convn.h, numeric/oct-fftw.cc,
numeric/oct-fftw.h, numeric/oct-norm.cc, numeric/oct-norm.h,
numeric/oct-rand.cc, numeric/oct-rand.h, numeric/oct-spparms.cc,
numeric/oct-spparms.h, numeric/randgamma.c, numeric/randgamma.h,
numeric/randmtzig.c, numeric/randmtzig.h, numeric/randpoisson.c,
numeric/randpoisson.h, numeric/sparse-base-chol.cc, numeric/sparse-base-chol.h,
numeric/sparse-base-lu.cc, numeric/sparse-base-lu.h, numeric/sparse-dmsolve.cc:
Moved from liboctave dir to numeric subdirectory.
* operators/Sparse-diag-op-defs.h, operators/Sparse-op-defs.h,
operators/Sparse-perm-op-defs.h, operators/config-ops.sh, operators/mk-ops.awk,
operators/module.mk, operators/mx-base.h, operators/mx-defs.h,
operators/mx-ext.h, operators/mx-inlines.cc, operators/mx-op-decl.h,
operators/mx-op-defs.h, operators/mx-ops, operators/sparse-mk-ops.awk,
operators/sparse-mx-ops, operators/vx-ops:
Moved from liboctave dir to operators subdirectory.
* system/dir-ops.cc, system/dir-ops.h, system/file-ops.cc, system/file-ops.h,
system/file-stat.cc, system/file-stat.h, system/lo-sysdep.cc,
system/lo-sysdep.h, system/mach-info.cc, system/mach-info.h, system/module.mk,
system/oct-env.cc, system/oct-env.h, system/oct-group.cc, system/oct-group.h,
system/oct-openmp.h, system/oct-passwd.cc, system/oct-passwd.h,
system/oct-syscalls.cc, system/oct-syscalls.h, system/oct-time.cc,
system/oct-time.h, system/oct-uname.cc, system/oct-uname.h, system/pathlen.h,
system/sysdir.h, system/syswait.h, system/tempnam.c, system/tempname.c:
Moved from liboctave dir to system subdirectory.
* util/base-list.h, util/byte-swap.h, util/caseless-str.h, util/cmd-edit.cc,
util/cmd-edit.h, util/cmd-hist.cc, util/cmd-hist.h, util/data-conv.cc,
util/data-conv.h, util/f2c-main.c, util/functor.h, util/glob-match.cc,
util/glob-match.h, util/kpse.cc, util/lo-array-gripes.cc,
util/lo-array-gripes.h, util/lo-cieee.c, util/lo-cutils.c, util/lo-cutils.h,
util/lo-ieee.cc, util/lo-ieee.h, util/lo-macros.h, util/lo-math.h,
util/lo-traits.h, util/lo-utils.cc, util/lo-utils.h, util/module.mk,
util/oct-alloc.cc, util/oct-alloc.h, util/oct-base64.cc, util/oct-base64.h,
util/oct-binmap.h, util/oct-cmplx.h, util/oct-glob.cc, util/oct-glob.h,
util/oct-inttypes.cc, util/oct-inttypes.h, util/oct-locbuf.cc,
util/oct-locbuf.h, util/oct-md5.cc, util/oct-md5.h, util/oct-mem.h,
util/oct-mutex.cc, util/oct-mutex.h, util/oct-refcount.h, util/oct-rl-edit.c,
util/oct-rl-edit.h, util/oct-rl-hist.c, util/oct-rl-hist.h, util/oct-shlib.cc,
util/oct-shlib.h, util/oct-sort.cc, util/oct-sort.h, util/oct-sparse.h,
util/pathsearch.cc, util/pathsearch.h, util/regexp.cc, util/regexp.h,
util/singleton-cleanup.cc, util/singleton-cleanup.h, util/sparse-sort.cc,
util/sparse-sort.h, util/sparse-util.cc, util/sparse-util.h, util/statdefs.h,
util/str-vec.cc, util/str-vec.h, util/sun-utils.h:
Moved from liboctave dir to util subdirectory.
* Makefile.am: Eliminate reference to top-level liboctave directory.
* autogen.sh: cd to new liboctave/operators directory to run config-ops.sh.
* build-aux/common.mk: Eliminate LIBCRUFT references.
* configure.ac: Eliminate libcruft top-level references. Switch test
programs to find files in liboctave/cruft subdirectory.
* OctaveFAQ.texi, install.txi, mkoctfile.1: Eliminate references to libcruft in
docs.
* libgui/src/Makefile.am, libinterp/Makefile.am, src/Makefile.am: Update
include file locations. Stop linking against libcruft.
* libinterp/corefcn/module.mk: Update location of OPT_INC files which are
now in numeric/ subdirectory.
* libinterp/dldfcn/config-module.awk: Stop linking against libcruft.
* libinterp/interpfcn/toplev.cc: Remove reference to LIBCRUFT.
* libinterp/link-deps.mk, liboctave/link-deps.mk:
Add GNULIB_LINK_DEPS to link dependencies.
* libinterp/oct-conf.in.h: Remove reference to OCTAVE_CONF_LIBCRUFT.
* liboctave/Makefile.am: Overhaul to use convenience libraries in
subdirectories.
* scripts/miscellaneous/mkoctfile.m: Eliminate reference to LIBCRUFT.
* src/mkoctfile.in.cc, src/mkoctfile.in.sh: Stop linking againt libcruft.
Eliminate references to LIBCRUFT.
author | Rik <rik@octave.org> |
---|---|
date | Fri, 31 Aug 2012 20:00:20 -0700 |
parents | liboctave/MatrixType.cc@e47b4e8c2714 |
children |
line wrap: on
line source
/* Copyright (C) 2006-2012 David Bateman Copyright (C) 2006 Andy Adler Copyright (C) 2009 VZLU Prague This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <vector> #include "MatrixType.h" #include "dMatrix.h" #include "CMatrix.h" #include "dSparse.h" #include "CSparse.h" #include "oct-spparms.h" #include "oct-locbuf.h" // FIXME There is a large code duplication here MatrixType::MatrixType (void) : typ (MatrixType::Unknown), sp_bandden (octave_sparse_params::get_bandden ()), bandden (0), upper_band (0), lower_band (0), dense (false), full (false), nperm (0), perm (0) { } MatrixType::MatrixType (const MatrixType &a) : typ (a.typ), sp_bandden (a.sp_bandden), bandden (a.bandden), upper_band (a.upper_band), lower_band (a.lower_band), dense (a.dense), full (a.full), nperm (a.nperm), perm (0) { if (nperm != 0) { perm = new octave_idx_type [nperm]; for (octave_idx_type i = 0; i < nperm; i++) perm[i] = a.perm[i]; } } template<class T> MatrixType::matrix_type matrix_real_probe (const MArray<T>& a) { MatrixType::matrix_type typ; octave_idx_type nrows = a.rows (); octave_idx_type ncols = a.cols (); const T zero = 0; if (ncols == nrows) { bool upper = true; bool lower = true; bool hermitian = true; // do the checks for lower/upper/hermitian all in one pass. OCTAVE_LOCAL_BUFFER (T, diag, ncols); for (octave_idx_type j = 0; j < ncols && upper; j++) { T d = a.elem (j,j); upper = upper && (d != zero); lower = lower && (d != zero); hermitian = hermitian && (d > zero); diag[j] = d; } for (octave_idx_type j = 0; j < ncols && (upper || lower || hermitian); j++) { for (octave_idx_type i = 0; i < j; i++) { double aij = a.elem (i,j), aji = a.elem (j,i); lower = lower && (aij == zero); upper = upper && (aji == zero); hermitian = hermitian && (aij == aji && aij*aij < diag[i]*diag[j]); } } if (upper) typ = MatrixType::Upper; else if (lower) typ = MatrixType::Lower; else if (hermitian) typ = MatrixType::Hermitian; else typ = MatrixType::Full; } else typ = MatrixType::Rectangular; return typ; } template<class T> MatrixType::matrix_type matrix_complex_probe (const MArray<std::complex<T> >& a) { MatrixType::matrix_type typ; octave_idx_type nrows = a.rows (); octave_idx_type ncols = a.cols (); const T zero = 0; // get the real type if (ncols == nrows) { bool upper = true; bool lower = true; bool hermitian = true; // do the checks for lower/upper/hermitian all in one pass. OCTAVE_LOCAL_BUFFER (T, diag, ncols); for (octave_idx_type j = 0; j < ncols && upper; j++) { std::complex<T> d = a.elem (j,j); upper = upper && (d != zero); lower = lower && (d != zero); hermitian = hermitian && (d.real () > zero && d.imag () == zero); diag[j] = d.real (); } for (octave_idx_type j = 0; j < ncols && (upper || lower || hermitian); j++) { for (octave_idx_type i = 0; i < j; i++) { std::complex<T> aij = a.elem (i,j), aji = a.elem (j,i); lower = lower && (aij == zero); upper = upper && (aji == zero); hermitian = hermitian && (aij == std::conj (aji) && std::norm (aij) < diag[i]*diag[j]); } } if (upper) typ = MatrixType::Upper; else if (lower) typ = MatrixType::Lower; else if (hermitian) typ = MatrixType::Hermitian; else if (ncols == nrows) typ = MatrixType::Full; } else typ = MatrixType::Rectangular; return typ; } MatrixType::MatrixType (const Matrix &a) : typ (MatrixType::Unknown), sp_bandden (0), bandden (0), upper_band (0), lower_band (0), dense (false), full (true), nperm (0), perm (0) { typ = matrix_real_probe (a); } MatrixType::MatrixType (const ComplexMatrix &a) : typ (MatrixType::Unknown), sp_bandden (0), bandden (0), upper_band (0), lower_band (0), dense (false), full (true), nperm (0), perm (0) { typ = matrix_complex_probe (a); } MatrixType::MatrixType (const FloatMatrix &a) : typ (MatrixType::Unknown), sp_bandden (0), bandden (0), upper_band (0), lower_band (0), dense (false), full (true), nperm (0), perm (0) { typ = matrix_real_probe (a); } MatrixType::MatrixType (const FloatComplexMatrix &a) : typ (MatrixType::Unknown), sp_bandden (0), bandden (0), upper_band (0), lower_band (0), dense (false), full (true), nperm (0), perm (0) { typ = matrix_complex_probe (a); } MatrixType::MatrixType (const SparseMatrix &a) : typ (MatrixType::Unknown), sp_bandden (0), bandden (0), upper_band (0), lower_band (0), dense (false), full (false), nperm (0), perm (0) { octave_idx_type nrows = a.rows (); octave_idx_type ncols = a.cols (); octave_idx_type nm = (ncols < nrows ? ncols : nrows); octave_idx_type nnz = a.nnz (); if (octave_sparse_params::get_key ("spumoni") != 0.) (*current_liboctave_warning_handler) ("Calculating Sparse Matrix Type"); sp_bandden = octave_sparse_params::get_bandden (); bool maybe_hermitian = false; typ = MatrixType::Full; if (nnz == nm) { matrix_type tmp_typ = MatrixType::Diagonal; octave_idx_type i; // Maybe the matrix is diagonal for (i = 0; i < nm; i++) { if (a.cidx (i+1) != a.cidx (i) + 1) { tmp_typ = MatrixType::Full; break; } if (a.ridx (i) != i) { tmp_typ = MatrixType::Permuted_Diagonal; break; } } if (tmp_typ == MatrixType::Permuted_Diagonal) { std::vector<bool> found (nrows); for (octave_idx_type j = 0; j < i; j++) found[j] = true; for (octave_idx_type j = i; j < nrows; j++) found[j] = false; for (octave_idx_type j = i; j < nm; j++) { if ((a.cidx (j+1) > a.cidx (j) + 1) || ((a.cidx (j+1) == a.cidx (j) + 1) && found[a.ridx (j)])) { tmp_typ = MatrixType::Full; break; } found[a.ridx (j)] = true; } } typ = tmp_typ; } if (typ == MatrixType::Full) { // Search for banded, upper and lower triangular matrices bool singular = false; upper_band = 0; lower_band = 0; for (octave_idx_type j = 0; j < ncols; j++) { bool zero_on_diagonal = false; if (j < nrows) { zero_on_diagonal = true; for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) if (a.ridx (i) == j) { zero_on_diagonal = false; break; } } if (zero_on_diagonal) { singular = true; break; } if (a.cidx (j+1) != a.cidx (j)) { octave_idx_type ru = a.ridx (a.cidx (j)); octave_idx_type rl = a.ridx (a.cidx (j+1)-1); if (j - ru > upper_band) upper_band = j - ru; if (rl - j > lower_band) lower_band = rl - j; } } if (!singular) { bandden = double (nnz) / (double (ncols) * (double (lower_band) + double (upper_band)) - 0.5 * double (upper_band + 1) * double (upper_band) - 0.5 * double (lower_band + 1) * double (lower_band)); if (nrows == ncols && sp_bandden != 1. && bandden > sp_bandden) { if (upper_band == 1 && lower_band == 1) typ = MatrixType::Tridiagonal; else typ = MatrixType::Banded; octave_idx_type nnz_in_band = (upper_band + lower_band + 1) * nrows - (1 + upper_band) * upper_band / 2 - (1 + lower_band) * lower_band / 2; if (nnz_in_band == nnz) dense = true; else dense = false; } else if (upper_band == 0) typ = MatrixType::Lower; else if (lower_band == 0) typ = MatrixType::Upper; if (upper_band == lower_band && nrows == ncols) maybe_hermitian = true; } if (typ == MatrixType::Full) { // Search for a permuted triangular matrix, and test if // permutation is singular // FIXME // Perhaps this should be based on a dmperm algorithm bool found = false; nperm = ncols; perm = new octave_idx_type [ncols]; for (octave_idx_type i = 0; i < ncols; i++) perm[i] = -1; for (octave_idx_type i = 0; i < nm; i++) { found = false; for (octave_idx_type j = 0; j < ncols; j++) { if ((a.cidx (j+1) - a.cidx (j)) > 0 && (a.ridx (a.cidx (j+1)-1) == i)) { perm[i] = j; found = true; break; } } if (!found) break; } if (found) { typ = MatrixType::Permuted_Upper; if (ncols > nrows) { octave_idx_type k = nrows; for (octave_idx_type i = 0; i < ncols; i++) if (perm[i] == -1) perm[i] = k++; } } else if (a.cidx (nm) == a.cidx (ncols)) { nperm = nrows; delete [] perm; perm = new octave_idx_type [nrows]; OCTAVE_LOCAL_BUFFER (octave_idx_type, tmp, nrows); for (octave_idx_type i = 0; i < nrows; i++) { perm[i] = -1; tmp[i] = -1; } for (octave_idx_type j = 0; j < ncols; j++) for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) perm[a.ridx (i)] = j; found = true; for (octave_idx_type i = 0; i < nm; i++) if (perm[i] == -1) { found = false; break; } else { tmp[perm[i]] = 1; } if (found) { octave_idx_type k = ncols; for (octave_idx_type i = 0; i < nrows; i++) { if (tmp[i] == -1) { if (k < nrows) { perm[k++] = i; } else { found = false; break; } } } } if (found) typ = MatrixType::Permuted_Lower; else { delete [] perm; nperm = 0; } } else { delete [] perm; nperm = 0; } } // FIXME // Disable lower under-determined and upper over-determined problems // as being detected, and force to treat as singular. As this seems // to cause issues if (((typ == MatrixType::Lower || typ == MatrixType::Permuted_Lower) && nrows > ncols) || ((typ == MatrixType::Upper || typ == MatrixType::Permuted_Upper) && nrows < ncols)) { if (typ == MatrixType::Permuted_Upper || typ == MatrixType::Permuted_Lower) delete [] perm; nperm = 0; typ = MatrixType::Rectangular; } if (typ == MatrixType::Full && ncols != nrows) typ = MatrixType::Rectangular; if (maybe_hermitian && (typ == MatrixType::Full || typ == MatrixType::Tridiagonal || typ == MatrixType::Banded)) { bool is_herm = true; // first, check whether the diagonal is positive & extract it ColumnVector diag (ncols); for (octave_idx_type j = 0; is_herm && j < ncols; j++) { is_herm = false; for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) { if (a.ridx (i) == j) { double d = a.data (i); is_herm = d > 0.; diag(j) = d; break; } } } // next, check symmetry and 2x2 positiveness for (octave_idx_type j = 0; is_herm && j < ncols; j++) for (octave_idx_type i = a.cidx (j); is_herm && i < a.cidx (j+1); i++) { octave_idx_type k = a.ridx (i); is_herm = k == j; if (is_herm) continue; double d = a.data (i); if (d*d < diag(j)*diag(k)) { for (octave_idx_type l = a.cidx (k); l < a.cidx (k+1); l++) { if (a.ridx (l) == j) { is_herm = a.data (l) == d; break; } } } } if (is_herm) { if (typ == MatrixType::Full) typ = MatrixType::Hermitian; else if (typ == MatrixType::Banded) typ = MatrixType::Banded_Hermitian; else typ = MatrixType::Tridiagonal_Hermitian; } } } } MatrixType::MatrixType (const SparseComplexMatrix &a) : typ (MatrixType::Unknown), sp_bandden (0), bandden (0), upper_band (0), lower_band (0), dense (false), full (false), nperm (0), perm (0) { octave_idx_type nrows = a.rows (); octave_idx_type ncols = a.cols (); octave_idx_type nm = (ncols < nrows ? ncols : nrows); octave_idx_type nnz = a.nnz (); if (octave_sparse_params::get_key ("spumoni") != 0.) (*current_liboctave_warning_handler) ("Calculating Sparse Matrix Type"); sp_bandden = octave_sparse_params::get_bandden (); bool maybe_hermitian = false; typ = MatrixType::Full; if (nnz == nm) { matrix_type tmp_typ = MatrixType::Diagonal; octave_idx_type i; // Maybe the matrix is diagonal for (i = 0; i < nm; i++) { if (a.cidx (i+1) != a.cidx (i) + 1) { tmp_typ = MatrixType::Full; break; } if (a.ridx (i) != i) { tmp_typ = MatrixType::Permuted_Diagonal; break; } } if (tmp_typ == MatrixType::Permuted_Diagonal) { std::vector<bool> found (nrows); for (octave_idx_type j = 0; j < i; j++) found[j] = true; for (octave_idx_type j = i; j < nrows; j++) found[j] = false; for (octave_idx_type j = i; j < nm; j++) { if ((a.cidx (j+1) > a.cidx (j) + 1) || ((a.cidx (j+1) == a.cidx (j) + 1) && found[a.ridx (j)])) { tmp_typ = MatrixType::Full; break; } found[a.ridx (j)] = true; } } typ = tmp_typ; } if (typ == MatrixType::Full) { // Search for banded, upper and lower triangular matrices bool singular = false; upper_band = 0; lower_band = 0; for (octave_idx_type j = 0; j < ncols; j++) { bool zero_on_diagonal = false; if (j < nrows) { zero_on_diagonal = true; for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) if (a.ridx (i) == j) { zero_on_diagonal = false; break; } } if (zero_on_diagonal) { singular = true; break; } if (a.cidx (j+1) != a.cidx (j)) { octave_idx_type ru = a.ridx (a.cidx (j)); octave_idx_type rl = a.ridx (a.cidx (j+1)-1); if (j - ru > upper_band) upper_band = j - ru; if (rl - j > lower_band) lower_band = rl - j; } } if (!singular) { bandden = double (nnz) / (double (ncols) * (double (lower_band) + double (upper_band)) - 0.5 * double (upper_band + 1) * double (upper_band) - 0.5 * double (lower_band + 1) * double (lower_band)); if (nrows == ncols && sp_bandden != 1. && bandden > sp_bandden) { if (upper_band == 1 && lower_band == 1) typ = MatrixType::Tridiagonal; else typ = MatrixType::Banded; octave_idx_type nnz_in_band = (upper_band + lower_band + 1) * nrows - (1 + upper_band) * upper_band / 2 - (1 + lower_band) * lower_band / 2; if (nnz_in_band == nnz) dense = true; else dense = false; } else if (upper_band == 0) typ = MatrixType::Lower; else if (lower_band == 0) typ = MatrixType::Upper; if (upper_band == lower_band && nrows == ncols) maybe_hermitian = true; } if (typ == MatrixType::Full) { // Search for a permuted triangular matrix, and test if // permutation is singular // FIXME // Perhaps this should be based on a dmperm algorithm bool found = false; nperm = ncols; perm = new octave_idx_type [ncols]; for (octave_idx_type i = 0; i < ncols; i++) perm[i] = -1; for (octave_idx_type i = 0; i < nm; i++) { found = false; for (octave_idx_type j = 0; j < ncols; j++) { if ((a.cidx (j+1) - a.cidx (j)) > 0 && (a.ridx (a.cidx (j+1)-1) == i)) { perm[i] = j; found = true; break; } } if (!found) break; } if (found) { typ = MatrixType::Permuted_Upper; if (ncols > nrows) { octave_idx_type k = nrows; for (octave_idx_type i = 0; i < ncols; i++) if (perm[i] == -1) perm[i] = k++; } } else if (a.cidx (nm) == a.cidx (ncols)) { nperm = nrows; delete [] perm; perm = new octave_idx_type [nrows]; OCTAVE_LOCAL_BUFFER (octave_idx_type, tmp, nrows); for (octave_idx_type i = 0; i < nrows; i++) { perm[i] = -1; tmp[i] = -1; } for (octave_idx_type j = 0; j < ncols; j++) for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) perm[a.ridx (i)] = j; found = true; for (octave_idx_type i = 0; i < nm; i++) if (perm[i] == -1) { found = false; break; } else { tmp[perm[i]] = 1; } if (found) { octave_idx_type k = ncols; for (octave_idx_type i = 0; i < nrows; i++) { if (tmp[i] == -1) { if (k < nrows) { perm[k++] = i; } else { found = false; break; } } } } if (found) typ = MatrixType::Permuted_Lower; else { delete [] perm; nperm = 0; } } else { delete [] perm; nperm = 0; } } // FIXME // Disable lower under-determined and upper over-determined problems // as being detected, and force to treat as singular. As this seems // to cause issues if (((typ == MatrixType::Lower || typ == MatrixType::Permuted_Lower) && nrows > ncols) || ((typ == MatrixType::Upper || typ == MatrixType::Permuted_Upper) && nrows < ncols)) { if (typ == MatrixType::Permuted_Upper || typ == MatrixType::Permuted_Lower) delete [] perm; nperm = 0; typ = MatrixType::Rectangular; } if (typ == MatrixType::Full && ncols != nrows) typ = MatrixType::Rectangular; if (maybe_hermitian && (typ == MatrixType::Full || typ == MatrixType::Tridiagonal || typ == MatrixType::Banded)) { bool is_herm = true; // first, check whether the diagonal is positive & extract it ColumnVector diag (ncols); for (octave_idx_type j = 0; is_herm && j < ncols; j++) { is_herm = false; for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++) { if (a.ridx (i) == j) { Complex d = a.data (i); is_herm = d.real () > 0. && d.imag () == 0.; diag(j) = d.real (); break; } } } // next, check symmetry and 2x2 positiveness for (octave_idx_type j = 0; is_herm && j < ncols; j++) for (octave_idx_type i = a.cidx (j); is_herm && i < a.cidx (j+1); i++) { octave_idx_type k = a.ridx (i); is_herm = k == j; if (is_herm) continue; Complex d = a.data (i); if (std::norm (d) < diag(j)*diag(k)) { d = std::conj (d); for (octave_idx_type l = a.cidx (k); l < a.cidx (k+1); l++) { if (a.ridx (l) == j) { is_herm = a.data (l) == d; break; } } } } if (is_herm) { if (typ == MatrixType::Full) typ = MatrixType::Hermitian; else if (typ == MatrixType::Banded) typ = MatrixType::Banded_Hermitian; else typ = MatrixType::Tridiagonal_Hermitian; } } } } MatrixType::MatrixType (const matrix_type t, bool _full) : typ (MatrixType::Unknown), sp_bandden (octave_sparse_params::get_bandden ()), bandden (0), upper_band (0), lower_band (0), dense (false), full (_full), nperm (0), perm (0) { if (t == MatrixType::Unknown || t == MatrixType::Full || t == MatrixType::Diagonal || t == MatrixType::Permuted_Diagonal || t == MatrixType::Upper || t == MatrixType::Lower || t == MatrixType::Tridiagonal || t == MatrixType::Tridiagonal_Hermitian || t == MatrixType::Rectangular) typ = t; else (*current_liboctave_warning_handler) ("Invalid matrix type"); } MatrixType::MatrixType (const matrix_type t, const octave_idx_type np, const octave_idx_type *p, bool _full) : typ (MatrixType::Unknown), sp_bandden (octave_sparse_params::get_bandden ()), bandden (0), upper_band (0), lower_band (0), dense (false), full (_full), nperm (0), perm (0) { if ((t == MatrixType::Permuted_Upper || t == MatrixType::Permuted_Lower) && np > 0 && p != 0) { typ = t; nperm = np; perm = new octave_idx_type [nperm]; for (octave_idx_type i = 0; i < nperm; i++) perm[i] = p[i]; } else (*current_liboctave_warning_handler) ("Invalid matrix type"); } MatrixType::MatrixType (const matrix_type t, const octave_idx_type ku, const octave_idx_type kl, bool _full) : typ (MatrixType::Unknown), sp_bandden (octave_sparse_params::get_bandden ()), bandden (0), upper_band (0), lower_band (0), dense (false), full (_full), nperm (0), perm (0) { if (t == MatrixType::Banded || t == MatrixType::Banded_Hermitian) { typ = t; upper_band = ku; lower_band = kl; } else (*current_liboctave_warning_handler) ("Invalid sparse matrix type"); } MatrixType::~MatrixType (void) { if (nperm != 0) { delete [] perm; } } MatrixType& MatrixType::operator = (const MatrixType& a) { if (this != &a) { typ = a.typ; sp_bandden = a.sp_bandden; bandden = a.bandden; upper_band = a.upper_band; lower_band = a.lower_band; dense = a.dense; full = a.full; if (nperm) { delete[] perm; } if (a.nperm != 0) { perm = new octave_idx_type [a.nperm]; for (octave_idx_type i = 0; i < a.nperm; i++) perm[i] = a.perm[i]; } nperm = a.nperm; } return *this; } int MatrixType::type (bool quiet) { if (typ != MatrixType::Unknown && (full || sp_bandden == octave_sparse_params::get_bandden ())) { if (!quiet && octave_sparse_params::get_key ("spumoni") != 0.) (*current_liboctave_warning_handler) ("Using Cached Matrix Type"); return typ; } if (typ != MatrixType::Unknown && octave_sparse_params::get_key ("spumoni") != 0.) (*current_liboctave_warning_handler) ("Invalidating Matrix Type"); typ = MatrixType::Unknown; return typ; } int MatrixType::type (const SparseMatrix &a) { if (typ != MatrixType::Unknown && (full || sp_bandden == octave_sparse_params::get_bandden ())) { if (octave_sparse_params::get_key ("spumoni") != 0.) (*current_liboctave_warning_handler) ("Using Cached Matrix Type"); return typ; } MatrixType tmp_typ (a); typ = tmp_typ.typ; sp_bandden = tmp_typ.sp_bandden; bandden = tmp_typ.bandden; upper_band = tmp_typ.upper_band; lower_band = tmp_typ.lower_band; dense = tmp_typ.dense; full = tmp_typ.full; nperm = tmp_typ.nperm; if (nperm != 0) { perm = new octave_idx_type [nperm]; for (octave_idx_type i = 0; i < nperm; i++) perm[i] = tmp_typ.perm[i]; } return typ; } int MatrixType::type (const SparseComplexMatrix &a) { if (typ != MatrixType::Unknown && (full || sp_bandden == octave_sparse_params::get_bandden ())) { if (octave_sparse_params::get_key ("spumoni") != 0.) (*current_liboctave_warning_handler) ("Using Cached Matrix Type"); return typ; } MatrixType tmp_typ (a); typ = tmp_typ.typ; sp_bandden = tmp_typ.sp_bandden; bandden = tmp_typ.bandden; upper_band = tmp_typ.upper_band; lower_band = tmp_typ.lower_band; dense = tmp_typ.dense; full = tmp_typ.full; nperm = tmp_typ.nperm; if (nperm != 0) { perm = new octave_idx_type [nperm]; for (octave_idx_type i = 0; i < nperm; i++) perm[i] = tmp_typ.perm[i]; } return typ; } int MatrixType::type (const Matrix &a) { if (typ != MatrixType::Unknown) { if (octave_sparse_params::get_key ("spumoni") != 0.) (*current_liboctave_warning_handler) ("Using Cached Matrix Type"); return typ; } MatrixType tmp_typ (a); typ = tmp_typ.typ; full = tmp_typ.full; nperm = tmp_typ.nperm; if (nperm != 0) { perm = new octave_idx_type [nperm]; for (octave_idx_type i = 0; i < nperm; i++) perm[i] = tmp_typ.perm[i]; } return typ; } int MatrixType::type (const ComplexMatrix &a) { if (typ != MatrixType::Unknown) { if (octave_sparse_params::get_key ("spumoni") != 0.) (*current_liboctave_warning_handler) ("Using Cached Matrix Type"); return typ; } MatrixType tmp_typ (a); typ = tmp_typ.typ; full = tmp_typ.full; nperm = tmp_typ.nperm; if (nperm != 0) { perm = new octave_idx_type [nperm]; for (octave_idx_type i = 0; i < nperm; i++) perm[i] = tmp_typ.perm[i]; } return typ; } int MatrixType::type (const FloatMatrix &a) { if (typ != MatrixType::Unknown) { if (octave_sparse_params::get_key ("spumoni") != 0.) (*current_liboctave_warning_handler) ("Using Cached Matrix Type"); return typ; } MatrixType tmp_typ (a); typ = tmp_typ.typ; full = tmp_typ.full; nperm = tmp_typ.nperm; if (nperm != 0) { perm = new octave_idx_type [nperm]; for (octave_idx_type i = 0; i < nperm; i++) perm[i] = tmp_typ.perm[i]; } return typ; } int MatrixType::type (const FloatComplexMatrix &a) { if (typ != MatrixType::Unknown) { if (octave_sparse_params::get_key ("spumoni") != 0.) (*current_liboctave_warning_handler) ("Using Cached Matrix Type"); return typ; } MatrixType tmp_typ (a); typ = tmp_typ.typ; full = tmp_typ.full; nperm = tmp_typ.nperm; if (nperm != 0) { perm = new octave_idx_type [nperm]; for (octave_idx_type i = 0; i < nperm; i++) perm[i] = tmp_typ.perm[i]; } return typ; } void MatrixType::info () const { if (octave_sparse_params::get_key ("spumoni") != 0.) { if (typ == MatrixType::Unknown) (*current_liboctave_warning_handler) ("Unknown Matrix Type"); else if (typ == MatrixType::Diagonal) (*current_liboctave_warning_handler) ("Diagonal Sparse Matrix"); else if (typ == MatrixType::Permuted_Diagonal) (*current_liboctave_warning_handler) ("Permuted Diagonal Sparse Matrix"); else if (typ == MatrixType::Upper) (*current_liboctave_warning_handler) ("Upper Triangular Matrix"); else if (typ == MatrixType::Lower) (*current_liboctave_warning_handler) ("Lower Triangular Matrix"); else if (typ == MatrixType::Permuted_Upper) (*current_liboctave_warning_handler) ("Permuted Upper Triangular Matrix"); else if (typ == MatrixType::Permuted_Lower) (*current_liboctave_warning_handler) ("Permuted Lower Triangular Matrix"); else if (typ == MatrixType::Banded) (*current_liboctave_warning_handler) ("Banded Sparse Matrix %d-1-%d (Density %f)", lower_band, upper_band, bandden); else if (typ == MatrixType::Banded_Hermitian) (*current_liboctave_warning_handler) ("Banded Hermitian/Symmetric Sparse Matrix %d-1-%d (Density %f)", lower_band, upper_band, bandden); else if (typ == MatrixType::Hermitian) (*current_liboctave_warning_handler) ("Hermitian/Symmetric Matrix"); else if (typ == MatrixType::Tridiagonal) (*current_liboctave_warning_handler) ("Tridiagonal Sparse Matrix"); else if (typ == MatrixType::Tridiagonal_Hermitian) (*current_liboctave_warning_handler) ("Hermitian/Symmetric Tridiagonal Sparse Matrix"); else if (typ == MatrixType::Rectangular) (*current_liboctave_warning_handler) ("Rectangular/Singular Matrix"); else if (typ == MatrixType::Full) (*current_liboctave_warning_handler) ("Full Matrix"); } } void MatrixType::mark_as_symmetric (void) { if (typ == MatrixType::Tridiagonal || typ == MatrixType::Tridiagonal_Hermitian) typ = MatrixType::Tridiagonal_Hermitian; else if (typ == MatrixType::Banded || typ == MatrixType::Banded_Hermitian) typ = MatrixType::Banded_Hermitian; else if (typ == MatrixType::Full || typ == MatrixType::Hermitian || typ == MatrixType::Unknown) typ = MatrixType::Hermitian; else (*current_liboctave_error_handler) ("Can not mark current matrix type as symmetric"); } void MatrixType::mark_as_unsymmetric (void) { if (typ == MatrixType::Tridiagonal || typ == MatrixType::Tridiagonal_Hermitian) typ = MatrixType::Tridiagonal; else if (typ == MatrixType::Banded || typ == MatrixType::Banded_Hermitian) typ = MatrixType::Banded; else if (typ == MatrixType::Full || typ == MatrixType::Hermitian || typ == MatrixType::Unknown) typ = MatrixType::Full; } void MatrixType::mark_as_permuted (const octave_idx_type np, const octave_idx_type *p) { nperm = np; perm = new octave_idx_type [nperm]; for (octave_idx_type i = 0; i < nperm; i++) perm[i] = p[i]; if (typ == MatrixType::Diagonal || typ == MatrixType::Permuted_Diagonal) typ = MatrixType::Permuted_Diagonal; else if (typ == MatrixType::Upper || typ == MatrixType::Permuted_Upper) typ = MatrixType::Permuted_Upper; else if (typ == MatrixType::Lower || typ == MatrixType::Permuted_Lower) typ = MatrixType::Permuted_Lower; else (*current_liboctave_error_handler) ("Can not mark current matrix type as symmetric"); } void MatrixType::mark_as_unpermuted (void) { if (nperm) { nperm = 0; delete [] perm; } if (typ == MatrixType::Diagonal || typ == MatrixType::Permuted_Diagonal) typ = MatrixType::Diagonal; else if (typ == MatrixType::Upper || typ == MatrixType::Permuted_Upper) typ = MatrixType::Upper; else if (typ == MatrixType::Lower || typ == MatrixType::Permuted_Lower) typ = MatrixType::Lower; } MatrixType MatrixType::transpose (void) const { MatrixType retval (*this); if (typ == MatrixType::Upper) retval.typ = MatrixType::Lower; else if (typ == MatrixType::Permuted_Upper) retval.typ = MatrixType::Permuted_Lower; else if (typ == MatrixType::Lower) retval.typ = MatrixType::Upper; else if (typ == MatrixType::Permuted_Lower) retval.typ = MatrixType::Permuted_Upper; else if (typ == MatrixType::Banded) { retval.upper_band = lower_band; retval.lower_band = upper_band; } return retval; }