[Octave-cvsupdate] SF.net SVN: octave:[7877] trunk/octave-forge/extra/dataframe/inst/@ dataframe/dataframe.m

[<cde...@us...>]

Revision: 7877
          http://octave.svn.sourceforge.net/octave/?rev=7877&view=rev
Author:   cdemills
Date:     2010-10-26 15:02:08 +0000 (Tue, 26 Oct 2010)

Log Message:
-----------
Added the ability to specify an empty input and colnames, to pre-dimension the dataframe

Modified Paths:
--------------
    trunk/octave-forge/extra/dataframe/inst/@dataframe/dataframe.m

Modified: trunk/octave-forge/extra/dataframe/inst/@dataframe/dataframe.m
===================================================================
--- trunk/octave-forge/extra/dataframe/inst/@dataframe/dataframe.m	2010-10-26 14:38:32 UTC (rev 7876)
+++ trunk/octave-forge/extra/dataframe/inst/@dataframe/dataframe.m	2010-10-26 15:02:08 UTC (rev 7877)
@@ -63,7 +63,7 @@
   return
 endif
 
-if isempty(x),
+if isempty(x) && 1 == nargin,
   %# default constructor: initialise the fields in the right order
   df._cnt = [0 0];
   df._name = {cell(0, 1), cell(1, 0)}; %# rows - cols 
@@ -196,7 +196,7 @@
 	    continue;
 	  endif
 	  %# does it looks like a comment line ?
-	  if regexp(dummy{1}, '^\s*#'),
+	  if regexp(dummy{1}, ['^\s*' char(35)]),
 	    empty_lines = [empty_lines indj];
 	    indl = indl + 1; indj = indj + 1;
 	    continue;
@@ -274,14 +274,20 @@
       %# allow overwriting of column names
       df._over{2}(1, indj) = true;
     else
-      if length(df._name{2}) < indj(1) || isempty(df._name{2}(indj)),
-	[df._name{2}(indj, 1),  df._over{2}(1, indj)] ...
-	    = df_colnames(inputname(indi), indj);
+      if !isempty(indj),		    
+	if length(df._name{2}) < indj(1) || isempty(df._name{2}(indj)),
+	  [df._name{2}(indj, 1),  df._over{2}(1, indj)] ...
+	      = df_colnames(inputname(indi), indj);
+	endif
       endif
     endif
-    idx.subs = {'', indj};
-    %# use direct assignement
-    df = subsasgn(df, idx, x);
+    if !isempty(indj),
+      idx.subs = {'', indj};
+      %# use direct assignement
+      df = subsasgn(df, idx, x);
+    else
+      df._cnt(2) = length(df._name{2});
+    endif
   elseif indi > 1,
     error('Concatenating dataframes: use cat instead');
   endif


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