Mercurial > hg > octave-nkf

changeset 4832:f9262b65c7d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2004-03-10 06:57:03 by jwe]
author jwe
date Wed, 10 Mar 2004 06:57:03 +0000
parents 4ec7d24b4943
children 399e8681b774
files liboctave/Array.cc liboctave/ChangeLog
diffstat 2 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/Array.cc
+++ b/liboctave/Array.cc
@@ -1971,6 +1971,8 @@
 
   int orig_len = nr * nc;
 
+  dim_vector idx_orig_dims = idx_arg.orig_dimensions ();
+
   int idx_orig_rows = idx_arg.orig_rows ();
   int idx_orig_columns = idx_arg.orig_columns ();
 
@@ -1992,7 +1994,7 @@
       if (len == 0 && idx_arg.one_zero_only ())
 	retval = Array<T> (tmp, dim_vector (0, 0));
       else
-	retval = Array<T> (tmp, dim_vector (idx_orig_rows, idx_orig_columns));
+	retval = Array<T> (tmp, idx_orig_dims);
     }
   else if (nr == 1 || nc == 1)
     {
@@ -2013,7 +2015,7 @@
 	    retval = Array<T> (tmp, dim_vector (len, 1));
 	}
       else
-	retval = Array<T> (tmp, dim_vector (idx_orig_rows, idx_orig_columns));
+	retval = Array<T> (tmp, idx_orig_dims);
     }
   else
     {
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-10  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Array.cc (Array<T>::index2): Allow result to be N-d if indexing
+	a scalar or vector with an N-d array.
+
 2004-03-09  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* Array.cc (Array<T>::index2): If scalar or vector is indexed by