Mercurial > octave-nkf
diff liboctave/dNDArray.cc @ 10350:12884915a8e4
merge MArray classes & improve Array interface
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Sat, 23 Jan 2010 21:41:03 +0100 |
| parents | 83fa590b8a09 |
| children | a3635bc1ea19 |
line wrap: on
line diff
--- a/liboctave/dNDArray.cc Mon Feb 22 23:07:21 2010 -0500 +++ b/liboctave/dNDArray.cc Sat Jan 23 21:41:03 2010 +0100 @@ -88,7 +88,7 @@ } NDArray::NDArray (const charNDArray& a) - : MArrayN<double> (a.dims ()) + : MArray<double> (a.dims ()) { octave_idx_type n = a.numel (); for (octave_idx_type i = 0; i < n; i++) @@ -940,7 +940,7 @@ NDArray NDArray::diag (octave_idx_type k) const { - return MArrayN<double>::diag (k); + return MArray<double>::diag (k); } // This contains no information on the array structure !!!