Mercurial > forge
changeset 10048:1e371ce62569 octave-forge
removed dir part for test file data_test.csv
| author | cdemills |
|---|---|
| date | Mon, 16 Apr 2012 07:34:41 +0000 |
| parents | e2435c9a764a |
| children | de3bb47ee54a |
| files | extra/dataframe/inst/@dataframe/dataframe.m extra/dataframe/inst/@dataframe/private/df_matassign.m extra/dataframe/inst/dataframe |
| diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/extra/dataframe/inst/@dataframe/dataframe.m Sun Apr 15 17:01:26 2012 +0000 +++ b/extra/dataframe/inst/@dataframe/dataframe.m Mon Apr 16 07:34:41 2012 +0000 @@ -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);
--- a/extra/dataframe/inst/@dataframe/private/df_matassign.m Sun Apr 15 17:01:26 2012 +0000 +++ b/extra/dataframe/inst/@dataframe/private/df_matassign.m Mon Apr 16 07:34:41 2012 +0000 @@ -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};
--- a/extra/dataframe/inst/dataframe Sun Apr 15 17:01:26 2012 +0000 +++ b/extra/dataframe/inst/dataframe Mon Apr 16 07:34:41 2012 +0000 @@ -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')")