Mercurial > octave-nkf
view liboctave/array/Array-d.cc @ 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 |
line wrap: on
line source
/* Copyright (C) 1994-2015 John W. Eaton Copyright (C) 2009 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 // Instantiate Arrays of double values. #include "lo-mappers.h" #include "Array.h" #include "Array.cc" #include "oct-locbuf.h" #define INLINE_ASCENDING_SORT #define INLINE_DESCENDING_SORT #include "oct-sort.cc" template <> inline bool sort_isnan<double> (double x) { return xisnan (x); } static bool nan_ascending_compare (double x, double y) { return xisnan (y) ? ! xisnan (x) : x < y; } static bool nan_descending_compare (double x, double y) { return xisnan (x) ? ! xisnan (y) : x > y; } Array<double>::compare_fcn_type safe_comparator (sortmode mode, const Array<double>& a , bool allow_chk) { Array<double>::compare_fcn_type result = 0; if (allow_chk) { octave_idx_type k = 0; for (; k < a.numel () && ! xisnan (a(k)); k++) ; if (k == a.numel ()) { if (mode == ASCENDING) result = octave_sort<double>::ascending_compare; else if (mode == DESCENDING) result = octave_sort<double>::descending_compare; } } if (! result) { if (mode == ASCENDING) result = nan_ascending_compare; else if (mode == DESCENDING) result = nan_descending_compare; } return result; } // The default solution using NaN-safe comparator is OK, but almost twice as // slow than this code. template <> OCTAVE_API sortmode Array<double>::is_sorted (sortmode mode) const { octave_idx_type n = numel (); const double *el = data (); if (n <= 1) return mode ? mode : ASCENDING; if (! mode) { // Auto-detect mode. if (el[n-1] < el[0] || xisnan (el[0])) mode = DESCENDING; else mode = ASCENDING; } if (mode == DESCENDING) { octave_idx_type j = 0; double r; // Sort out NaNs. do r = el[j++]; while (xisnan (r) && j < n); // Orient the test so that NaN will not pass through. for (; j < n; j++) { if (r >= el[j]) r = el[j]; else { mode = UNSORTED; break; } } } else if (mode == ASCENDING) { // Sort out NaNs. while (n > 0 && xisnan (el[n-1])) n--; if (n > 0) { // Orient the test so that NaN will not pass through. double r = el[0]; for (octave_idx_type j = 1; j < n; j++) { if (r <= el[j]) r = el[j]; else { mode = UNSORTED; break; } } } } return mode; } template class OCTAVE_API octave_sort<double>; INSTANTIATE_ARRAY (double, OCTAVE_API); template OCTAVE_API std::ostream& operator << (std::ostream&, const Array<double>&); #include "DiagArray2.h" #include "DiagArray2.cc" template class OCTAVE_API DiagArray2<double>;