Mercurial > octave-nkf
changeset 4716:fe25e290fafb
[project @ 2004-01-23 03:09:59 by jwe]
| author | jwe |
|---|---|
| date | Fri, 23 Jan 2004 03:09:59 +0000 |
| parents | 7bed0ef1a6ad |
| children | 7fa16e369904 |
| files | liboctave/Array.cc liboctave/ChangeLog |
| diffstat | 2 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/Array.cc Thu Jan 22 22:10:28 2004 +0000 +++ b/liboctave/Array.cc Fri Jan 23 03:09:59 2004 +0000 @@ -2496,16 +2496,14 @@ } } } - else if (rhs_nr == 1 && rhs_nc == 1 && len <= lhs_nr * lhs_nc) + else if (rhs_nr == 1 && rhs_nc == 1) { RT scalar = rhs.elem (0, 0); for (int i = 0; i < len; i++) { int ii = idx_i.elem (i); - int fr = ii % lhs_nr; - int fc = (ii - fr) / lhs_nr; - lhs.elem (fr, fc) = scalar; + lhs.elem (ii) = scalar; } } else @@ -2642,7 +2640,7 @@ lhs.elem (ii) = rhs.elem (i); } } - else if (rhs_is_scalar && len <= lhs_len) + else if (rhs_is_scalar) { RT scalar = rhs.elem (0);
--- a/liboctave/ChangeLog Thu Jan 22 22:10:28 2004 +0000 +++ b/liboctave/ChangeLog Fri Jan 23 03:09:59 2004 +0000 @@ -1,3 +1,10 @@ +2004-01-22 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Array.cc (Array<T>::assign2, Array<T>::assignN): + For X(I) = RHS, don't restrict I to fewer elements than X. + + * Array.cc (Array<T>::assign2): Simplify indexing for X(I) = RHS case. + 2004-01-22 Petter Risholm <risholm@stud.ntnu.no> * mx-inlines.cc (MX_ND_REDUCTION, MX_ND_CUMULATIVE_OP):