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

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

Revision: 10234
          http://octave.svn.sourceforge.net/octave/?rev=10234&view=rev
Author:   cdemills
Date:     2012-04-16 07:34:41 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
removed dir part for test file data_test.csv

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

Modified: trunk/octave-forge/extra/dataframe/inst/@dataframe/dataframe.m
===================================================================
--- trunk/octave-forge/extra/dataframe/inst/@dataframe/dataframe.m	2012-04-15 17:01:26 UTC (rev 10233)
+++ trunk/octave-forge/extra/dataframe/inst/@dataframe/dataframe.m	2012-04-16 07:34:41 UTC (rev 10234)
@@ -290,7 +290,7 @@
                                   'UniformOutput', false);
             else
               %# this faster code requires a patch to src/file-io.cc in
-              %# main Octave tree
+              %# the main Octave tree
               the_line = sscanf (dummy, "%f", locales);
               the_line = cellfun (@(x) x{1}, the_line, \
                                   'UniformOutput', false);

Modified: trunk/octave-forge/extra/dataframe/inst/@dataframe/private/df_matassign.m
===================================================================
--- trunk/octave-forge/extra/dataframe/inst/@dataframe/private/df_matassign.m	2012-04-15 17:01:26 UTC (rev 10233)
+++ trunk/octave-forge/extra/dataframe/inst/@dataframe/private/df_matassign.m	2012-04-16 07:34:41 UTC (rev 10234)
@@ -280,7 +280,7 @@
       endfor
       indi = nrow;
       while (indi > 0)
-        if (1 == eff_len(indi))
+        if (eff_len(indi) < ncol)
           nrow = nrow - 1;
           indr(end) = [];
           RHS(end, :) = [];
@@ -295,7 +295,7 @@
       endwhile
       clear eff_len;
     endif
-    
+
     %# the real assignement
     if (1 == size (RHS, 1)) %# each cell contains one vector
       fillfunc = @(x) RHS{x};

Modified: trunk/octave-forge/extra/dataframe/inst/dataframe
===================================================================
--- trunk/octave-forge/extra/dataframe/inst/dataframe	2012-04-15 17:01:26 UTC (rev 10233)
+++ trunk/octave-forge/extra/dataframe/inst/dataframe	2012-04-16 07:34:41 UTC (rev 10234)
@@ -10,7 +10,7 @@
 %!assert(isempty(x.rowidx), false);
 %! x.types(2) ='single';
 %!assert(class(x.array(1, 2)), 'single')
-%! x=dataframe('octave_frame/data_test.csv');
+%! x=dataframe('data_test.csv');
 %!assert(isna(x.array(9, 4)))
 %! # remove rownames
 %! x.rownames = [];
@@ -177,7 +177,7 @@
 %!assert(z.array, y(y)); 
 
 %!demo
-%! x=dataframe('octave_frame/data_test.csv')
+%! x=dataframe('data_test.csv')
 %! disp("Access as a struct: x.VBIAS(1:6)")
 %! x.VBIAS(1:6)
 %! pause; disp("Access as a matrix: x(6, 'OK')")

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