Mercurial > hg > octave-lyh
view liboctave/array/MArray.h @ 17136:f72ffae1fcc3
delaunay.m: Fixed matlab compatibility and input check for single matrix (bug #39644)
* scripts/geometry/delaunay.m: check for equal size of X and Y, check for 2 column single matrix input, added 2 tests for these two changes
author | Andreas Weber <andreas.weber@hs-offenburg.de> |
---|---|
date | Thu, 01 Aug 2013 15:16:14 +0200 |
parents | 648dabbb4c6b |
children |
line wrap: on
line source
// Template array classes with like-type math ops /* Copyright (C) 1993-2012 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/>. */ #if !defined (octave_MArray_h) #define octave_MArray_h 1 #include "Array.h" // N-dimensional array with math ops. // But first, some preprocessor abuse... #include "MArray-decl.h" MARRAY_OPS_FORWARD_DECLS (MArray, ) template <class T> class MArray : public Array<T> { protected: // For jit support MArray (T *sdata, octave_idx_type slen, octave_idx_type *adims, void *arep) : Array<T> (sdata, slen, adims, arep) { } public: MArray (void) : Array<T> () {} explicit MArray (octave_idx_type n) GCC_ATTR_DEPRECATED : Array<T> (dim_vector (n, 1)) { } MArray (octave_idx_type n, const T& val) GCC_ATTR_DEPRECATED : Array<T> (dim_vector (n, 1), val) { } explicit MArray (const dim_vector& dv) : Array<T> (dv) { } explicit MArray (const dim_vector& dv, const T& val) : Array<T> (dv, val) { } MArray (const MArray<T>& a) : Array<T> (a) { } template <class U> MArray (const Array<U>& a) : Array<T> (a) { } ~MArray (void) { } MArray<T>& operator = (const MArray<T>& a) { Array<T>::operator = (a); return *this; } MArray<T> reshape (const dim_vector& new_dims) const { return Array<T>::reshape (new_dims); } MArray<T> permute (const Array<octave_idx_type>& vec, bool inv = false) const { return Array<T>::permute (vec, inv); } MArray<T> ipermute (const Array<octave_idx_type>& vec) const { return Array<T>::ipermute (vec); } MArray squeeze (void) const { return Array<T>::squeeze (); } MArray<T> transpose (void) const { return Array<T>::transpose (); } MArray<T> hermitian (T (*fcn) (const T&) = 0) const { return Array<T>::hermitian (fcn); } // Performs indexed accumulative addition. void idx_add (const idx_vector& idx, T val); void idx_add (const idx_vector& idx, const MArray<T>& vals); void idx_min (const idx_vector& idx, const MArray<T>& vals); void idx_max (const idx_vector& idx, const MArray<T>& vals); void idx_add_nd (const idx_vector& idx, const MArray<T>& vals, int dim = -1); void changesign (void); }; #endif