Mercurial > octave-nkf

changeset 8111:587eee4120ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cut trailing singeltons in cat function
author David Bateman <dbateman@free.fr>
date Wed, 17 Sep 2008 14:57:02 -0400
parents fdc7c91835ab
children 31e86163b752
files src/ChangeLog src/data.cc
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Wed Sep 17 14:52:51 2008 -0400
+++ b/src/ChangeLog	Wed Sep 17 14:57:02 2008 -0400
@@ -1,5 +1,7 @@
 2008-09-17  David Bateman  <dbateman@free.fr>
 
+	* data.cc (do_cat): Chopping trailing singleton dimensions.
+
 	* data.cc (SINGLE_TYPE_CONCAT, DO_SINGLE_TYPE_CONCAT): New macros
 	(do_cat): Special case single type concatenations for speed.
 	* pt.mat.cc (std::string get_concat_class (const std::string&,
--- a/src/data.cc	Wed Sep 17 14:52:51 2008 -0400
+++ b/src/data.cc	Wed Sep 17 14:57:02 2008 -0400
@@ -1853,6 +1853,10 @@
 				 dv_tmp (dim) : 1);
 	    }
 
+	  // Reshape, chopping trailing singleton dimensions
+	  dv.chop_trailing_singletons ();
+	  tmp = tmp.reshape (dv);
+
 	  retval = tmp;
 	}
       else