# HG changeset patch # User jwe # Date 1131733225 0 # Node ID 6a82af8242695050937fa62c050265e7c9b41d53 # Parent e107161b8ca381147e70c5f34b3918f1b61e9aee [project @ 2005-11-11 18:20:25 by jwe] diff --git a/liboctave/Array.cc b/liboctave/Array.cc --- a/liboctave/Array.cc +++ b/liboctave/Array.cc @@ -2221,10 +2221,6 @@ octave_idx_type n = result_dims.numel (); - int r_dims = result_dims.length (); - - Array iidx (r_dims, 0); - octave_idx_type k = 0; for (octave_idx_type i = 0; i < n; i++) @@ -2232,15 +2228,9 @@ octave_idx_type ii = ra_idx.elem (k++); if (ii >= orig_len) - retval.elem (iidx) = rfv; + retval.elem (i) = rfv; else - { - Array temp = get_ra_idx (ii, dv); - - retval.elem (iidx) = elem (temp); - } - if (i != n - 1) - increment_index (iidx, result_dims); + retval.elem (i) = elem (ii); } } } diff --git a/liboctave/ChangeLog b/liboctave/ChangeLog --- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,7 @@ +2005-11-11 John W. Eaton + + * Array.cc (Array::indexN): Simplify. + 2005-11-09 John W. Eaton * oct-inttypes.h (octave_int::operator char (void) const):