Mercurial > octave-nkf
view liboctave/array/PermMatrix.h @ 20263:00cf2847355d
Deprecate Array::nelem() and Range::nelem() in favour of ::numel().
* liboctave/array/Array.h (Array::nelem) deprecate in favour of numel().
(Array::capacity, Array:: length): change to call numel() directly. These
methods will be deprecated soon.
* liboctave/array/PermMatrix.h (PermMatrix::nelem): deprecate in favour of
numel().
* liboctave/array/Range.h (Range::numel) new method to replace nelem().
(Range::nelem) deprecate in favour of the new method numel.
* liboctave/array/Sparse.h (Sparse::nelem) deprecate in favour of nzmax().
This one is secially bad because unlike the other classes, it is different
from numel().
* libinterp/corefcn/debug.cc, libinterp/corefcn/jit-typeinfo.cc,
libinterp/corefcn/ls-mat4.cc, libinterp/corefcn/lu.cc,
libinterp/corefcn/luinc.cc, libinterp/corefcn/max.cc,
libinterp/corefcn/pr-output.cc, libinterp/corefcn/rand.cc,
libinterp/corefcn/xpow.cc, libinterp/dldfcn/__magick_read__.cc,
libinterp/dldfcn/audioread.cc, libinterp/octave-value/ov-base-int.cc,
libinterp/octave-value/ov-bool-mat.cc, libinterp/octave-value/ov-flt-re-mat.cc,
libinterp/octave-value/ov-perm.cc, libinterp/octave-value/ov-range.cc,
libinterp/octave-value/ov-range.h, libinterp/octave-value/ov-re-mat.cc,
libinterp/parse-tree/pt-eval.cc, liboctave/array/Array.cc,
liboctave/array/CNDArray.cc, liboctave/array/Range.cc,
liboctave/array/dNDArray.cc, liboctave/array/fCNDArray.cc,
liboctave/array/fNDArray.cc, liboctave/array/idx-vector.cc,
liboctave/array/intNDArray.cc, liboctave/numeric/SparseCmplxLU.cc,
liboctave/numeric/SparsedbleLU.cc: replace use of nelem() with numel().
author | Carnë Draug <carandraug@octave.org> |
---|---|
date | Sun, 24 May 2015 02:41:37 +0100 |
parents | 4197fc428c7d |
children | a9574e3c6e9e |
line wrap: on
line source
/* Copyright (C) 2008-2015 Jaroslav Hajek 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_PermMatrix_h) #define octave_PermMatrix_h 1 #include "Array.h" #include "mx-defs.h" // Array<T> is inherited privately so that some methods, like index, don't // produce unexpected results. class OCTAVE_API PermMatrix : protected Array<octave_idx_type> { public: PermMatrix (void) : Array<octave_idx_type> () { } PermMatrix (octave_idx_type n); PermMatrix (const Array<octave_idx_type>& p) GCC_ATTR_DEPRECATED; PermMatrix (const Array<octave_idx_type>& p, bool colp, bool check = true); PermMatrix (const PermMatrix& m) : Array<octave_idx_type> (m) { } PermMatrix (const idx_vector& idx) GCC_ATTR_DEPRECATED; PermMatrix (const idx_vector& idx, bool colp, octave_idx_type n = 0); octave_idx_type dim1 (void) const { return Array<octave_idx_type>::length (); } octave_idx_type dim2 (void) const { return Array<octave_idx_type>::length (); } octave_idx_type rows (void) const { return dim1 (); } octave_idx_type cols (void) const { return dim2 (); } octave_idx_type columns (void) const { return dim2 (); } octave_idx_type perm_length (void) const { return Array<octave_idx_type>::length (); } // FIXME: a dangerous ambiguity? octave_idx_type length (void) const { return perm_length (); } GCC_ATTR_DEPRECATED octave_idx_type nelem (void) const { return numel (); } octave_idx_type numel (void) const { return dim1 () * dim2 (); } size_t byte_size (void) const { return Array<octave_idx_type>::byte_size (); } dim_vector dims (void) const { return dim_vector (dim1 (), dim2 ()); } const Array<octave_idx_type>& col_perm_vec (void) const { return *this; } octave_idx_type elem (octave_idx_type i, octave_idx_type j) const { return (Array<octave_idx_type>::elem (j) == i) ? 1 : 0; } octave_idx_type checkelem (octave_idx_type i, octave_idx_type j) const; octave_idx_type operator () (octave_idx_type i, octave_idx_type j) const { #if defined (BOUNDS_CHECKING) return checkelem (i, j); #else return elem (i, j); #endif } // These are, in fact, super-fast. PermMatrix transpose (void) const; PermMatrix inverse (void) const; // Determinant, i.e. the sign of permutation. octave_idx_type determinant (void) const; // Efficient integer power of a permutation. PermMatrix power (octave_idx_type n) const; bool is_col_perm (void) const { return true; } bool is_row_perm (void) const { return false; } void print_info (std::ostream& os, const std::string& prefix) const { Array<octave_idx_type>::print_info (os, prefix); } static PermMatrix eye (octave_idx_type n); private: PermMatrix pos_power (octave_idx_type m) const; void setup (const Array<octave_idx_type>& p, bool colp, bool check); void setup (const idx_vector& idx, bool colp, octave_idx_type n); }; // Multiplying permutations together. PermMatrix OCTAVE_API operator * (const PermMatrix& a, const PermMatrix& b); #endif