Mercurial > forge
changeset 9887:9900a59d7da8 octave-forge
- when the separator is ' ', use the form of strsplit wich consider
repetitions of the separator as one single value
| author | cdemills |
|---|---|
| date | Tue, 27 Mar 2012 08:17:47 +0000 |
| parents | 2112c90c2445 |
| children | f9e2e9d24202 |
| files | extra/dataframe/inst/@dataframe/dataframe.m |
| diffstat | 1 files changed, 24 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/extra/dataframe/inst/@dataframe/dataframe.m Mon Mar 26 19:46:13 2012 +0000 +++ b/extra/dataframe/inst/@dataframe/dataframe.m Tue Mar 27 08:17:47 2012 +0000 @@ -210,9 +210,15 @@ %# content = cellfun(@(x) regexp(x, '(\b|[-+\.''])[^,]*(''|\b)', 'match'),\ %# lines, 'UniformOutput', false); %# extract fields - content = cellfun (@(x) strsplit (x, sep), lines, \ - 'UniformOutput', false); %# extract fields - indl = 1; indj = 1; %#disp('line 151 '); keyboard + + if (strfind (sep, ' ')) + content = cellfun (@(x) strsplit (x, sep, true), lines, \ + 'UniformOutput', false); %# extract fields + else + content = cellfun (@(x) strsplit (x, sep), lines, \ + 'UniformOutput', false); %# extract fields + endif + indl = 1; indj = 1; %# disp('line 151 '); keyboard if (~isempty (seeked)) while (indl <= length (lines)) dummy = content{indl}; @@ -239,7 +245,7 @@ endif if (size (dummy, 2) >= 2 && ... ~isempty (regexp (dummy{2}, trigger, 'match'))) - %#was (strcmp (dummy{1}, trigger)) + %# was (strcmp (dummy{1}, trigger)) break; endif endwhile @@ -260,9 +266,16 @@ indl = indl + 1; indj = indj + 1; continue; endif + %# try to convert to float - the_line = cellfun (@(x) sscanf (x, "%f", locales), dummy, \ - 'UniformOutput', false); + if (1) + the_line = cellfun (@(x) sscanf (x, "%f", locales), dummy, \ + 'UniformOutput', false); + else + the_line = sscanf (dummy, "%f", locales); + the_line = cellfun (@(x) x{1}, the_line, 'UniformOutput', false); + endif + for indk = (1:size (the_line, 2)) if (isempty (the_line{indk}) || any (size (the_line{indk}) > 1)) %#if indi > 1 && indk > 1, disp('line 117 '); keyboard; %#endif @@ -284,11 +297,12 @@ x(indj, indk) = regexp (dummy{indk}, '[^ ].*', 'match'); endif else - if (~isempty (regexp (dummy{indk}, '[/:]'))) + if (~isempty (regexp (dummy{indk}, '[/:-]'))) %# try to convert to a date [timeval, nfields] = strptime( dummy{indk}, [char(37) 'd/' char(37) 'm/' char(37) 'Y ' char(37) 'T']); if (nfields > 0) %# at least a few fields are OK + keyboard timestr = strftime ([char(37) 'H:' char(37) 'M:' char(37) 'S'], timeval); %# try to extract the usec field, if any @@ -302,6 +316,9 @@ endif x(indj, indk) = str2num (strftime ([char(37) 's'], timeval)) + ... timeval.usec * 1e-6; + else + %# store it as is + x(indj, indk) = the_line{indk}; endif else x(indj, indk) = the_line{indk};