octave-cvsupdate Mailing List for Octave Forge (Page 43)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 10048
          http://octave.svn.sourceforge.net/octave/?rev=10048&view=rev
Author:   i7tiol
Date:     2012-03-25 08:59:59 +0000 (Sun, 25 Mar 2012)
Log Message:
-----------
structcat accepts argument to set value of missing fields

Modified Paths:
--------------
    trunk/octave-forge/main/struct/src/structcat.cc

Modified: trunk/octave-forge/main/struct/src/structcat.cc
===================================================================

--- trunk/octave-forge/main/struct/src/structcat.cc	2012-03-24 21:59:22 UTC (rev 10047)
+++ trunk/octave-forge/main/struct/src/structcat.cc	2012-03-25 08:59:59 UTC (rev 10048)
@@ -1,8 +1,6 @@
 /*
 
-Copyright (C) 2009 John W. Eaton
-Copyright (C) 2009 Jaroslav Hajek <hi...@gm...>
-Copyright (C) 2010, 2011 Olaf Till
+Copyright (C) 2010, 2011, 2012 Olaf Till
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -19,37 +17,38 @@
 
 */
 
-// This code and the comments are taken and slightly modified from
-// Octave-3.2.4, src/data.cc (do_cat()), src/ov.cc (do_cat_op ()),
-// src/OPERATORS/op-struct.cc, src/ops.h, and oct-map.cc
-// (Octave_map::concat ()).
+// Code of the files of Octave-3.2.4 src/data.cc (do_cat()), src/ov.cc
+// (do_cat_op ()), src/OPERATORS/op-struct.cc, src/ops.h, and
+// oct-map.cc (Octave_map::concat ()) has been studied and initially
+// re-used, but in the end it has been made differently here.
 
 #include <octave/oct.h>
 #include <octave/ov-struct.h>
 
-static octave_value
-structcat_cat_op_fcn (const octave_value& v1, const octave_value& v2, 
-		      const Array<octave_idx_type>& ra_idx)
+static Octave_map
+structcat_op_fcn (const Octave_map& m1, const Octave_map& m2,
+		      const dim_vector& dv,
+		      const Array<octave_idx_type>& ra_idx,
+		      const octave_value& fillv)
 {
-  Octave_map m1 = v1.map_value ();
-  Octave_map m2 = v2.map_value ();
+  Octave_map retval (dv);
 
-  dim_vector dv1 (m1.dims ());
+  Cell c2 (m2.dims (), fillv);
 
-  Octave_map retval (dv1);
-
-  Cell c2 (m2.dims ());
-
   for (Octave_map::const_iterator pa = m1.begin (); pa != m1.end (); pa++)
     {
+      Cell c (dv);
+
+      c.insert (m1.contents(pa), 0, 0);
+
       Octave_map::const_iterator pb = m2.seek (m1.key(pa));
 
       if (pb == m2.end ())
-	retval.assign (m1.key(pa),
-		       m1.contents(pa).insert (c2, ra_idx));
+	c.insert (c2, ra_idx);
       else
-	retval.assign (m1.key(pa),
-		       m1.contents(pa).insert (m2.contents(pb), ra_idx));
+	c.insert (m2.contents(pb), ra_idx);
+
+      retval.assign (m1.key(pa), c);
     }
 
   for (Octave_map::const_iterator pa = m2.begin (); pa != m2.end (); pa++)
@@ -58,9 +57,10 @@
 
       if (pb == m1.end ())
 	{
-	  Cell c1 (dv1);
+	  Cell c (dv, fillv);
+
 	  retval.assign (m2.key(pa),
-			 c1.insert (m2.contents(pa), ra_idx));
+			 c.insert (m2.contents(pa), ra_idx));
 	}
     }
 
