Mercurial > octave-nkf

changeset 4592:a97b498e1b32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2003-11-11 01:13:09 by jwe]
author jwe
date Tue, 11 Nov 2003 01:13:10 +0000
parents 2c9de1be042a
children 77566be8b9e9
files liboctave/Array.cc liboctave/ChangeLog
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/Array.cc	Tue Nov 11 00:23:35 2003 +0000
+++ b/liboctave/Array.cc	Tue Nov 11 01:13:10 2003 +0000
@@ -1656,7 +1656,8 @@
 	}
       else
 	{
-	  if (idx_orig_rows == 1 || idx_orig_columns == 1)
+	  if (idx_arg.one_zero_only ()
+	      || idx_orig_rows == 1 || idx_orig_columns == 1)
 	    {
 	      if (nr == 1)
 		retval = Array<T> (tmp, dim_vector (1, len));
--- a/liboctave/ChangeLog	Tue Nov 11 00:23:35 2003 +0000
+++ b/liboctave/ChangeLog	Tue Nov 11 01:13:10 2003 +0000
@@ -1,5 +1,8 @@
 2003-11-10  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* Array.cc (Array<T>::index2): Return value has orientation of
+	indexed value if indexing a vector with a bool matrix.
+
 	* ArrayN.h (ArrayN<T>::get_size): Delete.
 
 	* Array.cc, ArrayN.cc, dNDArray.cc, CNDArray.cc, boolNDArray.cc,