Mercurial > octave-nkf
view liboctave/array/DiagArray2.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 | a9574e3c6e9e |
line wrap: on
line source
// Template array classes /* Copyright (C) 1996-2015 John W. Eaton Copyright (C) 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 <cassert> #include <iostream> #include <algorithm> #include "DiagArray2.h" #include "lo-error.h" template <class T> DiagArray2<T>::DiagArray2 (const Array<T>& a, octave_idx_type r, octave_idx_type c) : Array<T> (a.as_column ()), d1 (r), d2 (c) { octave_idx_type rcmin = std::min (r, c); if (rcmin != a.length ()) Array<T>::resize (dim_vector (rcmin, 1)); } template <class T> Array<T> DiagArray2<T>::diag (octave_idx_type k) const { return extract_diag (k); } template <class T> Array<T> DiagArray2<T>::extract_diag (octave_idx_type k) const { Array<T> d; if (k == 0) // The main diagonal is shallow-copied. d = *this; else if (k > 0 && k < cols ()) d = Array<T> (dim_vector (std::min (cols () - k, rows ()), 1), T ()); else if (k < 0 && -k < rows ()) d = Array<T> (dim_vector (std::min (rows () + k, cols ()), 1), T ()); else // Matlab returns [] 0x1 for out-of-range diagonal d.resize (dim_vector (0, 1)); return d; } template <class T> DiagArray2<T> DiagArray2<T>::transpose (void) const { return DiagArray2<T> (*this, d2, d1); } template <class T> DiagArray2<T> DiagArray2<T>::hermitian (T (* fcn) (const T&)) const { return DiagArray2<T> (Array<T>::template map<T> (fcn), d2, d1); } // A two-dimensional array with diagonal elements only. template <class T> void DiagArray2<T>::resize (octave_idx_type r, octave_idx_type c, const T& rfv) { if (r < 0 || c < 0) { (*current_liboctave_error_handler) ("can't resize to negative dimensions"); return; } if (r != dim1 () || c != dim2 ()) { Array<T>::resize (dim_vector (std::min (r, c), 1), rfv); d1 = r; d2 = c; } } template <class T> Array<T> DiagArray2<T>::array_value (void) const { Array<T> result (dims (), T (0)); for (octave_idx_type i = 0, len = length (); i < len; i++) result.xelem (i, i) = dgelem (i); return result; } template <typename T> bool DiagArray2<T>::check_idx (octave_idx_type r, octave_idx_type c) const { bool ok = true; if (r < 0 || r >= dim1 ()) { gripe_index_out_of_range (2, 1, r+1, dim1 ()); ok = false; } if (c < 0 || c >= dim2 ()) { gripe_index_out_of_range (2, 2, c+1, dim2 ()); ok = false; } return ok; }