Mercurial > hg > octave-nkf
diff liboctave/Array2.h @ 7503:8c32f95c2639
convert mapper functions to new format
author | David Bateman <dbateman@free.fr> |
---|---|
date | Wed, 20 Feb 2008 04:22:50 -0500 (2008-02-20) |
parents | 2467639bd8c0 |
children | 36594d5bbe13 |
line wrap: on
line diff
--- a/liboctave/Array2.h +++ b/liboctave/Array2.h @@ -75,6 +75,13 @@ Array2 (const Array<T>& a, octave_idx_type r, octave_idx_type c) : Array<T> (a, dim_vector (r, c)) { } + template <class U> + Array2 (const Array<U>& a) : Array<T> (a) { } + + template <class U> + Array2 (const Array<U>& a, const dim_vector& dv) + : Array<T> (a, dv) { } + ~Array2 (void) { } Array2<T>& operator = (const Array2<T>& a) @@ -128,6 +135,12 @@ Array<T> tmp = Array<T>::sort (sidx, dim, mode); return Array2<T> (tmp, tmp.rows (), tmp.columns ()); } + + template <class U, class F> + Array2<U> map (F fcn) const + { + return Array<T>::template map<U> (fcn); + } }; #endif