Mercurial > hg > octave-nkf
view liboctave/array/MatrixType.h @ 20442:a9574e3c6e9e
Deprecate Array::length() and Sparse::length() in favour of ::numel().
* liboctave/array/Array.h (Array::length): deprecate for ::numel.
* liboctave/array/Sparse.h (Sparse::length): deprecate for ::numel.
* libgui/graphics/QtHandlesUtils.cc, libgui/src/octave-qt-link.cc,
libinterp/corefcn/Cell.cc, libinterp/corefcn/__contourc__.cc,
libinterp/corefcn/__pchip_deriv__.cc, libinterp/corefcn/__qp__.cc,
libinterp/corefcn/cellfun.cc, libinterp/corefcn/daspk.cc,
libinterp/corefcn/dasrt.cc, libinterp/corefcn/dassl.cc,
libinterp/corefcn/data.cc, libinterp/corefcn/filter.cc,
libinterp/corefcn/find.cc, libinterp/corefcn/gl-render.cc,
libinterp/corefcn/gl-render.h, libinterp/corefcn/graphics.cc,
libinterp/corefcn/graphics.in.h, libinterp/corefcn/help.cc,
libinterp/corefcn/hex2num.cc, libinterp/corefcn/input.cc,
libinterp/corefcn/load-path.cc, libinterp/corefcn/load-save.cc,
libinterp/corefcn/ls-oct-ascii.h, libinterp/corefcn/lsode.cc,
libinterp/corefcn/matrix_type.cc, libinterp/corefcn/oct-hist.cc,
libinterp/corefcn/oct-map.cc, libinterp/corefcn/oct-map.h,
libinterp/corefcn/oct-obj.h, libinterp/corefcn/oct-stream.cc,
libinterp/corefcn/oct-stream.h, libinterp/corefcn/pr-output.cc,
libinterp/corefcn/quadcc.cc, libinterp/corefcn/rand.cc,
libinterp/corefcn/regexp.cc, libinterp/corefcn/strfns.cc,
libinterp/corefcn/sub2ind.cc, libinterp/corefcn/symtab.h,
libinterp/corefcn/syscalls.cc, libinterp/corefcn/tsearch.cc,
libinterp/corefcn/urlwrite.cc, libinterp/corefcn/utils.cc,
libinterp/corefcn/variables.cc, libinterp/corefcn/xdiv.cc,
libinterp/corefcn/xpow.cc, libinterp/dldfcn/__glpk__.cc,
libinterp/dldfcn/__init_fltk__.cc, libinterp/dldfcn/__magick_read__.cc,
libinterp/dldfcn/audiodevinfo.cc, libinterp/dldfcn/ccolamd.cc,
libinterp/dldfcn/colamd.cc, libinterp/octave-value/ov-cell.cc,
libinterp/octave-value/ov-class.cc, libinterp/octave-value/ov-class.h,
libinterp/octave-value/ov-fcn-inline.cc, libinterp/octave-value/ov-java.cc,
libinterp/octave-value/ov-perm.cc, libinterp/octave-value/ov-struct.cc,
libinterp/octave-value/ov-typeinfo.cc, libinterp/octave-value/ov.cc,
libinterp/operators/op-int.h, libinterp/parse-tree/pt-pr-code.cc,
liboctave/array/Array-util.cc, liboctave/array/Array.cc,
liboctave/array/CColVector.cc, liboctave/array/CDiagMatrix.cc,
liboctave/array/CMatrix.cc, liboctave/array/CRowVector.cc,
liboctave/array/DiagArray2.cc, liboctave/array/DiagArray2.h,
liboctave/array/MArray.cc, liboctave/array/PermMatrix.cc,
liboctave/array/PermMatrix.h, liboctave/array/Sparse.cc,
liboctave/array/boolMatrix.cc, liboctave/array/chMatrix.cc,
liboctave/array/chNDArray.cc, liboctave/array/dColVector.cc,
liboctave/array/dDiagMatrix.cc, liboctave/array/dMatrix.cc,
liboctave/array/dRowVector.cc, liboctave/array/fCColVector.cc,
liboctave/array/fCDiagMatrix.cc, liboctave/array/fCMatrix.cc,
liboctave/array/fCRowVector.cc, liboctave/array/fColVector.cc,
liboctave/array/fDiagMatrix.cc, liboctave/array/fMatrix.cc,
liboctave/array/fRowVector.cc, liboctave/array/idx-vector.cc,
liboctave/array/intNDArray.cc, liboctave/numeric/CmplxCHOL.cc,
liboctave/numeric/CmplxLU.cc, liboctave/numeric/CmplxQR.cc,
liboctave/numeric/DASPK.cc, liboctave/numeric/DASRT.cc,
liboctave/numeric/DASSL.cc, liboctave/numeric/LSODE.cc,
liboctave/numeric/ODES.cc, liboctave/numeric/ODES.h,
liboctave/numeric/base-dae.h, liboctave/numeric/base-lu.cc,
liboctave/numeric/dbleCHOL.cc, liboctave/numeric/dbleLU.cc,
liboctave/numeric/dbleQR.cc, liboctave/numeric/eigs-base.cc,
liboctave/numeric/fCmplxCHOL.cc, liboctave/numeric/fCmplxLU.cc,
liboctave/numeric/fCmplxQR.cc, liboctave/numeric/floatCHOL.cc,
liboctave/numeric/floatLU.cc, liboctave/numeric/floatQR.cc,
liboctave/numeric/lo-specfun.cc, liboctave/numeric/oct-rand.cc,
liboctave/numeric/oct-spparms.cc, liboctave/numeric/sparse-base-chol.cc,
liboctave/operators/mx-inlines.cc, liboctave/system/file-ops.cc,
liboctave/util/glob-match.h, liboctave/util/kpse.cc,
liboctave/util/lo-regexp.cc, liboctave/util/oct-glob.cc,
liboctave/util/pathsearch.cc, liboctave/util/str-vec.cc,
liboctave/util/str-vec.h, liboctave/util/url-transfer.cc: replace all usage
of Array::length() and Sparse::length() with ::numel().
author | Carnë Draug <carandraug@octave.org> |
---|---|
date | Sat, 30 May 2015 03:14:07 +0100 |
parents | 17d647821d61 |
children |
line wrap: on
line source
/* Copyright (C) 2006-2015 David Bateman Copyright (C) 2006 Andy Adler 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/>. */ #if !defined (octave_MatrixType_h) #define octave_MatrixType_h class Matrix; class ComplexMatrix; class FloatMatrix; class FloatComplexMatrix; class SparseMatrix; class SparseComplexMatrix; class OCTAVE_API MatrixType { public: enum matrix_type { Unknown = 0, Full, Diagonal, Permuted_Diagonal, Upper, Lower, Permuted_Upper, Permuted_Lower, Banded, Hermitian, Banded_Hermitian, Tridiagonal, Tridiagonal_Hermitian, Rectangular }; MatrixType (void); MatrixType (const MatrixType &a); MatrixType (const Matrix &a); MatrixType (const ComplexMatrix &a); MatrixType (const FloatMatrix &a); MatrixType (const FloatComplexMatrix &a); MatrixType (const SparseMatrix &a); MatrixType (const SparseComplexMatrix &a); MatrixType (const matrix_type t, bool _full = false); MatrixType (const matrix_type t, const octave_idx_type np, const octave_idx_type *p, bool _full = false); MatrixType (const matrix_type t, const octave_idx_type ku, const octave_idx_type kl, bool _full = false); ~MatrixType (void); MatrixType& operator = (const MatrixType& a); int type (bool quiet = true); int type (const Matrix &a); int type (const ComplexMatrix &a); int type (const FloatMatrix &a); int type (const FloatComplexMatrix &a); int type (const SparseMatrix &a); int type (const SparseComplexMatrix &a); double band_density (void) const { return bandden; } int nupper (void) const { return upper_band; } int nlower (void) const { return lower_band; } bool is_dense (void) const { return dense; } bool is_diagonal (void) const { return (typ == Diagonal || typ == Permuted_Diagonal); } bool is_upper_triangular (void) const { return (typ == Upper || typ == Permuted_Upper); } bool is_lower_triangular (void) const { return (typ == Lower || typ == Permuted_Lower); } bool is_banded (void) { return (typ == Banded || typ == Banded_Hermitian); } bool is_tridiagonal (void) const { return (typ == Tridiagonal || typ == Tridiagonal_Hermitian); } bool is_hermitian (void) const { return (typ == Banded_Hermitian || typ == Tridiagonal_Hermitian || typ == Hermitian); } bool is_rectangular (void) const { return (typ == Rectangular); } bool is_known (void) const { return (typ != Unknown); } bool is_unknown (void) const { return (typ == Unknown); } void info (void) const; octave_idx_type * triangular_perm (void) const { return perm; } void invalidate_type (void) { typ = Unknown; } void mark_as_diagonal (void) { typ = Diagonal; } void mark_as_permuted_diagonal (void) { typ = Permuted_Diagonal; } void mark_as_upper_triangular (void) { typ = Upper; } void mark_as_lower_triangular (void) { typ = Lower; } void mark_as_tridiagonal (void) {typ = Tridiagonal; } void mark_as_banded (const octave_idx_type ku, const octave_idx_type kl) { typ = Banded; upper_band = ku; lower_band = kl; } void mark_as_full (void) { typ = Full; } void mark_as_rectangular (void) { typ = Rectangular; } void mark_as_dense (void) { dense = true; } void mark_as_not_dense (void) { dense = false; } void mark_as_symmetric (void); void mark_as_unsymmetric (void); void mark_as_permuted (const octave_idx_type np, const octave_idx_type *p); void mark_as_unpermuted (void); MatrixType transpose (void) const; private: void type (int new_typ) { typ = static_cast<matrix_type>(new_typ); } matrix_type typ; double sp_bandden; double bandden; octave_idx_type upper_band; octave_idx_type lower_band; bool dense; bool full; octave_idx_type nperm; octave_idx_type *perm; }; #endif