octave-nkf: liboctave/array/MatrixType.cc annotate

annotate 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	d63878346099

rev	line source
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1 /*
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	2
14138 72c96de7a403 maint: update copyright notices for 2012 John W. Eaton <jwe@octave.org> parents: 14097 diff changeset	3 Copyright (C) 2006-2012 David Bateman
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	4 Copyright (C) 2006 Andy Adler
10521 4d1fc073fbb7 add some missing copyright stmts Jaroslav Hajek <highegg@gmail.com> parents: 10506 diff changeset	5 Copyright (C) 2009 VZLU Prague
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	6
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6460 diff changeset	7 This file is part of Octave.
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6460 diff changeset	8
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	9 Octave is free software; you can redistribute it and/or modify it
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	10 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6460 diff changeset	11 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6460 diff changeset	12 option) any later version.
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	13
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	14 Octave is distributed in the hope that it will be useful, but WITHOUT
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	17 for more details.
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	18
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	19 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6460 diff changeset	20 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6460 diff changeset	21 <http://www.gnu.org/licenses/>.
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	22
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	23 */
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	24
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	25 #ifdef HAVE_CONFIG_H
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	26 #include <config.h>
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	27 #endif
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	28
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	29 #include <vector>
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	30
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	31 #include "MatrixType.h"
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	32 #include "dMatrix.h"
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	33 #include "CMatrix.h"
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	34 #include "dSparse.h"
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	35 #include "CSparse.h"
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	36 #include "oct-spparms.h"
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 7798 diff changeset	37 #include "oct-locbuf.h"
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	38
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	39 // FIXME There is a large code duplication here
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	40
5892 13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	41 MatrixType::MatrixType (void)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	42 : typ (MatrixType::Unknown),
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	43 sp_bandden (octave_sparse_params::get_bandden ()),
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	44 bandden (0), upper_band (0),
6452 7e90124eddba [project @ 2007-03-24 22:18:14 by dbateman] dbateman parents: 6027 diff changeset	45 lower_band (0), dense (false), full (false), nperm (0), perm (0) { }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	46
5892 13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	47 MatrixType::MatrixType (const MatrixType &a)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	48 : typ (a.typ), sp_bandden (a.sp_bandden), bandden (a.bandden),
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	49 upper_band (a.upper_band), lower_band (a.lower_band),
11501 331fcc41ca23 data member initialization fixes John W. Eaton <jwe@octave.org> parents: 10713 diff changeset	50 dense (a.dense), full (a.full), nperm (a.nperm), perm (0)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	51 {
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	52 if (nperm != 0)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	53 {
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	54 perm = new octave_idx_type [nperm];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	55 for (octave_idx_type i = 0; i < nperm; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	56 perm[i] = a.perm[i];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	57 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	58 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	59
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	60 template<class T>
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	61 MatrixType::matrix_type
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10314 diff changeset	62 matrix_real_probe (const MArray<T>& a)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	63 {
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	64 MatrixType::matrix_type typ;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	65 octave_idx_type nrows = a.rows ();
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	66 octave_idx_type ncols = a.cols ();
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	67
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	68 const T zero = 0;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	69
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	70 if (ncols == nrows)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	71 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	72 bool upper = true;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	73 bool lower = true;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	74 bool hermitian = true;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	75
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	76 // do the checks for lower/upper/hermitian all in one pass.
15022 e47b4e8c2714 maint: Use space after OCTAVE_LOCAL_BUFFER invocation in liboctave source code. Rik <rik@octave.org> parents: 15020 diff changeset	77 OCTAVE_LOCAL_BUFFER (T, diag, ncols);
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	78
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	79 for (octave_idx_type j = 0;
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	80 j < ncols && upper; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	81 {
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	82 T d = a.elem (j,j);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	83 upper = upper && (d != zero);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	84 lower = lower && (d != zero);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	85 hermitian = hermitian && (d > zero);
10713 0e05ed9f2a62 improve some MatrixType code Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	86 diag[j] = d;
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	87 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	88
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	89 for (octave_idx_type j = 0;
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	90 j < ncols && (upper \|\| lower \|\| hermitian); j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	91 {
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	92 for (octave_idx_type i = 0; i < j; i++)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	93 {
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	94 double aij = a.elem (i,j), aji = a.elem (j,i);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	95 lower = lower && (aij == zero);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	96 upper = upper && (aji == zero);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	97 hermitian = hermitian && (aij == aji
10713 0e05ed9f2a62 improve some MatrixType code Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	98 && aijaij < diag[i]diag[j]);
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	99 }
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	100 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	101
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	102 if (upper)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	103 typ = MatrixType::Upper;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	104 else if (lower)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	105 typ = MatrixType::Lower;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	106 else if (hermitian)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	107 typ = MatrixType::Hermitian;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	108 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	109 typ = MatrixType::Full;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	110 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	111 else
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	112 typ = MatrixType::Rectangular;
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	113
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	114 return typ;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	115 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	116
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	117 template<class T>
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	118 MatrixType::matrix_type
10713 0e05ed9f2a62 improve some MatrixType code Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	119 matrix_complex_probe (const MArray<std::complex<T> >& a)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	120 {
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	121 MatrixType::matrix_type typ;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	122 octave_idx_type nrows = a.rows ();
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	123 octave_idx_type ncols = a.cols ();
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	124
10713 0e05ed9f2a62 improve some MatrixType code Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	125 const T zero = 0;
0e05ed9f2a62 improve some MatrixType code Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	126 // get the real type
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	127
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	128 if (ncols == nrows)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	129 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	130 bool upper = true;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	131 bool lower = true;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	132 bool hermitian = true;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	133
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	134 // do the checks for lower/upper/hermitian all in one pass.
15022 e47b4e8c2714 maint: Use space after OCTAVE_LOCAL_BUFFER invocation in liboctave source code. Rik <rik@octave.org> parents: 15020 diff changeset	135 OCTAVE_LOCAL_BUFFER (T, diag, ncols);
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	136
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	137 for (octave_idx_type j = 0;
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	138 j < ncols && upper; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	139 {
10713 0e05ed9f2a62 improve some MatrixType code Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	140 std::complex<T> d = a.elem (j,j);
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	141 upper = upper && (d != zero);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	142 lower = lower && (d != zero);
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	143 hermitian = hermitian && (d.real () > zero && d.imag () == zero);
460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	144 diag[j] = d.real ();
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	145 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	146
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	147 for (octave_idx_type j = 0;
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	148 j < ncols && (upper \|\| lower \|\| hermitian); j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	149 {
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	150 for (octave_idx_type i = 0; i < j; i++)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	151 {
10713 0e05ed9f2a62 improve some MatrixType code Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	152 std::complex<T> aij = a.elem (i,j), aji = a.elem (j,i);
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	153 lower = lower && (aij == zero);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	154 upper = upper && (aji == zero);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	155 hermitian = hermitian && (aij == std::conj (aji)
10713 0e05ed9f2a62 improve some MatrixType code Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	156 && std::norm (aij) < diag[i]*diag[j]);
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	157 }
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	158 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	159
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	160
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	161 if (upper)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	162 typ = MatrixType::Upper;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	163 else if (lower)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	164 typ = MatrixType::Lower;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	165 else if (hermitian)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	166 typ = MatrixType::Hermitian;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	167 else if (ncols == nrows)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	168 typ = MatrixType::Full;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	169 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	170 else
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	171 typ = MatrixType::Rectangular;
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	172
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	173 return typ;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	174 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	175
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	176 MatrixType::MatrixType (const Matrix &a)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	177 : typ (MatrixType::Unknown),
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	178 sp_bandden (0), bandden (0), upper_band (0), lower_band (0),
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	179 dense (false), full (true), nperm (0), perm (0)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	180 {
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	181 typ = matrix_real_probe (a);
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	182 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	183
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	184 MatrixType::MatrixType (const ComplexMatrix &a)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	185 : typ (MatrixType::Unknown),
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	186 sp_bandden (0), bandden (0), upper_band (0), lower_band (0),
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	187 dense (false), full (true), nperm (0), perm (0)
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	188 {
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	189 typ = matrix_complex_probe (a);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	190 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	191
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	192
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	193 MatrixType::MatrixType (const FloatMatrix &a)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	194 : typ (MatrixType::Unknown),
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	195 sp_bandden (0), bandden (0), upper_band (0), lower_band (0),
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	196 dense (false), full (true), nperm (0), perm (0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	197 {
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	198 typ = matrix_real_probe (a);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	199 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	200
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	201 MatrixType::MatrixType (const FloatComplexMatrix &a)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	202 : typ (MatrixType::Unknown),
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	203 sp_bandden (0), bandden (0), upper_band (0), lower_band (0),
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	204 dense (false), full (true), nperm (0), perm (0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	205 {
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	206 typ = matrix_complex_probe (a);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	207 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	208
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	209 MatrixType::MatrixType (const SparseMatrix &a)
5892 13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	210 : typ (MatrixType::Unknown),
13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	211 sp_bandden (0), bandden (0), upper_band (0), lower_band (0),
13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	212 dense (false), full (false), nperm (0), perm (0)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	213 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	214 octave_idx_type nrows = a.rows ();
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	215 octave_idx_type ncols = a.cols ();
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	216 octave_idx_type nm = (ncols < nrows ? ncols : nrows);
10506 bdf5d85cfc5e replace nzmax by nnz where appropriate in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	217 octave_idx_type nnz = a.nnz ();
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	218
5893 d73ffe42f2c8 [project @ 2006-07-16 07:48:19 by jwe] jwe parents: 5892 diff changeset	219 if (octave_sparse_params::get_key ("spumoni") != 0.)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	220 (*current_liboctave_warning_handler)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	221 ("Calculating Sparse Matrix Type");
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	222
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	223 sp_bandden = octave_sparse_params::get_bandden ();
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	224 bool maybe_hermitian = false;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	225 typ = MatrixType::Full;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	226
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	227 if (nnz == nm)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	228 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	229 matrix_type tmp_typ = MatrixType::Diagonal;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	230 octave_idx_type i;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	231 // Maybe the matrix is diagonal
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	232 for (i = 0; i < nm; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	233 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	234 if (a.cidx (i+1) != a.cidx (i) + 1)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	235 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	236 tmp_typ = MatrixType::Full;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	237 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	238 }
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	239 if (a.ridx (i) != i)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	240 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	241 tmp_typ = MatrixType::Permuted_Diagonal;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	242 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	243 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	244 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	245
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	246 if (tmp_typ == MatrixType::Permuted_Diagonal)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	247 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	248 std::vector<bool> found (nrows);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	249
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	250 for (octave_idx_type j = 0; j < i; j++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	251 found[j] = true;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	252 for (octave_idx_type j = i; j < nrows; j++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	253 found[j] = false;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	254
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	255 for (octave_idx_type j = i; j < nm; j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	256 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	257 if ((a.cidx (j+1) > a.cidx (j) + 1) \|\|
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	258 ((a.cidx (j+1) == a.cidx (j) + 1) && found[a.ridx (j)]))
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	259 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	260 tmp_typ = MatrixType::Full;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	261 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	262 }
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	263 found[a.ridx (j)] = true;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	264 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	265 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	266 typ = tmp_typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	267 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	268
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	269 if (typ == MatrixType::Full)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	270 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	271 // Search for banded, upper and lower triangular matrices
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	272 bool singular = false;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	273 upper_band = 0;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	274 lower_band = 0;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	275 for (octave_idx_type j = 0; j < ncols; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	276 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	277 bool zero_on_diagonal = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	278 if (j < nrows)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	279 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	280 zero_on_diagonal = true;
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	281 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++)
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	282 if (a.ridx (i) == j)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	283 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	284 zero_on_diagonal = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	285 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	286 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	287 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	288
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	289 if (zero_on_diagonal)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	290 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	291 singular = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	292 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	293 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	294
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	295 if (a.cidx (j+1) != a.cidx (j))
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	296 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	297 octave_idx_type ru = a.ridx (a.cidx (j));
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	298 octave_idx_type rl = a.ridx (a.cidx (j+1)-1);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	299
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	300 if (j - ru > upper_band)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	301 upper_band = j - ru;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	302
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	303 if (rl - j > lower_band)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	304 lower_band = rl - j;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	305 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	306 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	307
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	308 if (!singular)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	309 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	310 bandden = double (nnz) /
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	311 (double (ncols) * (double (lower_band) +
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	312 double (upper_band)) -
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	313 0.5 * double (upper_band + 1) * double (upper_band) -
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	314 0.5 * double (lower_band + 1) * double (lower_band));
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	315
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	316 if (nrows == ncols && sp_bandden != 1. && bandden > sp_bandden)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	317 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	318 if (upper_band == 1 && lower_band == 1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	319 typ = MatrixType::Tridiagonal;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	320 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	321 typ = MatrixType::Banded;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	322
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	323 octave_idx_type nnz_in_band =
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	324 (upper_band + lower_band + 1) * nrows -
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	325 (1 + upper_band) * upper_band / 2 -
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	326 (1 + lower_band) * lower_band / 2;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	327 if (nnz_in_band == nnz)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	328 dense = true;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	329 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	330 dense = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	331 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	332 else if (upper_band == 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	333 typ = MatrixType::Lower;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	334 else if (lower_band == 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	335 typ = MatrixType::Upper;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	336
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	337 if (upper_band == lower_band && nrows == ncols)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	338 maybe_hermitian = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	339 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	340
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	341 if (typ == MatrixType::Full)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	342 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	343 // Search for a permuted triangular matrix, and test if
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	344 // permutation is singular
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	345
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	346 // FIXME
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	347 // Perhaps this should be based on a dmperm algorithm
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	348 bool found = false;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	349
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	350 nperm = ncols;
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	351 perm = new octave_idx_type [ncols];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	352
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	353 for (octave_idx_type i = 0; i < ncols; i++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	354 perm[i] = -1;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	355
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	356 for (octave_idx_type i = 0; i < nm; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	357 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	358 found = false;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	359
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	360 for (octave_idx_type j = 0; j < ncols; j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	361 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	362 if ((a.cidx (j+1) - a.cidx (j)) > 0 &&
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	363 (a.ridx (a.cidx (j+1)-1) == i))
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	364 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	365 perm[i] = j;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	366 found = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	367 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	368 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	369 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	370
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	371 if (!found)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	372 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	373 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	374
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	375 if (found)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	376 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	377 typ = MatrixType::Permuted_Upper;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	378 if (ncols > nrows)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	379 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	380 octave_idx_type k = nrows;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	381 for (octave_idx_type i = 0; i < ncols; i++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	382 if (perm[i] == -1)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	383 perm[i] = k++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	384 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	385 }
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	386 else if (a.cidx (nm) == a.cidx (ncols))
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	387 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	388 nperm = nrows;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	389 delete [] perm;
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	390 perm = new octave_idx_type [nrows];
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	391 OCTAVE_LOCAL_BUFFER (octave_idx_type, tmp, nrows);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	392
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	393 for (octave_idx_type i = 0; i < nrows; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	394 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	395 perm[i] = -1;
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	396 tmp[i] = -1;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	397 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	398
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	399 for (octave_idx_type j = 0; j < ncols; j++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	400 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++)
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	401 perm[a.ridx (i)] = j;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	402
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	403 found = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	404 for (octave_idx_type i = 0; i < nm; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	405 if (perm[i] == -1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	406 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	407 found = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	408 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	409 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	410 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	411 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	412 tmp[perm[i]] = 1;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	413 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	414
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	415 if (found)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	416 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	417 octave_idx_type k = ncols;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	418 for (octave_idx_type i = 0; i < nrows; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	419 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	420 if (tmp[i] == -1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	421 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	422 if (k < nrows)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	423 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	424 perm[k++] = i;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	425 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	426 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	427 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	428 found = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	429 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	430 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	431 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	432 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	433 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	434
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	435 if (found)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	436 typ = MatrixType::Permuted_Lower;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	437 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	438 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	439 delete [] perm;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	440 nperm = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	441 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	442 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	443 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	444 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	445 delete [] perm;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	446 nperm = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	447 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	448 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	449
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	450 // FIXME
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	451 // Disable lower under-determined and upper over-determined problems
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	452 // as being detected, and force to treat as singular. As this seems
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	453 // to cause issues
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	454 if (((typ == MatrixType::Lower \|\| typ == MatrixType::Permuted_Lower)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	455 && nrows > ncols) \|\|
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	456 ((typ == MatrixType::Upper \|\| typ == MatrixType::Permuted_Upper)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	457 && nrows < ncols))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	458 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	459 if (typ == MatrixType::Permuted_Upper \|\|
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	460 typ == MatrixType::Permuted_Lower)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	461 delete [] perm;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	462 nperm = 0;
14097 4804ad4ce0de Plug memory leak in Matrixtype for sparse permuted matrices. Rik <octave@nomad.inbox5.com> parents: 12564 diff changeset	463 typ = MatrixType::Rectangular;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	464 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	465
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	466 if (typ == MatrixType::Full && ncols != nrows)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	467 typ = MatrixType::Rectangular;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	468
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	469 if (maybe_hermitian && (typ == MatrixType::Full \|\|
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	470 typ == MatrixType::Tridiagonal \|\|
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	471 typ == MatrixType::Banded))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	472 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	473 bool is_herm = true;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	474
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	475 // first, check whether the diagonal is positive & extract it
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	476 ColumnVector diag (ncols);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	477
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	478 for (octave_idx_type j = 0; is_herm && j < ncols; j++)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	479 {
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	480 is_herm = false;
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	481 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	482 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	483 if (a.ridx (i) == j)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	484 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	485 double d = a.data (i);
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	486 is_herm = d > 0.;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	487 diag(j) = d;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	488 break;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	489 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	490 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	491 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	492
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	493
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	494 // next, check symmetry and 2x2 positiveness
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	495
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	496 for (octave_idx_type j = 0; is_herm && j < ncols; j++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	497 for (octave_idx_type i = a.cidx (j); is_herm && i < a.cidx (j+1); i++)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	498 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	499 octave_idx_type k = a.ridx (i);
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	500 is_herm = k == j;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	501 if (is_herm)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	502 continue;
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	503 double d = a.data (i);
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	504 if (dd < diag(j)diag(k))
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	505 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	506 for (octave_idx_type l = a.cidx (k); l < a.cidx (k+1); l++)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	507 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	508 if (a.ridx (l) == j)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	509 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	510 is_herm = a.data (l) == d;
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	511 break;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	512 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	513 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	514 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	515 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	516
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	517 if (is_herm)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	518 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	519 if (typ == MatrixType::Full)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	520 typ = MatrixType::Hermitian;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	521 else if (typ == MatrixType::Banded)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	522 typ = MatrixType::Banded_Hermitian;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	523 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	524 typ = MatrixType::Tridiagonal_Hermitian;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	525 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	526 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	527 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	528 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	529
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	530 MatrixType::MatrixType (const SparseComplexMatrix &a)
5892 13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	531 : typ (MatrixType::Unknown),
13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	532 sp_bandden (0), bandden (0), upper_band (0), lower_band (0),
13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	533 dense (false), full (false), nperm (0), perm (0)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	534 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	535 octave_idx_type nrows = a.rows ();
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	536 octave_idx_type ncols = a.cols ();
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	537 octave_idx_type nm = (ncols < nrows ? ncols : nrows);
10506 bdf5d85cfc5e replace nzmax by nnz where appropriate in liboctave Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	538 octave_idx_type nnz = a.nnz ();
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	539
5996 bd0507994409 [project @ 2006-09-22 19:38:52 by dbateman] dbateman parents: 5893 diff changeset	540 if (octave_sparse_params::get_key ("spumoni") != 0.)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	541 (*current_liboctave_warning_handler)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	542 ("Calculating Sparse Matrix Type");
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	543
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	544 sp_bandden = octave_sparse_params::get_bandden ();
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	545 bool maybe_hermitian = false;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	546 typ = MatrixType::Full;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	547
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	548 if (nnz == nm)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	549 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	550 matrix_type tmp_typ = MatrixType::Diagonal;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	551 octave_idx_type i;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	552 // Maybe the matrix is diagonal
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	553 for (i = 0; i < nm; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	554 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	555 if (a.cidx (i+1) != a.cidx (i) + 1)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	556 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	557 tmp_typ = MatrixType::Full;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	558 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	559 }
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	560 if (a.ridx (i) != i)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	561 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	562 tmp_typ = MatrixType::Permuted_Diagonal;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	563 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	564 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	565 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	566
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	567 if (tmp_typ == MatrixType::Permuted_Diagonal)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	568 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	569 std::vector<bool> found (nrows);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	570
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	571 for (octave_idx_type j = 0; j < i; j++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	572 found[j] = true;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	573 for (octave_idx_type j = i; j < nrows; j++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	574 found[j] = false;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	575
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	576 for (octave_idx_type j = i; j < nm; j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	577 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	578 if ((a.cidx (j+1) > a.cidx (j) + 1) \|\|
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	579 ((a.cidx (j+1) == a.cidx (j) + 1) && found[a.ridx (j)]))
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	580 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	581 tmp_typ = MatrixType::Full;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	582 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	583 }
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	584 found[a.ridx (j)] = true;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	585 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	586 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	587 typ = tmp_typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	588 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	589
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	590 if (typ == MatrixType::Full)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	591 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	592 // Search for banded, upper and lower triangular matrices
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	593 bool singular = false;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	594 upper_band = 0;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	595 lower_band = 0;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	596 for (octave_idx_type j = 0; j < ncols; j++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	597 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	598 bool zero_on_diagonal = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	599 if (j < nrows)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	600 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	601 zero_on_diagonal = true;
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	602 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++)
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	603 if (a.ridx (i) == j)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	604 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	605 zero_on_diagonal = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	606 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	607 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	608 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	609
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	610 if (zero_on_diagonal)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	611 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	612 singular = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	613 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	614 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	615
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	616 if (a.cidx (j+1) != a.cidx (j))
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	617 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	618 octave_idx_type ru = a.ridx (a.cidx (j));
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	619 octave_idx_type rl = a.ridx (a.cidx (j+1)-1);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	620
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	621 if (j - ru > upper_band)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	622 upper_band = j - ru;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	623
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	624 if (rl - j > lower_band)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	625 lower_band = rl - j;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	626 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	627 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	628
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	629 if (!singular)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	630 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	631 bandden = double (nnz) /
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	632 (double (ncols) * (double (lower_band) +
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	633 double (upper_band)) -
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	634 0.5 * double (upper_band + 1) * double (upper_band) -
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	635 0.5 * double (lower_band + 1) * double (lower_band));
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	636
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	637 if (nrows == ncols && sp_bandden != 1. && bandden > sp_bandden)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	638 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	639 if (upper_band == 1 && lower_band == 1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	640 typ = MatrixType::Tridiagonal;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	641 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	642 typ = MatrixType::Banded;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	643
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	644 octave_idx_type nnz_in_band =
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	645 (upper_band + lower_band + 1) * nrows -
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	646 (1 + upper_band) * upper_band / 2 -
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	647 (1 + lower_band) * lower_band / 2;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	648 if (nnz_in_band == nnz)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	649 dense = true;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	650 else
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	651 dense = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	652 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	653 else if (upper_band == 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	654 typ = MatrixType::Lower;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	655 else if (lower_band == 0)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	656 typ = MatrixType::Upper;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	657
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	658 if (upper_band == lower_band && nrows == ncols)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	659 maybe_hermitian = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	660 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	661
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	662 if (typ == MatrixType::Full)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	663 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	664 // Search for a permuted triangular matrix, and test if
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	665 // permutation is singular
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	666
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	667 // FIXME
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	668 // Perhaps this should be based on a dmperm algorithm
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	669 bool found = false;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	670
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	671 nperm = ncols;
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	672 perm = new octave_idx_type [ncols];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	673
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	674 for (octave_idx_type i = 0; i < ncols; i++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	675 perm[i] = -1;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	676
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	677 for (octave_idx_type i = 0; i < nm; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	678 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	679 found = false;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	680
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	681 for (octave_idx_type j = 0; j < ncols; j++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	682 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	683 if ((a.cidx (j+1) - a.cidx (j)) > 0 &&
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	684 (a.ridx (a.cidx (j+1)-1) == i))
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	685 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	686 perm[i] = j;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	687 found = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	688 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	689 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	690 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	691
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	692 if (!found)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	693 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	694 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	695
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	696 if (found)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	697 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	698 typ = MatrixType::Permuted_Upper;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	699 if (ncols > nrows)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	700 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	701 octave_idx_type k = nrows;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	702 for (octave_idx_type i = 0; i < ncols; i++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	703 if (perm[i] == -1)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	704 perm[i] = k++;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	705 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	706 }
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	707 else if (a.cidx (nm) == a.cidx (ncols))
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	708 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	709 nperm = nrows;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	710 delete [] perm;
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	711 perm = new octave_idx_type [nrows];
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	712 OCTAVE_LOCAL_BUFFER (octave_idx_type, tmp, nrows);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	713
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	714 for (octave_idx_type i = 0; i < nrows; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	715 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	716 perm[i] = -1;
3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	717 tmp[i] = -1;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	718 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	719
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	720 for (octave_idx_type j = 0; j < ncols; j++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	721 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++)
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	722 perm[a.ridx (i)] = j;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	723
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	724 found = true;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	725 for (octave_idx_type i = 0; i < nm; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	726 if (perm[i] == -1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	727 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	728 found = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	729 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	730 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	731 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	732 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	733 tmp[perm[i]] = 1;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	734 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	735
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	736 if (found)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	737 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	738 octave_idx_type k = ncols;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	739 for (octave_idx_type i = 0; i < nrows; i++)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	740 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	741 if (tmp[i] == -1)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	742 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	743 if (k < nrows)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	744 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	745 perm[k++] = i;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	746 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	747 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	748 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	749 found = false;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	750 break;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	751 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	752 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	753 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	754 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	755
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	756 if (found)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	757 typ = MatrixType::Permuted_Lower;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	758 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	759 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	760 delete [] perm;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	761 nperm = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	762 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	763 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	764 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	765 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	766 delete [] perm;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	767 nperm = 0;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	768 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	769 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	770
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	771 // FIXME
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	772 // Disable lower under-determined and upper over-determined problems
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	773 // as being detected, and force to treat as singular. As this seems
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	774 // to cause issues
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	775 if (((typ == MatrixType::Lower \|\| typ == MatrixType::Permuted_Lower)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	776 && nrows > ncols) \|\|
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	777 ((typ == MatrixType::Upper \|\| typ == MatrixType::Permuted_Upper)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	778 && nrows < ncols))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	779 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	780 if (typ == MatrixType::Permuted_Upper \|\|
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	781 typ == MatrixType::Permuted_Lower)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	782 delete [] perm;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	783 nperm = 0;
14097 4804ad4ce0de Plug memory leak in Matrixtype for sparse permuted matrices. Rik <octave@nomad.inbox5.com> parents: 12564 diff changeset	784 typ = MatrixType::Rectangular;
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	785 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	786
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	787 if (typ == MatrixType::Full && ncols != nrows)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	788 typ = MatrixType::Rectangular;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	789
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	790 if (maybe_hermitian && (typ == MatrixType::Full \|\|
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	791 typ == MatrixType::Tridiagonal \|\|
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	792 typ == MatrixType::Banded))
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	793 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	794 bool is_herm = true;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	795
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	796 // first, check whether the diagonal is positive & extract it
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	797 ColumnVector diag (ncols);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	798
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	799 for (octave_idx_type j = 0; is_herm && j < ncols; j++)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	800 {
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	801 is_herm = false;
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	802 for (octave_idx_type i = a.cidx (j); i < a.cidx (j+1); i++)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	803 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	804 if (a.ridx (i) == j)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	805 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	806 Complex d = a.data (i);
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	807 is_herm = d.real () > 0. && d.imag () == 0.;
460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	808 diag(j) = d.real ();
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	809 break;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	810 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	811 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	812 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	813
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	814 // next, check symmetry and 2x2 positiveness
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	815
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	816 for (octave_idx_type j = 0; is_herm && j < ncols; j++)
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	817 for (octave_idx_type i = a.cidx (j); is_herm && i < a.cidx (j+1); i++)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	818 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	819 octave_idx_type k = a.ridx (i);
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	820 is_herm = k == j;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	821 if (is_herm)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	822 continue;
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	823 Complex d = a.data (i);
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	824 if (std::norm (d) < diag(j)*diag(k))
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	825 {
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	826 d = std::conj (d);
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	827 for (octave_idx_type l = a.cidx (k); l < a.cidx (k+1); l++)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	828 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	829 if (a.ridx (l) == j)
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	830 {
15018 3d8ace26c5b4 maint: Use Octave coding conventions for cuddled parentheses in liboctave/. Rik <rik@octave.org> parents: 14846 diff changeset	831 is_herm = a.data (l) == d;
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	832 break;
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	833 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	834 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	835 }
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	836 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	837
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	838
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	839 if (is_herm)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	840 {
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	841 if (typ == MatrixType::Full)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	842 typ = MatrixType::Hermitian;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	843 else if (typ == MatrixType::Banded)
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	844 typ = MatrixType::Banded_Hermitian;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	845 else
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	846 typ = MatrixType::Tridiagonal_Hermitian;
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	847 }
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	848 }
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	849 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	850 }
5892 13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	851 MatrixType::MatrixType (const matrix_type t, bool _full)
13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	852 : typ (MatrixType::Unknown),
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	853 sp_bandden (octave_sparse_params::get_bandden ()),
5892 13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	854 bandden (0), upper_band (0), lower_band (0),
13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	855 dense (false), full (_full), nperm (0), perm (0)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	856 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	857 if (t == MatrixType::Unknown \|\| t == MatrixType::Full
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	858 \|\| t == MatrixType::Diagonal \|\| t == MatrixType::Permuted_Diagonal
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	859 \|\| t == MatrixType::Upper \|\| t == MatrixType::Lower
7798 42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	860 \|\| t == MatrixType::Tridiagonal \|\| t == MatrixType::Tridiagonal_Hermitian
42c42c640108 improved matrix_type check Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	861 \|\| t == MatrixType::Rectangular)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	862 typ = t;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	863 else
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	864 (*current_liboctave_warning_handler) ("Invalid matrix type");
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	865 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	866
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	867 MatrixType::MatrixType (const matrix_type t, const octave_idx_type np,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	868 const octave_idx_type *p, bool _full)
5892 13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	869 : typ (MatrixType::Unknown),
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	870 sp_bandden (octave_sparse_params::get_bandden ()),
5892 13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	871 bandden (0), upper_band (0), lower_band (0),
13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	872 dense (false), full (_full), nperm (0), perm (0)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	873 {
6027 068e52f1c005 [project @ 2006-10-03 20:07:56 by jwe] jwe parents: 5997 diff changeset	874 if ((t == MatrixType::Permuted_Upper \|\| t == MatrixType::Permuted_Lower) &&
068e52f1c005 [project @ 2006-10-03 20:07:56 by jwe] jwe parents: 5997 diff changeset	875 np > 0 && p != 0)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	876 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	877 typ = t;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	878 nperm = np;
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	879 perm = new octave_idx_type [nperm];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	880 for (octave_idx_type i = 0; i < nperm; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	881 perm[i] = p[i];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	882 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	883 else
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	884 (*current_liboctave_warning_handler) ("Invalid matrix type");
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	885 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	886
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	887 MatrixType::MatrixType (const matrix_type t, const octave_idx_type ku,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	888 const octave_idx_type kl, bool _full)
5892 13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	889 : typ (MatrixType::Unknown),
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	890 sp_bandden (octave_sparse_params::get_bandden ()),
5892 13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	891 bandden (0), upper_band (0), lower_band (0),
13aa80fc7839 [project @ 2006-07-15 18:15:58 by jwe] jwe parents: 5785 diff changeset	892 dense (false), full (_full), nperm (0), perm (0)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	893 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	894 if (t == MatrixType::Banded \|\| t == MatrixType::Banded_Hermitian)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	895 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	896 typ = t;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	897 upper_band = ku;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	898 lower_band = kl;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	899 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	900 else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	901 (*current_liboctave_warning_handler) ("Invalid sparse matrix type");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	902 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	903
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	904 MatrixType::~MatrixType (void)
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	905 {
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	906 if (nperm != 0)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	907 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	908 delete [] perm;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	909 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	910 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	911
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	912 MatrixType&
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	913 MatrixType::operator = (const MatrixType& a)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	914 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	915 if (this != &a)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	916 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	917 typ = a.typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	918 sp_bandden = a.sp_bandden;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	919 bandden = a.bandden;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	920 upper_band = a.upper_band;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	921 lower_band = a.lower_band;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	922 dense = a.dense;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	923 full = a.full;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	924
12564 61cd086e9aeb Correct slight logical mistake in memleak patch (bug #32804) Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12563 diff changeset	925 if (nperm)
61cd086e9aeb Correct slight logical mistake in memleak patch (bug #32804) Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12563 diff changeset	926 {
61cd086e9aeb Correct slight logical mistake in memleak patch (bug #32804) Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12563 diff changeset	927 delete[] perm;
61cd086e9aeb Correct slight logical mistake in memleak patch (bug #32804) Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12563 diff changeset	928 }
61cd086e9aeb Correct slight logical mistake in memleak patch (bug #32804) Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 12563 diff changeset	929
12563 681bb733f4f4 MatrixType:: plug memory leak (bug #32804). Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	930 if (a.nperm != 0)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	931 {
12563 681bb733f4f4 MatrixType:: plug memory leak (bug #32804). Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	932 perm = new octave_idx_type [a.nperm];
681bb733f4f4 MatrixType:: plug memory leak (bug #32804). Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	933 for (octave_idx_type i = 0; i < a.nperm; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	934 perm[i] = a.perm[i];
07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	935 }
12563 681bb733f4f4 MatrixType:: plug memory leak (bug #32804). Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	936
681bb733f4f4 MatrixType:: plug memory leak (bug #32804). Jordi Gutiérrez Hermoso <jordigh@gmail.com> parents: 11586 diff changeset	937 nperm = a.nperm;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	938 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	939
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	940 return *this;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	941 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	942
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	943 int
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	944 MatrixType::type (bool quiet)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	945 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	946 if (typ != MatrixType::Unknown && (full \|\|
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	947 sp_bandden == octave_sparse_params::get_bandden ()))
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	948 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	949 if (!quiet &&
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	950 octave_sparse_params::get_key ("spumoni") != 0.)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	951 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	952 ("Using Cached Matrix Type");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	953
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	954 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	955 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	956
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	957 if (typ != MatrixType::Unknown &&
5893 d73ffe42f2c8 [project @ 2006-07-16 07:48:19 by jwe] jwe parents: 5892 diff changeset	958 octave_sparse_params::get_key ("spumoni") != 0.)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	959 (*current_liboctave_warning_handler)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	960 ("Invalidating Matrix Type");
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	961
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	962 typ = MatrixType::Unknown;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	963
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	964 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	965 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	966
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	967 int
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	968 MatrixType::type (const SparseMatrix &a)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	969 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	970 if (typ != MatrixType::Unknown && (full \|\|
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	971 sp_bandden == octave_sparse_params::get_bandden ()))
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	972 {
5893 d73ffe42f2c8 [project @ 2006-07-16 07:48:19 by jwe] jwe parents: 5892 diff changeset	973 if (octave_sparse_params::get_key ("spumoni") != 0.)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	974 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	975 ("Using Cached Matrix Type");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	976
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	977 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	978 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	979
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	980 MatrixType tmp_typ (a);
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	981 typ = tmp_typ.typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	982 sp_bandden = tmp_typ.sp_bandden;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	983 bandden = tmp_typ.bandden;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	984 upper_band = tmp_typ.upper_band;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	985 lower_band = tmp_typ.lower_band;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	986 dense = tmp_typ.dense;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	987 full = tmp_typ.full;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	988 nperm = tmp_typ.nperm;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	989
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	990 if (nperm != 0)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	991 {
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	992 perm = new octave_idx_type [nperm];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	993 for (octave_idx_type i = 0; i < nperm; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	994 perm[i] = tmp_typ.perm[i];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	995 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	996
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	997 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	998 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	999
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1000 int
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1001 MatrixType::type (const SparseComplexMatrix &a)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1002 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1003 if (typ != MatrixType::Unknown && (full \|\|
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	1004 sp_bandden == octave_sparse_params::get_bandden ()))
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1005 {
5893 d73ffe42f2c8 [project @ 2006-07-16 07:48:19 by jwe] jwe parents: 5892 diff changeset	1006 if (octave_sparse_params::get_key ("spumoni") != 0.)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1007 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1008 ("Using Cached Matrix Type");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1009
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1010 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1011 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1012
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1013 MatrixType tmp_typ (a);
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1014 typ = tmp_typ.typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1015 sp_bandden = tmp_typ.sp_bandden;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1016 bandden = tmp_typ.bandden;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1017 upper_band = tmp_typ.upper_band;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1018 lower_band = tmp_typ.lower_band;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1019 dense = tmp_typ.dense;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1020 full = tmp_typ.full;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1021 nperm = tmp_typ.nperm;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1022
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1023 if (nperm != 0)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1024 {
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	1025 perm = new octave_idx_type [nperm];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1026 for (octave_idx_type i = 0; i < nperm; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1027 perm[i] = tmp_typ.perm[i];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1028 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1029
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1030 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1031 }
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1032
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1033 int
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1034 MatrixType::type (const Matrix &a)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1035 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1036 if (typ != MatrixType::Unknown)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1037 {
5893 d73ffe42f2c8 [project @ 2006-07-16 07:48:19 by jwe] jwe parents: 5892 diff changeset	1038 if (octave_sparse_params::get_key ("spumoni") != 0.)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1039 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1040 ("Using Cached Matrix Type");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1041
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1042 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1043 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1044
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1045 MatrixType tmp_typ (a);
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1046 typ = tmp_typ.typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1047 full = tmp_typ.full;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1048 nperm = tmp_typ.nperm;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1049
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1050 if (nperm != 0)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1051 {
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	1052 perm = new octave_idx_type [nperm];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1053 for (octave_idx_type i = 0; i < nperm; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1054 perm[i] = tmp_typ.perm[i];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1055 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1056
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1057 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1058 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1059
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1060 int
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1061 MatrixType::type (const ComplexMatrix &a)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1062 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1063 if (typ != MatrixType::Unknown)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1064 {
5893 d73ffe42f2c8 [project @ 2006-07-16 07:48:19 by jwe] jwe parents: 5892 diff changeset	1065 if (octave_sparse_params::get_key ("spumoni") != 0.)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1066 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1067 ("Using Cached Matrix Type");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1068
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1069 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1070 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1071
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1072 MatrixType tmp_typ (a);
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1073 typ = tmp_typ.typ;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1074 full = tmp_typ.full;
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1075 nperm = tmp_typ.nperm;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1076
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1077 if (nperm != 0)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1078 {
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	1079 perm = new octave_idx_type [nperm];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1080 for (octave_idx_type i = 0; i < nperm; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1081 perm[i] = tmp_typ.perm[i];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1082 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1083
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1084 return typ;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1085 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1086
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1087 int
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1088 MatrixType::type (const FloatMatrix &a)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1089 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1090 if (typ != MatrixType::Unknown)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1091 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1092 if (octave_sparse_params::get_key ("spumoni") != 0.)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1093 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1094 ("Using Cached Matrix Type");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1095
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1096 return typ;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1097 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1098
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1099 MatrixType tmp_typ (a);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1100 typ = tmp_typ.typ;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1101 full = tmp_typ.full;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1102 nperm = tmp_typ.nperm;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1103
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1104 if (nperm != 0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1105 {
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	1106 perm = new octave_idx_type [nperm];
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1107 for (octave_idx_type i = 0; i < nperm; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1108 perm[i] = tmp_typ.perm[i];
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1109 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1110
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1111 return typ;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1112 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1113
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1114 int
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1115 MatrixType::type (const FloatComplexMatrix &a)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1116 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1117 if (typ != MatrixType::Unknown)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1118 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1119 if (octave_sparse_params::get_key ("spumoni") != 0.)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1120 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1121 ("Using Cached Matrix Type");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1122
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1123 return typ;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1124 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1125
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1126 MatrixType tmp_typ (a);
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1127 typ = tmp_typ.typ;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1128 full = tmp_typ.full;
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1129 nperm = tmp_typ.nperm;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1130
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1131 if (nperm != 0)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1132 {
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	1133 perm = new octave_idx_type [nperm];
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1134 for (octave_idx_type i = 0; i < nperm; i++)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1135 perm[i] = tmp_typ.perm[i];
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1136 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1137
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1138 return typ;
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1139 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7017 diff changeset	1140
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1141 void
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1142 MatrixType::info () const
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1143 {
5893 d73ffe42f2c8 [project @ 2006-07-16 07:48:19 by jwe] jwe parents: 5892 diff changeset	1144 if (octave_sparse_params::get_key ("spumoni") != 0.)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1145 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1146 if (typ == MatrixType::Unknown)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1147 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1148 ("Unknown Matrix Type");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1149 else if (typ == MatrixType::Diagonal)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1150 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1151 ("Diagonal Sparse Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1152 else if (typ == MatrixType::Permuted_Diagonal)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1153 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1154 ("Permuted Diagonal Sparse Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1155 else if (typ == MatrixType::Upper)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1156 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1157 ("Upper Triangular Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1158 else if (typ == MatrixType::Lower)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1159 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1160 ("Lower Triangular Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1161 else if (typ == MatrixType::Permuted_Upper)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1162 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1163 ("Permuted Upper Triangular Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1164 else if (typ == MatrixType::Permuted_Lower)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1165 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1166 ("Permuted Lower Triangular Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1167 else if (typ == MatrixType::Banded)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1168 (*current_liboctave_warning_handler)
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1169 ("Banded Sparse Matrix %d-1-%d (Density %f)", lower_band,
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1170 upper_band, bandden);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1171 else if (typ == MatrixType::Banded_Hermitian)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1172 (*current_liboctave_warning_handler)
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1173 ("Banded Hermitian/Symmetric Sparse Matrix %d-1-%d (Density %f)",
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1174 lower_band, upper_band, bandden);
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1175 else if (typ == MatrixType::Hermitian)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1176 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1177 ("Hermitian/Symmetric Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1178 else if (typ == MatrixType::Tridiagonal)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1179 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1180 ("Tridiagonal Sparse Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1181 else if (typ == MatrixType::Tridiagonal_Hermitian)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1182 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1183 ("Hermitian/Symmetric Tridiagonal Sparse Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1184 else if (typ == MatrixType::Rectangular)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1185 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1186 ("Rectangular/Singular Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1187 else if (typ == MatrixType::Full)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1188 (*current_liboctave_warning_handler)
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1189 ("Full Matrix");
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1190 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1191 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1192
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1193 void
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1194 MatrixType::mark_as_symmetric (void)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1195 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1196 if (typ == MatrixType::Tridiagonal \|\|
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1197 typ == MatrixType::Tridiagonal_Hermitian)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1198 typ = MatrixType::Tridiagonal_Hermitian;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1199 else if (typ == MatrixType::Banded \|\|
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1200 typ == MatrixType::Banded_Hermitian)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1201 typ = MatrixType::Banded_Hermitian;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1202 else if (typ == MatrixType::Full \|\| typ == MatrixType::Hermitian \|\|
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1203 typ == MatrixType::Unknown)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1204 typ = MatrixType::Hermitian;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1205 else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1206 (*current_liboctave_error_handler)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1207 ("Can not mark current matrix type as symmetric");
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1208 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1209
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1210 void
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1211 MatrixType::mark_as_unsymmetric (void)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1212 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1213 if (typ == MatrixType::Tridiagonal \|\|
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1214 typ == MatrixType::Tridiagonal_Hermitian)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1215 typ = MatrixType::Tridiagonal;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1216 else if (typ == MatrixType::Banded \|\|
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1217 typ == MatrixType::Banded_Hermitian)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1218 typ = MatrixType::Banded;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1219 else if (typ == MatrixType::Full \|\| typ == MatrixType::Hermitian \|\|
10314 07ebe522dac2 untabify liboctave C++ sources John W. Eaton <jwe@octave.org> parents: 10158 diff changeset	1220 typ == MatrixType::Unknown)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1221 typ = MatrixType::Full;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1222 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1223
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1224 void
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1225 MatrixType::mark_as_permuted (const octave_idx_type np, const octave_idx_type *p)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1226 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1227 nperm = np;
15020 560317fd5977 maint: Cuddle open bracket used for indexing C++ arrays in source code. Rik <rik@octave.org> parents: 15018 diff changeset	1228 perm = new octave_idx_type [nperm];
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1229 for (octave_idx_type i = 0; i < nperm; i++)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1230 perm[i] = p[i];
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1231
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1232 if (typ == MatrixType::Diagonal \|\| typ == MatrixType::Permuted_Diagonal)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1233 typ = MatrixType::Permuted_Diagonal;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1234 else if (typ == MatrixType::Upper \|\| typ == MatrixType::Permuted_Upper)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1235 typ = MatrixType::Permuted_Upper;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1236 else if (typ == MatrixType::Lower \|\| typ == MatrixType::Permuted_Lower)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1237 typ = MatrixType::Permuted_Lower;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1238 else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1239 (*current_liboctave_error_handler)
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1240 ("Can not mark current matrix type as symmetric");
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1241 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1242
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1243 void
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1244 MatrixType::mark_as_unpermuted (void)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1245 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1246 if (nperm)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1247 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1248 nperm = 0;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1249 delete [] perm;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1250 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1251
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1252 if (typ == MatrixType::Diagonal \|\| typ == MatrixType::Permuted_Diagonal)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1253 typ = MatrixType::Diagonal;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1254 else if (typ == MatrixType::Upper \|\| typ == MatrixType::Permuted_Upper)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1255 typ = MatrixType::Upper;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1256 else if (typ == MatrixType::Lower \|\| typ == MatrixType::Permuted_Lower)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1257 typ = MatrixType::Lower;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1258 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1259
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1260 MatrixType
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1261 MatrixType::transpose (void) const
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1262 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1263 MatrixType retval (*this);
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1264 if (typ == MatrixType::Upper)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1265 retval.typ = MatrixType::Lower;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1266 else if (typ == MatrixType::Permuted_Upper)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1267 retval.typ = MatrixType::Permuted_Lower;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1268 else if (typ == MatrixType::Lower)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1269 retval.typ = MatrixType::Upper;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1270 else if (typ == MatrixType::Permuted_Lower)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1271 retval.typ = MatrixType::Permuted_Upper;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1272 else if (typ == MatrixType::Banded)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1273 {
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1274 retval.upper_band = lower_band;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1275 retval.lower_band = upper_band;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1276 }
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1277
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1278 return retval;
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: diff changeset	1279 }

Mercurial > hg > octave-nkf

annotate liboctave/array/MatrixType.cc @ 15271:648dabbb4c6b