Mercurial > hg > octave-lyh
diff liboctave/fNDArray.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/fNDArray.h +++ b/liboctave/fNDArray.h @@ -54,7 +54,7 @@ FloatNDArray (const MArrayN<U>& a) : MArrayN<float> (a) { } template <class U> - FloatNDArray (const ArrayN<U>& a) : MArrayN<float> (a) { } + FloatNDArray (const Array<U>& a) : MArrayN<float> (a) { } template <class U> explicit FloatNDArray (const intNDArray<U>& a) : MArrayN<float> (a) { } @@ -96,14 +96,14 @@ charNDArray concat (const charNDArray& rb, const Array<octave_idx_type>& ra_idx); FloatNDArray max (int dim = 0) const; - FloatNDArray max (ArrayN<octave_idx_type>& index, int dim = 0) const; + FloatNDArray max (Array<octave_idx_type>& index, int dim = 0) const; FloatNDArray min (int dim = 0) const; - FloatNDArray min (ArrayN<octave_idx_type>& index, int dim = 0) const; + FloatNDArray min (Array<octave_idx_type>& index, int dim = 0) const; FloatNDArray cummax (int dim = 0) const; - FloatNDArray cummax (ArrayN<octave_idx_type>& index, int dim = 0) const; + FloatNDArray cummax (Array<octave_idx_type>& index, int dim = 0) const; FloatNDArray cummin (int dim = 0) const; - FloatNDArray cummin (ArrayN<octave_idx_type>& index, int dim = 0) const; + FloatNDArray cummin (Array<octave_idx_type>& index, int dim = 0) const; FloatNDArray diff (octave_idx_type order = 1, int dim = 0) const;