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

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

Revision: 7995
          http://octave.svn.sourceforge.net/octave/?rev=7995&view=rev
Author:   cdemills
Date:     2010-12-08 09:24:23 +0000 (Wed, 08 Dec 2010)

Log Message:
-----------
Adapted display and numel to the change in semantic of df._cnt(3)

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

Modified: trunk/octave-forge/extra/dataframe/inst/@dataframe/display.m
===================================================================
--- trunk/octave-forge/extra/dataframe/inst/@dataframe/display.m	2010-12-08 09:13:41 UTC (rev 7994)
+++ trunk/octave-forge/extra/dataframe/inst/@dataframe/display.m	2010-12-08 09:24:23 UTC (rev 7995)
@@ -31,7 +31,7 @@
   if 2 == length(df._cnt),
     head = sprintf("Dataframe with %d rows and %d columns", df._cnt);
   else
-    head = sprintf("Dataframe with %d rows and %d columns (%d unfolded)", ...
+    head = sprintf("Dataframe with %d rows and %d columns on %d pages", ...
 		   df._cnt);
   endif
 

Modified: trunk/octave-forge/extra/dataframe/inst/@dataframe/numel.m
===================================================================
--- trunk/octave-forge/extra/dataframe/inst/@dataframe/numel.m	2010-12-08 09:13:41 UTC (rev 7994)
+++ trunk/octave-forge/extra/dataframe/inst/@dataframe/numel.m	2010-12-08 09:24:23 UTC (rev 7995)
@@ -31,7 +31,7 @@
 %#    n = feval(@numel, df, varargin{:});
 %#  else
     if 1 == nargin,
-      n = prod(df._cnt([1 end]));
+      n = sum(cellfun(@numel, df._data));
     else
       error(print_usage());
     endif


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