Mercurial > hg > octave-nkf
view liboctave/array/Range.h @ 20438: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 | 96153b16febe |
line wrap: on
line source
/* Copyright (C) 1993-2015 John W. Eaton 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_Range_h) #define octave_Range_h 1 #include <iosfwd> #include "dMatrix.h" #include "oct-sort.h" class OCTAVE_API Range { public: Range (void) : rng_base (0), rng_limit (0), rng_inc (0), rng_numel (0), cache (1, 0) { } Range (const Range& r) : rng_base (r.rng_base), rng_limit (r.rng_limit), rng_inc (r.rng_inc), rng_numel (r.rng_numel), cache (r.cache) { } Range (double b, double l) : rng_base (b), rng_limit (l), rng_inc (1), rng_numel (numel_internal ()), cache () { } Range (double b, double l, double i) : rng_base (b), rng_limit (l), rng_inc (i), rng_numel (numel_internal ()), cache () { } // For operators' usage (to preserve element count). Range (double b, double i, octave_idx_type n) : rng_base (b), rng_limit (b + (n-1) * i), rng_inc (i), rng_numel (n), cache () { if (! xfinite (b) || ! xfinite (i) || ! xfinite (rng_limit)) rng_numel = -2; } double base (void) const { return rng_base; } double limit (void) const { return rng_limit; } double inc (void) const { return rng_inc; } GCC_ATTR_DEPRECATED octave_idx_type nelem (void) const { return numel (); } octave_idx_type numel (void) const { return rng_numel; } bool all_elements_are_ints (void) const; Matrix matrix_value (void) const; double min (void) const; double max (void) const; void sort_internal (bool ascending = true); void sort_internal (Array<octave_idx_type>& sidx, bool ascending = true); Matrix diag (octave_idx_type k = 0) const; Range sort (octave_idx_type dim = 0, sortmode mode = ASCENDING) const; Range sort (Array<octave_idx_type>& sidx, octave_idx_type dim = 0, sortmode mode = ASCENDING) const; sortmode is_sorted (sortmode mode = ASCENDING) const; // Support for single-index subscripting, without generating matrix cache. double checkelem (octave_idx_type i) const; double elem (octave_idx_type i) const; Array<double> index (const idx_vector& i) const; void set_base (double b) { if (rng_base != b) { rng_base = b; clear_cache (); } } void set_limit (double l) { if (rng_limit != l) { rng_limit = l; clear_cache (); } } void set_inc (double i) { if (rng_inc != i) { rng_inc = i; clear_cache (); } } friend OCTAVE_API std::ostream& operator << (std::ostream& os, const Range& r); friend OCTAVE_API std::istream& operator >> (std::istream& is, Range& r); friend OCTAVE_API Range operator - (const Range& r); friend OCTAVE_API Range operator + (double x, const Range& r); friend OCTAVE_API Range operator + (const Range& r, double x); friend OCTAVE_API Range operator - (double x, const Range& r); friend OCTAVE_API Range operator - (const Range& r, double x); friend OCTAVE_API Range operator * (double x, const Range& r); friend OCTAVE_API Range operator * (const Range& r, double x); void print_range (void); private: double rng_base; double rng_limit; double rng_inc; octave_idx_type rng_numel; mutable Matrix cache; octave_idx_type numel_internal (void) const; void clear_cache (void) const { cache.resize (0, 0); } protected: // For operators' usage (to allow all values to be set directly). Range (double b, double l, double i, octave_idx_type n) : rng_base (b), rng_limit (l), rng_inc (i), rng_numel (n), cache () { if (! xfinite (b) || ! xfinite (i) || ! xfinite (l)) rng_numel = -2; } }; extern OCTAVE_API Range operator - (const Range& r); extern OCTAVE_API Range operator + (double x, const Range& r); extern OCTAVE_API Range operator + (const Range& r, double x); extern OCTAVE_API Range operator - (double x, const Range& r); extern OCTAVE_API Range operator - (const Range& r, double x); extern OCTAVE_API Range operator * (double x, const Range& r); extern OCTAVE_API Range operator * (const Range& r, double x); #endif