Mercurial > octave
diff liboctave/array/idx-vector.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/idx-vector.cc@560317fd5977 |
children | 8fce0ed4894a |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/liboctave/array/idx-vector.cc Fri Aug 31 20:00:20 2012 -0700 @@ -0,0 +1,1336 @@ +/* + +Copyright (C) 1993-2012 John W. Eaton +Copyright (C) 2008-2009 Jaroslav Hajek +Copyright (C) 2009-2010 VZLU Prague + +This file is part of Octave. + +Octave is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +Octave is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Octave; see the file COPYING. If not, see +<http://www.gnu.org/licenses/>. + +*/ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <cstdlib> + +#include <iostream> + +#include "idx-vector.h" +#include "Array.h" +#include "Array-util.h" +#include "Sparse.h" +#include "Range.h" + +#include "oct-locbuf.h" +#include "lo-error.h" +#include "lo-mappers.h" + +static void +gripe_invalid_range (void) +{ + (*current_liboctave_error_handler) + ("invalid range used as index"); +} + +static void +gripe_index_out_of_range (void) +{ + (*current_liboctave_error_handler) + ("internal error: idx_vector index out of range"); +} + +Array<octave_idx_type> +idx_vector::idx_base_rep::as_array (void) +{ + (*current_liboctave_error_handler) + ("internal error: as_array not allowed for this index class"); + + return Array<octave_idx_type> (); +} + +DEFINE_OCTAVE_ALLOCATOR(idx_vector::idx_colon_rep); + +idx_vector::idx_colon_rep::idx_colon_rep (char c) +{ + if (c != ':') + { + (*current_liboctave_error_handler) + ("internal error: invalid character converted to idx_vector; must be ':'"); + err = true; + } +} + +octave_idx_type +idx_vector::idx_colon_rep::checkelem (octave_idx_type i) const +{ + if (i < 0) + { + gripe_index_out_of_range (); + return 0; + } + else + return i; +} + +idx_vector::idx_base_rep * +idx_vector::idx_colon_rep::sort_idx (Array<octave_idx_type>&) +{ + (*current_liboctave_error_handler) + ("internal error: idx_colon_rep::sort_idx"); + + count++; + return this; +} + +std::ostream& +idx_vector::idx_colon_rep::print (std::ostream& os) const +{ + return os << ":"; +} + +DEFINE_OCTAVE_ALLOCATOR(idx_vector::idx_range_rep); + +idx_vector::idx_range_rep::idx_range_rep (octave_idx_type _start, + octave_idx_type _limit, + octave_idx_type _step) + : start(_start), len (_step ? std::max ((_limit - _start) / _step, static_cast<octave_idx_type> (0)) : -1), step (_step) +{ + if (len < 0) + { + gripe_invalid_range (); + err = true; + } + else if (start < 0 || (step < 0 && start + (len-1)*step < 0)) + { + gripe_invalid_index (); + err = true; + } +} + +idx_vector::idx_range_rep::idx_range_rep (const Range& r) + : start (0), len (r.nelem ()), step (1) +{ + if (len < 0) + { + gripe_invalid_range (); + err = true; + } + else if (len > 0) + { + if (r.all_elements_are_ints ()) + { + start = static_cast<octave_idx_type> (r.base ()) - 1; + step = static_cast<octave_idx_type> (r.inc ()); + if (start < 0 || (step < 0 && start + (len-1)*step < 0)) + { + gripe_invalid_index (); + err = true; + } + } + else + { + gripe_invalid_index (); + err = true; + } + } +} + +octave_idx_type +idx_vector::idx_range_rep::checkelem (octave_idx_type i) const +{ + if (i < 0 || i >= len) + { + gripe_index_out_of_range (); + return 0; + } + else + return start + i*step; +} + +idx_vector::idx_base_rep * +idx_vector::idx_range_rep::sort_uniq_clone (bool) +{ + if (step < 0) + return new idx_range_rep (start + (len - 1)*step, len, -step, DIRECT); + else + { + count++; + return this; + } +} + +idx_vector::idx_base_rep * +idx_vector::idx_range_rep::sort_idx (Array<octave_idx_type>& idx) +{ + if (step < 0 && len > 0) + { + idx.clear (1, len); + for (octave_idx_type i = 0; i < len; i++) + idx.xelem (i) = len - 1 - i; + return new idx_range_rep (start + (len - 1)*step, len, -step, DIRECT); + } + else + { + idx.clear (1, len); + for (octave_idx_type i = 0; i < len; i++) + idx.xelem (i) = i; + count++; + return this; + } +} + +std::ostream& +idx_vector::idx_range_rep::print (std::ostream& os) const +{ + os << start << ':' << step << ':' << start + len*step; + return os; +} + +Range +idx_vector::idx_range_rep::unconvert (void) const +{ + return Range (static_cast<double> (start+1), + static_cast<double> (step), len); +} + +Array<octave_idx_type> +idx_vector::idx_range_rep::as_array (void) +{ + Array<octave_idx_type> retval (dim_vector (1, len)); + for (octave_idx_type i = 0; i < len; i++) + retval.xelem (i) = start + i*step; + + return retval; +} + +inline octave_idx_type +convert_index (octave_idx_type i, bool& conv_error, + octave_idx_type& ext) +{ + if (i <= 0) + conv_error = true; + + if (ext < i) + ext = i; + + return i - 1; +} + +inline octave_idx_type +convert_index (double x, bool& conv_error, octave_idx_type& ext) +{ + octave_idx_type i = static_cast<octave_idx_type> (x); + + if (static_cast<double> (i) != x) + conv_error = true; + + return convert_index (i, conv_error, ext); +} + +inline octave_idx_type +convert_index (float x, bool& conv_error, octave_idx_type& ext) +{ + return convert_index (static_cast<double> (x), conv_error, ext); +} + +template <class T> +inline octave_idx_type +convert_index (octave_int<T> x, bool& conv_error, + octave_idx_type& ext) +{ + octave_idx_type i = octave_int<octave_idx_type> (x).value (); + + return convert_index (i, conv_error, ext); +} + +DEFINE_OCTAVE_ALLOCATOR(idx_vector::idx_scalar_rep); + +template <class T> +idx_vector::idx_scalar_rep::idx_scalar_rep (T x) + : data (0) +{ + octave_idx_type dummy = 0; + + data = convert_index (x, err, dummy); + + if (err) + gripe_invalid_index (); +} + +idx_vector::idx_scalar_rep::idx_scalar_rep (octave_idx_type i) + : data (i) +{ + if (data < 0) + { + gripe_invalid_index (); + err = true; + } +} + +octave_idx_type +idx_vector::idx_scalar_rep::checkelem (octave_idx_type i) const +{ + if (i != 0) + gripe_index_out_of_range (); + + return data; +} + +idx_vector::idx_base_rep * +idx_vector::idx_scalar_rep::sort_idx (Array<octave_idx_type>& idx) +{ + idx.clear (1, 1); + idx.fill (0); + count++; + return this; +} + +std::ostream& idx_vector::idx_scalar_rep::print (std::ostream& os) const +{ + return os << data; +} + +double +idx_vector::idx_scalar_rep::unconvert (void) const +{ + return data + 1; +} + +Array<octave_idx_type> +idx_vector::idx_scalar_rep::as_array (void) +{ + return Array<octave_idx_type> (dim_vector (1, 1), data); +} + +DEFINE_OCTAVE_ALLOCATOR(idx_vector::idx_vector_rep); + +template <class T> +idx_vector::idx_vector_rep::idx_vector_rep (const Array<T>& nda) + : data (0), len (nda.numel ()), ext (0), aowner (0), orig_dims (nda.dims ()) +{ + if (len != 0) + { + octave_idx_type *d = new octave_idx_type [len]; + for (octave_idx_type i = 0; i < len; i++) + d[i] = convert_index (nda.xelem (i), err, ext); + data = d; + + if (err) + { + delete [] data; + gripe_invalid_index (); + } + } +} + +// Note that this makes a shallow copy of the index array. + +idx_vector::idx_vector_rep::idx_vector_rep (const Array<octave_idx_type>& inda) + : data (inda.data ()), len (inda.numel ()), ext (0), + aowner (new Array<octave_idx_type> (inda)), orig_dims (inda.dims ()) +{ + if (len != 0) + { + octave_idx_type max = -1; + for (octave_idx_type i = 0; i < len; i++) + { + octave_idx_type k = inda.xelem (i); + if (k < 0) + err = true; + else if (k > max) + max = k; + } + + ext = max + 1; + + if (err) + gripe_invalid_index (); + } +} + +idx_vector::idx_vector_rep::idx_vector_rep (const Array<octave_idx_type>& inda, + octave_idx_type _ext, direct) + : data (inda.data ()), len (inda.numel ()), ext (_ext), + aowner (new Array<octave_idx_type> (inda)), orig_dims (inda.dims ()) +{ + // No checking. + if (ext < 0) + { + octave_idx_type max = -1; + for (octave_idx_type i = 0; i < len; i++) + if (data[i] > max) + max = data[i]; + + ext = max + 1; + } +} + +idx_vector::idx_vector_rep::idx_vector_rep (bool b) + : data (0), len (b ? 1 : 0), ext (0), aowner (0), orig_dims (len, len) +{ + if (len != 0) + { + octave_idx_type *d = new octave_idx_type [1]; + d[0] = 0; + data = d; + ext = 1; + } +} + +idx_vector::idx_vector_rep::idx_vector_rep (const Array<bool>& bnda, + octave_idx_type nnz) + : data (0), len (nnz), ext (0), aowner (0), orig_dims () +{ + if (nnz < 0) + len = bnda.nnz (); + + const dim_vector dv = bnda.dims (); + + if (! dv.all_zero ()) + orig_dims = ((dv.length () == 2 && dv(0) == 1) + ? dim_vector (1, len) : dim_vector (len, 1)); + + if (len != 0) + { + octave_idx_type *d = new octave_idx_type [len]; + + octave_idx_type ntot = bnda.length (); + + octave_idx_type k = 0; + for (octave_idx_type i = 0; i < ntot; i++) + if (bnda.xelem (i)) + d[k++] = i; + + data = d; + + ext = d[k-1] + 1; + } +} + +idx_vector::idx_vector_rep::idx_vector_rep (const Sparse<bool>& bnda) + : data (0), len (0), ext (0), aowner (0), orig_dims () +{ + for (octave_idx_type i = 0, l = bnda.nnz (); i < l; i++) + if (bnda.data (i)) len++; + + dim_vector dv = bnda.dims (); + + orig_dims = ((dv.length () == 2 && dv(0) == 1) + ? dim_vector (1, len) : orig_dims = dim_vector (len, 1)); + + if (len != 0) + { + octave_idx_type *d = new octave_idx_type [len]; + + octave_idx_type nnz = bnda.nnz (); + + octave_idx_type k = 0; + // FIXME: I hope this is OK, i.e. the element iterated this way are correctly ordered. + for (octave_idx_type i = 0; i < nnz; i++) + { + if (bnda.data (i)) + d[k++] = bnda.cidx (i) + bnda.rows () * bnda.ridx (i); + } + + data = d; + + ext = d[k-1] + 1; + } +} + +idx_vector::idx_vector_rep::~idx_vector_rep (void) +{ + if (aowner) + delete aowner; + else + delete [] data; +} + +octave_idx_type +idx_vector::idx_vector_rep::checkelem (octave_idx_type n) const +{ + if (n < 0 || n >= len) + { + gripe_invalid_index (); + return 0; + } + + return xelem (n); +} + +idx_vector::idx_base_rep * +idx_vector::idx_vector_rep::sort_uniq_clone (bool uniq) +{ + if (len == 0) + { + count++; + return this; + } + + // This is wrapped in auto_ptr so that we don't leak on out-of-memory. + std::auto_ptr<idx_vector_rep> new_rep ( + new idx_vector_rep (0, len, ext, orig_dims, DIRECT)); + + if (ext > len*xlog2 (1.0 + len)) + { + // Use standard sort via octave_sort. + octave_idx_type *new_data = new octave_idx_type [len]; + new_rep->data = new_data; + + std::copy (data, data + len, new_data); + octave_sort<octave_idx_type> lsort; + lsort.set_compare (ASCENDING); + lsort.sort (new_data, len); + + if (uniq) + { + octave_idx_type new_len = std::unique (new_data, new_data + len) - new_data; + new_rep->len = new_len; + if (new_rep->orig_dims.length () == 2 && new_rep->orig_dims(0) == 1) + new_rep->orig_dims = dim_vector (1, new_len); + else + new_rep->orig_dims = dim_vector (new_len, 1); + } + } + else if (uniq) + { + // Use two-pass bucket sort (only a mask array needed). + OCTAVE_LOCAL_BUFFER_INIT (bool, has, ext, false); + for (octave_idx_type i = 0; i < len; i++) + has[data[i]] = true; + + octave_idx_type new_len = 0; + for (octave_idx_type i = 0; i < ext; i++) + new_len += has[i]; + + new_rep->len = new_len; + if (new_rep->orig_dims.length () == 2 && new_rep->orig_dims(0) == 1) + new_rep->orig_dims = dim_vector (1, new_len); + else + new_rep->orig_dims = dim_vector (new_len, 1); + + octave_idx_type *new_data = new octave_idx_type [new_len]; + new_rep->data = new_data; + + for (octave_idx_type i = 0, j = 0; i < ext; i++) + if (has[i]) + new_data[j++] = i; + } + else + { + // Use two-pass bucket sort. + OCTAVE_LOCAL_BUFFER_INIT (octave_idx_type, cnt, ext, 0); + for (octave_idx_type i = 0; i < len; i++) + cnt[data[i]]++; + + octave_idx_type *new_data = new octave_idx_type [len]; + new_rep->data = new_data; + + for (octave_idx_type i = 0, j = 0; i < ext; i++) + { + for (octave_idx_type k = 0; k < cnt[i]; k++) + new_data[j++] = i; + } + } + + return new_rep.release (); +} + +idx_vector::idx_base_rep * +idx_vector::idx_vector_rep::sort_idx (Array<octave_idx_type>& idx) +{ + // This is wrapped in auto_ptr so that we don't leak on out-of-memory. + std::auto_ptr<idx_vector_rep> new_rep ( + new idx_vector_rep (0, len, ext, orig_dims, DIRECT)); + + if (ext > len*xlog2 (1.0 + len)) + { + // Use standard sort via octave_sort. + idx.clear (orig_dims); + octave_idx_type *idx_data = idx.fortran_vec (); + for (octave_idx_type i = 0; i < len; i++) + idx_data[i] = i; + + octave_idx_type *new_data = new octave_idx_type [len]; + new_rep->data = new_data; + std::copy (data, data + len, new_data); + + octave_sort<octave_idx_type> lsort; + lsort.set_compare (ASCENDING); + lsort.sort (new_data, idx_data, len); + } + else + { + // Use two-pass bucket sort. + OCTAVE_LOCAL_BUFFER_INIT (octave_idx_type, cnt, ext, 0); + + for (octave_idx_type i = 0; i < len; i++) + cnt[data[i]]++; + + idx.clear (orig_dims); + octave_idx_type *idx_data = idx.fortran_vec (); + + octave_idx_type *new_data = new octave_idx_type [len]; + new_rep->data = new_data; + + for (octave_idx_type i = 0, k = 0; i < ext; i++) + { + octave_idx_type j = cnt[i]; + cnt[i] = k; + k += j; + } + + for (octave_idx_type i = 0; i < len; i++) + { + octave_idx_type j = data[i], k = cnt[j]++; + new_data[k] = j; + idx_data[k] = i; + } + } + + return new_rep.release (); +} + +std::ostream& +idx_vector::idx_vector_rep::print (std::ostream& os) const +{ + os << '['; + + for (octave_idx_type ii = 0; ii < len - 1; ii++) + os << data[ii] << ',' << ' '; + + if (len > 0) + os << data[len-1]; os << ']'; + + return os; +} + +Array<double> +idx_vector::idx_vector_rep::unconvert (void) const +{ + Array<double> retval (orig_dims); + for (octave_idx_type i = 0; i < len; i++) + retval.xelem (i) = data[i] + 1; + return retval; +} + +Array<octave_idx_type> +idx_vector::idx_vector_rep::as_array (void) +{ + if (aowner) + return *aowner; + else + { + Array<octave_idx_type> retval (orig_dims); + std::memcpy (retval.fortran_vec (), data, len*sizeof (octave_idx_type)); + // Delete the old copy and share the data instead to save memory. + delete [] data; + data = retval.fortran_vec (); + aowner = new Array<octave_idx_type> (retval); + return retval; + } +} + +DEFINE_OCTAVE_ALLOCATOR(idx_vector::idx_mask_rep); + +idx_vector::idx_mask_rep::idx_mask_rep (bool b) + : data (0), len (b ? 1 : 0), ext (0), lsti (-1), lste (-1), + aowner (0), orig_dims (len, len) +{ + if (len != 0) + { + bool *d = new bool [1]; + d[0] = true; + data = d; + ext = 1; + } +} + +idx_vector::idx_mask_rep::idx_mask_rep (const Array<bool>& bnda, + octave_idx_type nnz) + : data (0), len (nnz), ext (bnda.numel ()), lsti (-1), lste (-1), + aowner (0), orig_dims () +{ + if (nnz < 0) + len = bnda.nnz (); + + // We truncate the extent as much as possible. For Matlab + // compatibility, but maybe it's not a bad idea anyway. + while (ext > 0 && ! bnda(ext-1)) + ext--; + + const dim_vector dv = bnda.dims (); + + if (! dv.all_zero ()) + orig_dims = ((dv.length () == 2 && dv(0) == 1) + ? dim_vector (1, len) : dim_vector (len, 1)); + + aowner = new Array<bool> (bnda); + data = bnda.data (); +} + +idx_vector::idx_mask_rep::~idx_mask_rep (void) +{ + if (aowner) + delete aowner; + else + delete [] data; +} + +octave_idx_type +idx_vector::idx_mask_rep::xelem (octave_idx_type n) const +{ + if (n == lsti + 1) + { + lsti = n; + while (! data[++lste]) ; + } + else + { + lsti = n++; + lste = -1; + while (n > 0) + if (data[++lste]) --n; + } + return lste; +} + +octave_idx_type +idx_vector::idx_mask_rep::checkelem (octave_idx_type n) const +{ + if (n < 0 || n >= len) + { + gripe_invalid_index (); + return 0; + } + + return xelem (n); +} + +std::ostream& +idx_vector::idx_mask_rep::print (std::ostream& os) const +{ + os << '['; + + for (octave_idx_type ii = 0; ii < ext - 1; ii++) + os << data[ii] << ',' << ' '; + + if (ext > 0) + os << data[ext-1]; os << ']'; + + return os; +} + +Array<bool> +idx_vector::idx_mask_rep::unconvert (void) const +{ + if (aowner) + return *aowner; + else + { + Array<bool> retval (dim_vector (ext, 1)); + for (octave_idx_type i = 0; i < ext; i++) + retval.xelem (i) = data[i]; + return retval; + } +} + +Array<octave_idx_type> +idx_vector::idx_mask_rep::as_array (void) +{ + if (aowner) + return aowner->find ().reshape (orig_dims); + else + { + Array<bool> retval (orig_dims); + for (octave_idx_type i = 0, j = 0; i < ext; i++) + if (data[i]) + retval.xelem (j++) = i; + + return retval; + } +} + +idx_vector::idx_base_rep * +idx_vector::idx_mask_rep::sort_idx (Array<octave_idx_type>& idx) +{ + idx.clear (len, 1); + for (octave_idx_type i = 0; i < len; i++) + idx.xelem (i) = i; + + count++; + return this; +} + +const idx_vector idx_vector::colon (new idx_vector::idx_colon_rep ()); + +idx_vector::idx_vector (const Array<bool>& bnda) + : rep (0) +{ + // Convert only if it means saving at least half the memory. + static const int factor = (2 * sizeof (octave_idx_type)); + octave_idx_type nnz = bnda.nnz (); + if (nnz <= bnda.numel () / factor) + rep = new idx_vector_rep (bnda, nnz); + else + rep = new idx_mask_rep (bnda, nnz); +} + +bool +idx_vector::maybe_reduce (octave_idx_type n, const idx_vector& j, + octave_idx_type nj) +{ + bool reduced = false; + + // Empty index always reduces. + if (rep->length (n) == 0) + { + *this = idx_vector (); + return true; + } + + // Possibly skip singleton dims. + if (n == 1 && rep->is_colon_equiv (n)) + { + *this = j; + return true; + } + + if (nj == 1 && j.is_colon_equiv (nj)) + return true; + + switch (j.idx_class ()) + { + case class_colon: + switch (rep->idx_class ()) + { + case class_colon: + // (:,:) reduces to (:) + reduced = true; + break; + + case class_scalar: + { + // (i,:) reduces to a range. + idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep); + octave_idx_type k = r->get_data (); + *this = new idx_range_rep (k, nj, n, DIRECT); + reduced = true; + } + break; + + case class_range: + { + // (i:k:end,:) reduces to a range if i <= k and k divides n. + idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep); + octave_idx_type s = r->get_start (), l = r->length (n); + octave_idx_type t = r->get_step (); + if (l*t == n) + { + *this = new idx_range_rep (s, l * nj, t, DIRECT); + reduced = true; + } + } + break; + + default: + break; + } + break; + + case class_range: + switch (rep->idx_class ()) + { + case class_colon: + { + // (:,i:j) reduces to a range (the step must be 1) + idx_range_rep * rj = dynamic_cast<idx_range_rep *> (j.rep); + if (rj->get_step () == 1) + { + octave_idx_type sj = rj->get_start (), lj = rj->length (nj); + *this = new idx_range_rep (sj * n, lj * n, 1, DIRECT); + reduced = true; + } + } + break; + + case class_scalar: + { + // (k,i:d:j) reduces to a range. + idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep); + idx_range_rep * rj = dynamic_cast<idx_range_rep *> (j.rep); + octave_idx_type k = r->get_data (); + octave_idx_type sj = rj->get_start (), lj = rj->length (nj); + octave_idx_type tj = rj->get_step (); + *this = new idx_range_rep (n * sj + k, lj, n * tj, DIRECT); + reduced = true; + } + break; + + case class_range: + { + // (i:k:end,p:q) reduces to a range if i <= k and k divides n. + // (ones (1, m), ones (1, n)) reduces to (ones (1, m*n)) + idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep); + octave_idx_type s = r->get_start (), l = r->length (n); + octave_idx_type t = r->get_step (); + idx_range_rep * rj = dynamic_cast<idx_range_rep *> (j.rep); + octave_idx_type sj = rj->get_start (), lj = rj->length (nj); + octave_idx_type tj = rj->get_step (); + if ((l*t == n && tj == 1) || (t == 0 && tj == 0)) + { + *this = new idx_range_rep (s + n * sj, l * lj, t, DIRECT); + reduced = true; + } + } + break; + + default: + break; + } + break; + + case class_scalar: + switch (rep->idx_class ()) + { + case class_scalar: + { + // (i,j) reduces to a single index. + idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep); + idx_scalar_rep * rj = dynamic_cast<idx_scalar_rep *> (j.rep); + octave_idx_type k = r->get_data () + n * rj->get_data (); + *this = new idx_scalar_rep (k, DIRECT); + reduced = true; + } + break; + + case class_range: + { + // (i:d:j,k) reduces to a range. + idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep); + idx_scalar_rep * rj = dynamic_cast<idx_scalar_rep *> (j.rep); + octave_idx_type s = r->get_start (), l = r->length (nj); + octave_idx_type t = r->get_step (); + octave_idx_type k = rj->get_data (); + *this = new idx_range_rep (n * k + s, l, t, DIRECT); + reduced = true; + } + break; + + case class_colon: + { + // (:,k) reduces to a range. + idx_scalar_rep * rj = dynamic_cast<idx_scalar_rep *> (j.rep); + octave_idx_type k = rj->get_data (); + *this = new idx_range_rep (n * k, n, 1, DIRECT); + reduced = true; + } + break; + + default: + break; + } + break; + + default: + break; + } + + return reduced; +} + +bool +idx_vector::is_cont_range (octave_idx_type n, + octave_idx_type& l, octave_idx_type& u) const +{ + bool res = false; + + switch (rep->idx_class ()) + { + case class_colon: + l = 0; u = n; + res = true; + break; + + case class_range: + { + idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep); + if (r->get_step () == 1) + { + l = r->get_start (); + u = l + r->length (n); + res = true; + } + } + break; + + case class_scalar: + { + idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep); + l = r->get_data (); + u = l + 1; + res = true; + } + break; + + case class_mask: + { + idx_mask_rep * r = dynamic_cast<idx_mask_rep *> (rep); + octave_idx_type ext = r->extent (0), len = r->length (0); + if (ext == len) + { + l = 0; + u = len; + res = true; + } + } + + default: + break; + } + + return res; +} + +octave_idx_type +idx_vector::increment (void) const +{ + octave_idx_type retval = 0; + + switch (rep->idx_class ()) + { + case class_colon: + retval = 1; + break; + + case class_range: + retval = dynamic_cast<idx_range_rep *> (rep) -> get_step (); + break; + + case class_vector: + case class_mask: + { + if (length (0) > 1) + retval = elem (1) - elem (0); + } + break; + + default: + break; + } + + return retval; +} + +const octave_idx_type * +idx_vector::raw (void) +{ + if (rep->idx_class () != class_vector) + *this = idx_vector (as_array (), extent (0)); + + idx_vector_rep * r = dynamic_cast<idx_vector_rep *> (rep); + + assert (r != 0); + + return r->get_data (); +} + +void +idx_vector::copy_data (octave_idx_type *data) const +{ + octave_idx_type len = rep->length (0); + + switch (rep->idx_class ()) + { + case class_colon: + current_liboctave_error_handler ("colon not allowed"); + break; + + case class_range: + { + idx_range_rep * r = dynamic_cast<idx_range_rep *> (rep); + octave_idx_type start = r->get_start (), step = r->get_step (); + octave_idx_type i, j; + if (step == 1) + for (i = start, j = start + len; i < j; i++) *data++ = i; + else if (step == -1) + for (i = start, j = start - len; i > j; i--) *data++ = i; + else + for (i = 0, j = start; i < len; i++, j += step) *data++ = j; + } + break; + + case class_scalar: + { + idx_scalar_rep * r = dynamic_cast<idx_scalar_rep *> (rep); + *data = r->get_data (); + } + break; + + case class_vector: + { + idx_vector_rep * r = dynamic_cast<idx_vector_rep *> (rep); + const octave_idx_type *rdata = r->get_data (); + copy_or_memcpy (len, rdata, data); + } + break; + + case class_mask: + { + idx_mask_rep * r = dynamic_cast<idx_mask_rep *> (rep); + const bool *mask = r->get_data (); + octave_idx_type ext = r->extent (0); + for (octave_idx_type i = 0, j = 0; i < ext; i++) + if (mask[i]) + data[j++] = i; + } + break; + + default: + assert (false); + break; + } +} + +idx_vector +idx_vector::complement (octave_idx_type n) const +{ + idx_vector retval; + if (extent (n) > n) + (*current_liboctave_error_handler) + ("internal error: out of range complement index requested"); + + if (idx_class () == class_mask) + { + idx_mask_rep * r = dynamic_cast<idx_mask_rep *> (rep); + octave_idx_type nz = r->length (0), ext = r->extent (0); + Array<bool> mask (dim_vector (n, 1)); + const bool *data = r->get_data (); + bool *ndata = mask.fortran_vec (); + for (octave_idx_type i = 0; i < ext; i++) + ndata[i] = ! data[i]; + for (octave_idx_type i = ext; i < n; i++) + ndata[i] = true; + retval = new idx_mask_rep (mask, n - nz); + } + else + { + Array<bool> mask (dim_vector (n, 1), true); + fill (false, length (n), mask.fortran_vec ()); + retval = idx_vector (mask); + } + + return retval; +} + +bool +idx_vector::is_permutation (octave_idx_type n) const +{ + bool retval = false; + + if (is_colon_equiv (n)) + retval = true; + else if (length(n) == n && extent(n) == n) + { + OCTAVE_LOCAL_BUFFER_INIT (bool, left, n, true); + + retval = true; + + for (octave_idx_type i = 0, len = length (); i < len; i++) + { + octave_idx_type k = xelem (i); + if (left[k]) + left[k] = false; + else + { + retval = false; + break; + } + } + } + + return retval; +} + +idx_vector +idx_vector::inverse_permutation (octave_idx_type n) const +{ + assert (n == length (n)); + + idx_vector retval; + + switch (idx_class ()) + { + case class_range: + { + if (increment () == -1) + retval = sorted (); + else + retval = *this; + break; + } + case class_vector: + { + idx_vector_rep *r = dynamic_cast<idx_vector_rep *> (rep); + const octave_idx_type *ri = r->get_data (); + Array<octave_idx_type> idx (orig_dimensions ()); + for (octave_idx_type i = 0; i < n; i++) + idx.xelem (ri[i]) = i; + retval = new idx_vector_rep (idx, r->extent (0), DIRECT); + break; + } + default: + retval = *this; + break; + } + + return retval; +} + +idx_vector +idx_vector::unmask (void) const +{ + if (idx_class () == class_mask) + { + idx_mask_rep * r = dynamic_cast<idx_mask_rep *> (rep); + const bool *data = r->get_data (); + octave_idx_type ext = r->extent (0), len = r->length (0); + octave_idx_type *idata = new octave_idx_type [len]; + + for (octave_idx_type i = 0, j = 0; i < ext; i++) + if (data[i]) + idata[j++] = i; + + ext = len > 0 ? idata[len - 1] + 1 : 0; + + return new idx_vector_rep (idata, len, ext, r->orig_dimensions (), + DIRECT); + } + else + return *this; +} + +void idx_vector::unconvert (idx_class_type& iclass, + double& scalar, Range& range, + Array<double>& array, Array<bool>& mask) const +{ + iclass = idx_class (); + switch (iclass) + { + case class_colon: + break; + + case class_range: + { + idx_range_rep *r = dynamic_cast<idx_range_rep *> (rep); + range = r->unconvert (); + } + break; + + case class_scalar: + { + idx_scalar_rep *r = dynamic_cast<idx_scalar_rep *> (rep); + scalar = r->unconvert (); + } + break; + + case class_vector: + { + idx_vector_rep *r = dynamic_cast<idx_vector_rep *> (rep); + array = r->unconvert (); + } + break; + + case class_mask: + { + idx_mask_rep *r = dynamic_cast<idx_mask_rep *> (rep); + mask = r->unconvert (); + } + break; + + default: + assert (false); + break; + } +} + +Array<octave_idx_type> +idx_vector::as_array (void) const +{ + return rep->as_array (); +} + +bool +idx_vector::is_vector (void) const +{ + return idx_class () != class_vector || orig_dimensions ().is_vector (); +} + +octave_idx_type +idx_vector::freeze (octave_idx_type z_len, const char *, bool resize_ok) +{ + if (! resize_ok && extent (z_len) > z_len) + { + (*current_liboctave_error_handler) + ("invalid matrix index = %d", extent (z_len)); + rep->err = true; + chkerr (); + } + + return length (z_len); +} + +octave_idx_type +idx_vector::ones_count () const +{ + octave_idx_type n = 0; + + if (is_colon ()) + n = 1; + else + { + for (octave_idx_type i = 0; i < length (1); i++) + if (xelem (i) == 0) + n++; + } + + return n; +} + +// Instantiate the octave_int constructors we want. +#define INSTANTIATE_SCALAR_VECTOR_REP_CONST(T) \ + template OCTAVE_API idx_vector::idx_scalar_rep::idx_scalar_rep (T); \ + template OCTAVE_API idx_vector::idx_vector_rep::idx_vector_rep (const Array<T>&); + +INSTANTIATE_SCALAR_VECTOR_REP_CONST (float) +INSTANTIATE_SCALAR_VECTOR_REP_CONST (double) +INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_int8) +INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_int16) +INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_int32) +INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_int64) +INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_uint8) +INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_uint16) +INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_uint32) +INSTANTIATE_SCALAR_VECTOR_REP_CONST (octave_uint64) + +/* + +%!error id=Octave:index-out-of-bounds 1(find ([1,1] != 0)) +%!assert ((1:3)(find ([1,0,1] != 0)), [1,3]) + +*/