Mercurial > hg > octave-lyh
diff liboctave/dNDArray.h @ 9732:b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Fri, 16 Oct 2009 13:12:31 +0200 |
| parents | 192d94cff6c1 |
| children | 26abff55f6fe |
line wrap: on
line diff
--- a/liboctave/dNDArray.h +++ b/liboctave/dNDArray.h @@ -57,7 +57,7 @@ NDArray (const MArrayN<U>& a) : MArrayN<double> (a) { } template <class U> - NDArray (const ArrayN<U>& a) : MArrayN<double> (a) { } + NDArray (const Array<U>& a) : MArrayN<double> (a) { } template <class U> explicit NDArray (const intNDArray<U>& a) : MArrayN<double> (a) { } @@ -99,14 +99,14 @@ charNDArray concat (const charNDArray& rb, const Array<octave_idx_type>& ra_idx); NDArray max (int dim = 0) const; - NDArray max (ArrayN<octave_idx_type>& index, int dim = 0) const; + NDArray max (Array<octave_idx_type>& index, int dim = 0) const; NDArray min (int dim = 0) const; - NDArray min (ArrayN<octave_idx_type>& index, int dim = 0) const; + NDArray min (Array<octave_idx_type>& index, int dim = 0) const; NDArray cummax (int dim = 0) const; - NDArray cummax (ArrayN<octave_idx_type>& index, int dim = 0) const; + NDArray cummax (Array<octave_idx_type>& index, int dim = 0) const; NDArray cummin (int dim = 0) const; - NDArray cummin (ArrayN<octave_idx_type>& index, int dim = 0) const; + NDArray cummin (Array<octave_idx_type>& index, int dim = 0) const; NDArray diff (octave_idx_type order = 1, int dim = 0) const;