@@ -71,115 +71,81 @@
 DEFUN_DLD (structcat, args, , 
   "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} {} structcat (@var{dim}, @var{struct1}, @dots{}, @var{structn})\n\
-Return the concatenation of N-d structures @var{struct1}, @dots{}, @var{structn} along dimension @var{dim}. Differently to @code{cat}, fields need not match --- missing fields get an empty matrix value. Without structure arguments, an empty structure array is returned.\n\
+@deftypefnx {Loadable Function} {} structcat (@var{dim}, @var{default}, @var{struct1}, @dots{}, @var{structn})\n\
+Return the concatenation of N-d structures @var{struct1}, @dots{}, @var{structn} along dimension @var{dim}. Differently to @code{cat}, fields need not match --- missing fields get an empty matrix value. Without structure arguments, an empty structure array is returned. If a scalar argument @var{default} is given, missing fields get its value instead of an empty matrix value.\n\
+\n\
+@seealso{structcat_default}\n\
 @end deftypefn")
 {
   std::string fname ("structcat");
 
-  octave_value retval;
+  Octave_map retval;
 
-  int n_args = args.length (); 
+  octave_idx_type n_args = args.length ();
 
-  if (n_args == 1)
-    retval = Octave_map ();
-  else if (n_args == 2)
-    retval = args(1).map_value ();
-  else if (n_args > 2)
+  if (n_args == 0)
+    print_usage ();
+  else
     {
       octave_idx_type dim = args(0).int_value () - 1;
 
-      if (error_state)
+      if (error_state || dim < 0)
 	{
-	  error ("%s: expecting first argument to be a integer",
+	  error ("%s: first argument must be a positive integer",
 		 fname.c_str ());
-	  return retval;
+	  return octave_value ();
 	}
-  
-      if (dim >= 0)
+
+      octave_idx_type m1_id;
+      octave_value fillv;
+
+      if (n_args > 1 && args(1).is_scalar_type ())
 	{
- 	  dim_vector  dv = args(1).dims ();
-	  std::string result_type ("struct");
+	  m1_id = 2;
 
- 	  for (int i = 2; i < args.length (); i++)
-  	    {
- 	      // Construct a dimension vector which holds the
-	      // dimensions of the final array after concatenation.
-      
-	      if (! dv.concat (args(i).dims (), dim))
-		{
-		  // Dimensions do not match. 
-		  error ("%s: dimension mismatch", fname.c_str ());
-		  return retval;
-		}
-	      
-	      if (args(i).class_name () != result_type)
-		{
-		  error ("%s: some argument not a structure",
-			 fname.c_str ());
-		  return retval;
-		}
-	    }
+	  fillv = args(1);
+	}
+      else
+	{
+	  m1_id = 1;
 
-	  // The lines below might seem crazy, since we take a
-	  // copy of the first argument, resize it to be empty and
-	  // then resize it to be full. This is done since it
-	  // means that there is no recopying of data, as would
-	  // happen if we used a single resize.  It should be
-	  // noted that resize operation is also significantly
-	  // slower than the do_cat_op function, so it makes sense
-	  // to have an empty matrix and copy all data.
-	  //
-	  // We might also start with a empty octave_value using
-	  //   tmp = octave_value_typeinfo::lookup_type 
-	  //                                (args(1).type_name());
-	  // and then directly resize. However, for some types there might
-	  // be some additional setup needed, and so this should be avoided.
+	  fillv = Matrix ();
+	}
 
-	  octave_value tmp = args (1);
-	  tmp = tmp.resize (dim_vector (0, 0)).resize (dv);
+      dim_vector dv;
 
-	  if (error_state)
-	    return retval;
+      octave_idx_type idx_len = dv.length ();
 
-	  int dv_len = dv.length ();
-	  Array<octave_idx_type> ra_idx (dim_vector (dv_len, 1), 0);
+      if (dim >= idx_len) idx_len = dim + 1;
 
-	  for (int j = 1; j < n_args; j++)
+      Array<octave_idx_type> ra_idx (dim_vector (idx_len, 1), 0);
+
+      for (octave_idx_type i = m1_id; i < n_args; i++)
+	{
+	  if (! args(i).is_map ())
 	    {
-	      dim_vector dv_tmp = args (j).dims ();
+	      error ("%s: some argument not a structure", fname.c_str ());
 
-	      if (! dv_tmp.all_zero ())
-		{
-		  tmp = structcat_cat_op_fcn (tmp, args(j), ra_idx);
+	      return octave_value ();
+	    }
 
-		  if (error_state)
-		    return retval;
+	  dim_vector dvi = args(i).dims (), old_dv = dv;
 
-		  if (dim >= dv_len)
-		    {
-		      if (j > 1)
-			error ("%s: indexing error", fname.c_str ());
-		      break;
-		    }
-		  else
-		    ra_idx (dim) += (dim < dv_tmp.length () ? 
-				     dv_tmp (dim) : 1);
-		}
+	  if (! dv.concat (dvi, dim))
+	    {
+	      error ("%s: dimension mismatch", fname.c_str ());
+
+	      return octave_value ();
 	    }
-	  retval = tmp;
 
-	  if (! error_state)
+	  if (! dvi.all_zero ())
 	    {
-	      // Reshape, chopping trailing singleton dimensions
-	      dv.chop_trailing_singletons ();
-	      retval = retval.reshape (dv);
+	      retval = structcat_op_fcn (retval, args(i).map_value (),
+					 dv, ra_idx, fillv);
+
+	      ra_idx(dim) += (dim < dvi.length () ? dvi(dim) : 1);
 	    }
-	}
-      else
-	error ("%s: invalid dimension argument", fname.c_str ());
+	}  
     }
-  else
-    print_usage ();
-
-  return retval;
+  return octave_value (retval);
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2001	Jan	Feb	Mar	Apr	May	Jun	Jul (10)	Aug (5)	Sep (3)	Oct (41)	Nov (41)	Dec (33)
2002	Jan (75)	Feb (10)	Mar (170)	Apr (174)	May (66)	Jun (11)	Jul (10)	Aug (44)	Sep (73)	Oct (28)	Nov (139)	Dec (52)
2003	Jan (35)	Feb (93)	Mar (62)	Apr (10)	May (55)	Jun (70)	Jul (37)	Aug (16)	Sep (56)	Oct (31)	Nov (57)	Dec (83)
2004	Jan (85)	Feb (67)	Mar (27)	Apr (37)	May (75)	Jun (85)	Jul (160)	Aug (68)	Sep (104)	Oct (25)	Nov (39)	Dec (23)
2005	Jan (10)	Feb (45)	Mar (43)	Apr (19)	May (108)	Jun (31)	Jul (41)	Aug (23)	Sep (65)	Oct (58)	Nov (44)	Dec (54)
2006	Jan (96)	Feb (27)	Mar (69)	Apr (59)	May (67)	Jun (35)	Jul (13)	Aug (461)	Sep (160)	Oct (399)	Nov (32)	Dec (72)
2007	Jan (316)	Feb (305)	Mar (318)	Apr (54)	May (194)	Jun (173)	Jul (282)	Aug (91)	Sep (227)	Oct (365)	Nov (168)	Dec (18)
2008	Jan (71)	Feb (111)	Mar (155)	Apr (173)	May (70)	Jun (67)	Jul (55)	Aug (83)	Sep (32)	Oct (68)	Nov (80)	Dec (29)
2009	Jan (46)	Feb (18)	Mar (95)	Apr (76)	May (140)	Jun (98)	Jul (84)	Aug (123)	Sep (94)	Oct (131)	Nov (142)	Dec (125)
2010	Jan (128)	Feb (158)	Mar (172)	Apr (134)	May (94)	Jun (84)	Jul (32)	Aug (127)	Sep (167)	Oct (109)	Nov (69)	Dec (78)
2011	Jan (39)	Feb (58)	Mar (52)	Apr (47)	May (56)	Jun (76)	Jul (55)	Aug (54)	Sep (165)	Oct (255)	Nov (328)	Dec (263)
2012	Jan (82)	Feb (147)	Mar (400)	Apr (216)	May (209)	Jun (160)	Jul (86)	Aug (141)	Sep (156)	Oct (6)	Nov	Dec
2015	Jan	Feb	Mar	Apr	May	Jun	Jul (1)	Aug	Sep (1)	Oct	Nov (1)	Dec (2)
2016	Jan	Feb (2)	Mar (2)	Apr (1)	May (1)	Jun (2)	Jul (1)	Aug (1)	Sep	Oct	Nov (1)	Dec
2019	Jan	Feb	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2021	Jan	Feb	Mar	Apr (3)	May (4)	Jun (8)	Jul (2)	Aug (5)	Sep (9)	Oct	Nov	Dec

octave-cvsupdate Mailing List for Octave Forge (Page 43)

A collection of packages providing extra functionality for GNU Octave

octave-cvsupdate — CVS update notifications