Mercurial > hg > octave-lyh

changeset 5535:6a82af824269

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2005-11-11 18:20:25 by jwe]
author jwe
date Fri, 11 Nov 2005 18:20:25 +0000
parents e107161b8ca3
children f16c05db6250
files liboctave/Array.cc liboctave/ChangeLog
diffstat 2 files changed, 6 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- 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<octave_idx_type> 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<int> 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);
 	    }
 	}
     }
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-11  John W. Eaton  <jwe@octave.org>
+
+	* Array.cc (Array<T>::indexN): Simplify.
+
 2005-11-09  John W. Eaton  <jwe@octave.org>
 
 	* oct-inttypes.h (octave_int::operator char (void) const):