comparison liboctave/MArrayN.h @ 4902:bd043a433918

[project @ 2004-06-14 18:46:20 by jwe]
author jwe
date Mon, 14 Jun 2004 18:49:09 +0000
parents 334a27c8f453
children e35b034d3523
comparison
equal deleted inserted replaced
4901:35bfb4e0b96b 4902:bd043a433918
54 54
55 MArrayN (const dim_vector& dv) : ArrayN<T> (dv) { } 55 MArrayN (const dim_vector& dv) : ArrayN<T> (dv) { }
56 56
57 MArrayN (const dim_vector& dv, const T& val) : ArrayN<T> (dv, val) { } 57 MArrayN (const dim_vector& dv, const T& val) : ArrayN<T> (dv, val) { }
58 58
59 MArrayN (const Array2<T>& a) : ArrayN<T> (a) { } 59 template <class U>
60 explicit MArrayN (const Array2<U>& a) : ArrayN<T> (a) { }
60 61
61 MArrayN (const ArrayN<T>& a) : ArrayN<T> (a) { } 62 template <class U>
63 MArrayN (const ArrayN<U>& a) : ArrayN<T> (a) { }
62 64
63 MArrayN (const MArrayN<T>& a) : ArrayN<T> (a) { } 65 template <class U>
66 MArrayN (const MArrayN<U>& a) : ArrayN<T> (a) { }
64 67
65 ~MArrayN (void) { } 68 ~MArrayN (void) { }
66 69
67 MArrayN<T>& operator = (const MArrayN<T>& a) 70 MArrayN<T>& operator = (const MArrayN<T>& a)
68 { 71 {
69 ArrayN<T>::operator = (a); 72 ArrayN<T>::operator = (a);
70 return *this; 73 return *this;
71 } 74 }
75
76 MArrayN<T> reshape (const dim_vector& new_dims) const
77 { return ArrayN<T>::reshape (new_dims); }
78
79 MArrayN<T> permute (const Array<int>& vec, bool inv = false) const
80 { return ArrayN<T>::permute (vec, inv); }
81
82 MArrayN<T> ipermute (const Array<int>& vec) const
83 { return ArrayN<T>::ipermute (vec); }
84
85 MArrayN squeeze (void) const { return ArrayN<T>::squeeze (); }
72 }; 86 };
73 87
74 #endif 88 #endif
75 89
76 /* 90 /*