Mercurial > octave-dspies

annotate scripts/io/importdata.m @ 18681:99d1ef340de4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
importdata.m: limit EOL search to first 4096 characters. * importdata.m: limit EOL search to first 4096 characters.
author Philip Nienhuis <prnienhuis@users.sf.net>
date Sat, 26 Apr 2014 15:44:50 +0200
parents 271873b2f44f
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
16768
e2de3c8882be copyright notice fixes
John W. Eaton <jwe@octave.org>
parents: 16767
diff changeset
1 ## Copyright (C) 2012-2013 Erik Kjellson
15549
48b1312bb0fe fix copyright header in importdata
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15547
diff changeset
2 ##
48b1312bb0fe fix copyright header in importdata
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15547
diff changeset
3 ## This file is part of Octave.
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
4 ##
15549
48b1312bb0fe fix copyright header in importdata
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15547
diff changeset
5 ## Octave is free software; you can redistribute it and/or modify it
48b1312bb0fe fix copyright header in importdata
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15547
diff changeset
6 ## under the terms of the GNU General Public License as published by
48b1312bb0fe fix copyright header in importdata
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15547
diff changeset
7 ## the Free Software Foundation; either version 3 of the License, or (at
48b1312bb0fe fix copyright header in importdata
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15547
diff changeset
8 ## your option) any later version.
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
9 ##
15549
48b1312bb0fe fix copyright header in importdata
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15547
diff changeset
10 ## Octave is distributed in the hope that it will be useful, but
48b1312bb0fe fix copyright header in importdata
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15547
diff changeset
11 ## WITHOUT ANY WARRANTY; without even the implied warranty of
48b1312bb0fe fix copyright header in importdata
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15547
diff changeset
12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
48b1312bb0fe fix copyright header in importdata
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15547
diff changeset
13 ## General Public License for more details.
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
14 ##
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
15 ## You should have received a copy of the GNU General Public License
15549
48b1312bb0fe fix copyright header in importdata
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15547
diff changeset
16 ## along with Octave; see the file COPYING. If not, see
48b1312bb0fe fix copyright header in importdata
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15547
diff changeset
17 ## <http://www.gnu.org/licenses/>.
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
18
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
19 ## -*- texinfo -*-
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
20 ## @deftypefn {Function File} {@var{A} =} importdata (@var{fname})
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
21 ## @deftypefnx {Function File} {@var{A} =} importdata (@var{fname}, @var{delimiter})
15847
13d1e9bfa362 doc: small fixes for impordata
Carnë Draug <carandraug+dev@gmail.com>
parents: 15619
diff changeset
22 ## @deftypefnx {Function File} {@var{A} =} importdata (@var{fname}, @var{delimiter}, @var{header_rows})
13d1e9bfa362 doc: small fixes for impordata
Carnë Draug <carandraug+dev@gmail.com>
parents: 15619
diff changeset
23 ## @deftypefnx {Function File} {[@var{A}, @var{delimiter}] =} importdata (@dots{})
13d1e9bfa362 doc: small fixes for impordata
Carnë Draug <carandraug+dev@gmail.com>
parents: 15619
diff changeset
24 ## @deftypefnx {Function File} {[@var{A}, @var{delimiter}, @var{header_rows}] =} importdata (@dots{})
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
25 ## Import data from the file @var{fname}.
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
26 ##
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
27 ## Input parameters:
16816
12005245b645 doc: Periodic grammarcheck of documentation.
Rik <rik@octave.org>
parents: 16768
diff changeset
28 ##
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
29 ## @itemize
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
30 ## @item @var{fname}
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
31 ## The name of the file containing data.
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
32 ##
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
33 ## @item @var{delimiter}
16816
12005245b645 doc: Periodic grammarcheck of documentation.
Rik <rik@octave.org>
parents: 16768
diff changeset
34 ## The character separating columns of data. Use @code{\t} for tab.
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
35 ## (Only valid for ASCII files)
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
36 ##
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
37 ## @item @var{header_rows}
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
38 ## The number of header rows before the data begins. (Only valid for ASCII
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
39 ## files)
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
40 ## @end itemize
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
41 ##
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
42 ## Different file types are supported:
16816
12005245b645 doc: Periodic grammarcheck of documentation.
Rik <rik@octave.org>
parents: 16768
diff changeset
43 ##
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
44 ## @itemize
16826
a4969508008e doc: Periodic spellcheck of the documentation.
Rik <rik@octave.org>
parents: 16816
diff changeset
45 ## @item ASCII table
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
46 ##
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
47 ## Import ASCII table using the specified number of header rows and
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
48 ## the specified delimiter.
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
49 ##
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
50 ## @item Image file
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
51 ##
16816
12005245b645 doc: Periodic grammarcheck of documentation.
Rik <rik@octave.org>
parents: 16768
diff changeset
52 ## @item @sc{matlab} file
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
53 ##
15551
e21b21c2a20d importdata.m: properly fall back to unimplemented.m & allow spreadheet I/O
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 15549
diff changeset
54 ## @item Spreadsheet files (depending on external software)
e21b21c2a20d importdata.m: properly fall back to unimplemented.m & allow spreadheet I/O
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 15549
diff changeset
55 ##
16826
a4969508008e doc: Periodic spellcheck of the documentation.
Rik <rik@octave.org>
parents: 16816
diff changeset
56 ## @item WAV file
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
57 ##
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
58 ## @end itemize
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
59 ##
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
60 ## @seealso{textscan, dlmread, csvread, load}
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
61 ## @end deftypefn
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
62
16768
e2de3c8882be copyright notice fixes
John W. Eaton <jwe@octave.org>
parents: 16767
diff changeset
63 ## Author: Erik Kjellson <erikiiofph7@users.sourceforge.net>
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
64
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
65 function [output, delimiter, header_rows] = importdata (fname, delimiter = "", header_rows = -1)
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
66
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
67 if (nargin < 1 || nargin > 3)
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
68 print_usage ();
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
69 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
70
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
71 if (! ischar (fname))
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
72 error ("importdata: FNAME must be a string");
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
73 elseif (strcmpi (fname, "-pastespecial"))
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
74 error ("importdata: option -pastespecial not implemented");
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
75 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
76
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
77 if (nargin > 1)
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
78 if (! ischar (delimiter)
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
79 || (length (delimiter) > 1 && ! strcmp (delimiter, '\t')))
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
80 error("importdata: DELIMITER must be a single character");
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
81 endif
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
82 if (strcmp (delimiter, '\t'))
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
83 delimiter = "\t";
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
84 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
85 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
86
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
87 if (nargin > 2)
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
88 if (! isnumeric (header_rows) || header_rows < 0
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
89 || header_rows != fix (header_rows))
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
90 error ("importdata: HEADER_ROWS must be an integer >= 0");
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
91 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
92 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
93
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
94 ## Check file format
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
95 ## Get the extension from the file name.
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
96 [~, ~, ext, ~] = fileparts (fname);
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
97 ext = lower (ext);
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
98
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
99 switch (ext)
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
100 case {".au", ".snd", ".flac", ".ogg"}
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
101 error ("importdata: not implemented for file format %s", ext);
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
102 case {".avi", ".mj2", ".mpg", ".asf", ".asx", ".wmv", ".mp4", ".m4v", ...
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
103 ".mov"}
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
104 error ("importdata: not implemented for file format %s", ext);
17245
7babcdb9bc13 Use ... instead of \ for line continuation marker.
Stefan Mahr <dac922@gmx.de>
parents: 16933
diff changeset
105 case {".bmp", ".cur", ".gif", ".hdf", ".ico", ".jpe", ".jpeg", ".jpg", ...
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
106 ".jp2", ".jpf", ".jpx", ".j2c", ".j2k", ".pbm", ".pcx", ".pgm", ...
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
107 ".png", ".pnm", ".ppm", ".ras", ".tif", ".tiff", ".xwd"}
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
108 delimiter = NaN;
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
109 header_rows = 0;
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
110 [output.cdata, output.colormap, output.alpha] = imread (fname);
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
111 case ".mat"
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
112 delimiter = NaN;
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
113 header_rows = 0;
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
114 output = load (fname);
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
115 case {".xls", ".xlsx", ".wk1", ".dbf", ".pxl"}
15551
e21b21c2a20d importdata.m: properly fall back to unimplemented.m & allow spreadheet I/O
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 15549
diff changeset
116 ## If there's no Excel file support simply fall back to unimplemented.m
e21b21c2a20d importdata.m: properly fall back to unimplemented.m & allow spreadheet I/O
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 15549
diff changeset
117 output = xlsread (fname);
e21b21c2a20d importdata.m: properly fall back to unimplemented.m & allow spreadheet I/O
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 15549
diff changeset
118 case {".ods", ".sxc", ".fods", ".uos", ".xml"}
e21b21c2a20d importdata.m: properly fall back to unimplemented.m & allow spreadheet I/O
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 15549
diff changeset
119 ## unimplemented.m only knows ML functions; odsread isn't one but is in OF
e21b21c2a20d importdata.m: properly fall back to unimplemented.m & allow spreadheet I/O
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 15549
diff changeset
120 try
e21b21c2a20d importdata.m: properly fall back to unimplemented.m & allow spreadheet I/O
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 15549
diff changeset
121 output = odsread (fname);
e21b21c2a20d importdata.m: properly fall back to unimplemented.m & allow spreadheet I/O
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 15549
diff changeset
122 catch
e21b21c2a20d importdata.m: properly fall back to unimplemented.m & allow spreadheet I/O
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 15549
diff changeset
123 ## Fall back to unimplemented.m.
e21b21c2a20d importdata.m: properly fall back to unimplemented.m & allow spreadheet I/O
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 15549
diff changeset
124 output = xlsread (fname);
e21b21c2a20d importdata.m: properly fall back to unimplemented.m & allow spreadheet I/O
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 15549
diff changeset
125 end_try_catch
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
126 case {".wav", ".wave"}
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
127 delimiter = NaN;
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
128 header_rows = 0;
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
129 [output.data, output.fs] = wavread (fname);
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
130 otherwise
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
131 ## Assume the file is in ASCII format.
17245
7babcdb9bc13 Use ... instead of \ for line continuation marker.
Stefan Mahr <dac922@gmx.de>
parents: 16933
diff changeset
132 [output, delimiter, header_rows] = ...
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
133 importdata_ascii (fname, delimiter, header_rows);
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
134 endswitch
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
135
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
136 ## If there are any empty fields in the output structure, then remove them
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
137 if (isstruct (output) && numel (output) == 1)
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
138 fields = fieldnames (output);
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
139 for i=1:length (fields)
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
140 if (isempty (output.(fields{i})))
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
141 output = rmfield (output, fields{i});
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
142 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
143 endfor
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
144
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
145 ## If only one field is left, replace the structure with the field,
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
146 ## i.e., output = output.onlyFieldLeft
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
147
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
148 ## Update the list of fields
18538
fcd87f68af4f Deprecate nfields and replace with numfields.
Rik <rik@octave.org>
parents: 18532
diff changeset
149 if (numfields (output) == 1)
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
150 output = output.(fields{1});
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
151 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
152 endif
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
153
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
154 endfunction
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
155
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
156 function [output, delimiter, header_rows] = importdata_ascii (fname, delimiter, num_header_rows)
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
157
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
158 ## Define fields in the output structure so that the order will be correct.
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
159 output.data = [];
17357
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
160 output.textdata = {};
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
161 output.rowheaders = {};
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
162 output.colheaders = {};
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
163
17357
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
164 [fid, msg] = fopen (fname, "r");
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
165 if (fid == -1)
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
166 error (msg);
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
167 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
168
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
169 header_rows = 0;
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
170 header_cols = 0;
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
171
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
172 ## Work through first few rows line by line until a delimiter is found.
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
173 while (ischar (row = fgetl (fid)))
17357
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
174
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
175 ## If no delimiter determined yet, make a guess.
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
176 if (isempty (delimiter))
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
177 ## This pattern can be fooled, but mostly does the job just fine.
18532
87dfe4892ef9 importdata.m: Fix non-compliant PCRE regexp causing problems on Mac.
Rik <rik@octave.org>
parents: 17358
diff changeset
178 delim = regexp (row, '[-+\d.eE*ij ]+([^-+\d.ij])[-+\d.ij]',
87dfe4892ef9 importdata.m: Fix non-compliant PCRE regexp causing problems on Mac.
Rik <rik@octave.org>
parents: 17358
diff changeset
179 'tokens', 'once');
87dfe4892ef9 importdata.m: Fix non-compliant PCRE regexp causing problems on Mac.
Rik <rik@octave.org>
parents: 17358
diff changeset
180 #delim = regexp (row, '[+-\d.eE\*ij ]+([^+-\d.ij])[+-\d.ij]',
87dfe4892ef9 importdata.m: Fix non-compliant PCRE regexp causing problems on Mac.
Rik <rik@octave.org>
parents: 17358
diff changeset
181 # 'tokens', 'once');
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
182 if (! isempty (delim))
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
183 delimiter = delim{1};
17357
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
184 endif
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
185 endif
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
186
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
187 if (delimiter == " ")
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
188 row_entries = regexp (strtrim (row), ' +', 'split');
17357
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
189 else
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
190 row_entries = ostrsplit (row, delimiter);
17357
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
191 endif
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
192 row_data = str2double (row_entries);
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
193 if (all (isnan (row_data)) || header_rows < num_header_rows)
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
194 header_rows++;
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
195 output.textdata{end+1, 1} = row;
17357
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
196 else
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
197 if (! isempty (output.textdata))
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
198 if (delimiter == " ")
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
199 output.colheaders = regexp (strtrim (output.textdata{end}),
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
200 ' +', 'split');
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
201 else
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
202 output.colheaders = ostrsplit (output.textdata{end}, delimiter);
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
203 endif
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
204 endif
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
205 header_cols = find (! isnan (row_data), 1) - 1;
17357
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
206 ## The number of header rows and header columns is now known.
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
207 break;
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
208 endif
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
209
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
210 endwhile
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
211
18663
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
212 if (row == -1)
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
213 ## No numeric data found => return file as cellstr array
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
214 ## 1. Read as char string
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
215 fseek (fid, 0, "bof");
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
216 output = fread (fid, Inf, "*char")';
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
217 fclose (fid);
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
218 ## 2. Find EOL type
18681
99d1ef340de4 importdata.m: limit EOL search to first 4096 characters.
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18663
diff changeset
219 idx = find (output(1:min (4096, length (output))) == "\n", 1) - 1;
18663
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
220 if (isindex (idx) && output(idx) == "\r")
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
221 dlm = "\r\n";
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
222 else
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
223 dlm = "\n";
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
224 endif
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
225 ## 3. Split each line into a cell (column vector)
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
226 output = strsplit (output, dlm)';
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
227 ## 4. Remove last cell (for files with -proper- EOL before EOF)
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
228 if (isempty (output{end}))
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
229 output(end) = [];
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
230 endif
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
231 ## 5. Return after setting some output data
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
232 delimiter = "";
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
233 header_rows = numel (output);
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
234 return;
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
235 else
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
236 fclose (fid);
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
237 endif
17357
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
238
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
239 if (num_header_rows >= 0)
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
240 header_rows = num_header_rows;
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
241 endif
17357
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
242
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
243 ## Now, let the efficient built-in routine do the bulk of the work.
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
244 if (delimiter == " ")
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
245 output.data = dlmread (fname, "", header_rows, header_cols,
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
246 "emptyvalue", NA);
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
247 else
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
248 output.data = dlmread (fname, delimiter, header_rows, header_cols,
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
249 "emptyvalue", NA);
17357
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
250 endif
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
251
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
252 ## Go back and correct any individual values that did not convert.
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
253 na_idx = isna (output.data);
17357
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
254 if (header_cols > 0)
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
255 na_idx = [(true (rows (na_idx), header_cols)), na_idx];
17357
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
256 endif
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
257 if (any (na_idx(:)))
17357
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
258
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
259 file_content = ostrsplit (fileread (fname), "\n");
17357
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
260
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
261 na_rows = find (any (na_idx, 2));
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
262 for ridx = na_rows(:)'
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
263 row = file_content{ridx+header_rows};
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
264 if (delimiter == " ")
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
265 fields = regexp (strtrim (row), ' +', 'split');
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
266 else
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
267 fields = ostrsplit (row, delimiter);
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
268 endif
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
269
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
270 text = fields(na_idx(ridx,:));
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
271 text = text(! strcmpi (text, "NA")); # Remove valid "NA" entries
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
272 if (! isempty (text))
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
273 output.textdata(end+1:end+numel (text), 1) = text;
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
274 endif
17357
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
275 if (header_cols)
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
276 output.rowheaders(end+1, :) = fields(1:header_cols);
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
277 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
278 endfor
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
279
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
280 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
281
17357
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
282 ## Final cleanup to satisfy output configuration
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
283 if (all (cellfun ("isempty", output.textdata)))
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
284 output = output.data;
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
285 elseif (! isempty (output.rowheaders) && ! isempty (output.colheaders))
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
286 output = struct ("data", {output.data}, "textdata", {output.textdata});
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
287 endif
15557
13206177060b importdata.m: 3X speedup by using str2double rather than num2str.
Rik <rik@octave.org>
parents: 15555
diff changeset
288
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
289 endfunction
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
290
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
291
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
292 %!test
17325
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
293 %! ## Comma separated values
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
294 %! A = [3.1 -7.2 0; 0.012 6.5 128];
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
295 %! fn = tmpnam ();
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
296 %! fid = fopen (fn, "w");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
297 %! fputs (fid, "3.1,-7.2,0\n0.012,6.5,128");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
298 %! fclose (fid);
17357
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
299 %! [a1,d1,h1] = importdata (fn, ",");
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
300 %! [a2,d2,h2] = importdata (fn);
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
301 %! unlink (fn);
17357
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
302 %! assert (a1, A);
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
303 %! assert (d1, ",");
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
304 %! assert (h1, 0);
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
305 %! assert (a2, A);
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
306 %! assert (d2, ",");
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
307 %! assert (h2, 0);
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
308
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
309 %!test
17325
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
310 %! ## Tab separated values
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
311 %! A = [3.1 -7.2 0; 0.012 6.5 128];
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
312 %! fn = tmpnam ();
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
313 %! fid = fopen (fn, "w");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
314 %! fputs (fid, "3.1\t-7.2\t0\n0.012\t6.5\t128");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
315 %! fclose (fid);
17357
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
316 %! [a1,d1,h1] = importdata (fn, "\t");
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
317 %! [a2,d2,h2] = importdata (fn);
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
318 %! unlink (fn);
17357
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
319 %! assert (a1, A);
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
320 %! assert (d1, "\t");
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
321 %! assert (h1, 0);
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
322 %! assert (a2, A);
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
323 %! assert (d2, "\t");
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
324 %! assert (h2, 0);
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
325
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
326 %!test
17325
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
327 %! ## Space separated values, using multiple spaces to align in columns.
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
328 %! A = [3.1 -7.2 0; 0.012 6.5 128];
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
329 %! fn = tmpnam ();
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
330 %! fid = fopen (fn, "w");
17325
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
331 %! fprintf (fid, "%10.3f %10.3f %10.3f\n", A');
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
332 %! fclose (fid);
17357
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
333 %! [a1,d1,h1] = importdata (fn, " ");
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
334 %! [a2,d2,h2] = importdata (fn);
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
335 %! unlink (fn);
17357
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
336 %! assert (a1, A);
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
337 %! assert (d1, " ");
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
338 %! assert (h1, 0);
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
339 %! assert (a2, A);
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
340 %! assert (d2, " ");
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
341 %! assert (h2, 0);
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
342
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
343 %!test
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
344 %! ## No separator, 1 column of data only
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
345 %! A = [3.1;-7.2;0;0.012;6.5;128];
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
346 %! fn = tmpnam ();
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
347 %! fid = fopen (fn, "w");
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
348 %! fprintf (fid, "%f\n", A);
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
349 %! fclose (fid);
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
350 %! [a1,d1,h1] = importdata (fn, "");
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
351 %! [a2,d2,h2] = importdata (fn);
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
352 %! unlink (fn);
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
353 %! assert (a1, A);
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
354 %! assert (d1, "");
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
355 %! assert (h1, 0);
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
356 %! assert (a2, A);
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
357 %! assert (d2, "");
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
358 %! assert (h2, 0);
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
359
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
360 %!test
17325
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
361 %! ## Header text
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
362 %! A.data = [3.1 -7.2 0; 0.012 6.5 128];
17245
7babcdb9bc13 Use ... instead of \ for line continuation marker.
Stefan Mahr <dac922@gmx.de>
parents: 16933
diff changeset
363 %! A.textdata = {"This is a header row."; ...
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
364 %! "this row does not contain any data, but the next one does."};
17357
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
365 %! A.colheaders = A.textdata (2);
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
366 %! fn = tmpnam ();
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
367 %! fid = fopen (fn, "w");
17325
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
368 %! fprintf (fid, "%s\n", A.textdata{:});
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
369 %! fputs (fid, "3.1\t-7.2\t0\n0.012\t6.5\t128");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
370 %! fclose (fid);
17325
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
371 %! [a,d,h] = importdata (fn, '\t');
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
372 %! unlink (fn);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
373 %! assert (a, A);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
374 %! assert (d, "\t");
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
375 %! assert (h, 2);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
376
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
377 %!test
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
378 %! ## Column headers, only last row is returned in colheaders
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
379 %! A.data = [3.1 -7.2 0; 0.012 6.5 128];
17357
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
380 %! A.textdata = {"Label1\tLabel2\tLabel3";
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
381 %! "col 1\tcol 2\tcol 3"};
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
382 %! A.colheaders = {"col 1", "col 2", "col 3"};
17325
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
383 %! fn = tmpnam ();
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
384 %! fid = fopen (fn, "w");
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
385 %! fprintf (fid, "%s\n", A.textdata{:});
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
386 %! fputs (fid, "3.1\t-7.2\t0\n0.012\t6.5\t128");
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
387 %! fclose (fid);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
388 %! [a,d,h] = importdata (fn, '\t');
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
389 %! unlink (fn);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
390 %! assert (a, A);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
391 %! assert (d, "\t");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
392 %! assert (h, 2);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
393
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
394 %!test
17325
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
395 %! ## Row headers
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
396 %! A.data = [3.1 -7.2 0; 0.012 6.5 128];
17357
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
397 %! A.textdata = {"row1"; "row2"};
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
398 %! A.rowheaders = A.textdata;
17325
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
399 %! fn = tmpnam ();
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
400 %! fid = fopen (fn, "w");
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
401 %! fputs (fid, "row1\t3.1\t-7.2\t0\nrow2\t0.012\t6.5\t128");
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
402 %! fclose (fid);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
403 %! [a,d,h] = importdata (fn, '\t');
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
404 %! unlink (fn);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
405 %! assert (a, A);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
406 %! assert (d, "\t");
17357
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 17325
diff changeset
407 %! assert (h, 0);
17325
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
408
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
409 %!test
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
410 %! ## Row/Column headers and Header Text
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
411 %! A.data = [3.1 -7.2 0; 0.012 6.5 128];
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
412 %! A.textdata = {"This is introductory header text"
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
413 %! " col1 col2 col3"
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
414 %! "row1"
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
415 %! "row2"};
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
416 %! fn = tmpnam ();
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
417 %! fid = fopen (fn, "w");
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
418 %! fprintf (fid, "%s\n", A.textdata{1:2});
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
419 %! fputs (fid, "row1\t3.1\t-7.2\t0\nrow2\t0.012\t6.5\t128");
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
420 %! fclose (fid);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
421 %! [a,d,h] = importdata (fn, '\t');
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
422 %! unlink (fn);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
423 %! assert (a, A);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
424 %! assert (d, "\t");
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
425 %! assert (h, 2);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
426
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
427 %!test
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
428 %! ## Ignore empty rows containing only spaces
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
429 %! A = [3.1 -7.2 0; 0.012 6.5 128];
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
430 %! fn = tmpnam ();
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
431 %! fid = fopen (fn, "w");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
432 %! fprintf (fid, "%10.3f %10.3f %10.3f\n", A(1,:));
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
433 %! fputs (fid, " ");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
434 %! fprintf (fid, "%10.3f %10.3f %10.3f\n", A(2,:));
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
435 %! fclose (fid);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
436 %! [a,d,h] = importdata (fn, " ");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
437 %! unlink (fn);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
438 %! assert (a, A);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
439 %! assert (d, " ");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
440 %! assert (h, 0);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
441
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
442 %!test
17325
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
443 %! ## Exponentials
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
444 %! A = [3.1 -7.2 0; 0.012 6.5 128];
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
445 %! fn = tmpnam ();
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
446 %! fid = fopen (fn, "w");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
447 %! fputs (fid, "+3.1e0\t-72E-1\t0\n12e-3\t6.5\t128");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
448 %! fclose (fid);
17325
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
449 %! [a,d,h] = importdata (fn, '\t');
15619
1feb913c34ca importdata.m: Correction for non-numeric data and added test for complex numbers.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15560
diff changeset
450 %! unlink (fn);
1feb913c34ca importdata.m: Correction for non-numeric data and added test for complex numbers.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15560
diff changeset
451 %! assert (a, A);
1feb913c34ca importdata.m: Correction for non-numeric data and added test for complex numbers.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15560
diff changeset
452 %! assert (d, "\t");
1feb913c34ca importdata.m: Correction for non-numeric data and added test for complex numbers.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15560
diff changeset
453 %! assert (h, 0);
1feb913c34ca importdata.m: Correction for non-numeric data and added test for complex numbers.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15560
diff changeset
454
1feb913c34ca importdata.m: Correction for non-numeric data and added test for complex numbers.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15560
diff changeset
455 %!test
17325
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
456 %! ## Complex numbers
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
457 %! A = [3.1 -7.2 0-3.4i; 0.012 -6.5+7.2i 128];
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
458 %! fn = tmpnam ();
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
459 %! fid = fopen (fn, "w");
17325
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
460 %! fputs (fid, "3.1\t-7.2\t0-3.4i\n0.012\t-6.5+7.2i\t128");
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
461 %! fclose (fid);
17325
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
462 %! [a,d,h] = importdata (fn, '\t');
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
463 %! unlink (fn);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
464 %! assert (a, A);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
465 %! assert (d, "\t");
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
466 %! assert (h, 0);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
467
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
468 %!test
17325
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
469 %! ## Exceptional values (Inf, NaN, NA)
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
470 %! A = [3.1 Inf NA; -Inf NaN 128];
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
471 %! fn = tmpnam ();
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
472 %! fid = fopen (fn, "w");
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
473 %! fputs (fid, "3.1\tInf\tNA\n-Inf\tNaN\t128");
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
474 %! fclose (fid);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
475 %! [a,d,h] = importdata (fn, '\t');
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
476 %! unlink (fn);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
477 %! assert (a, A);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
478 %! assert (d, "\t");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
479 %! assert (h, 0);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
480
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
481 %!test
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
482 %! ## Missing values and Text Values
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
483 %! A.data = [3.1 NA 0; 0.012 NA 128];
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
484 %! A.textdata = {char(zeros(1,0))
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
485 %! "NO DATA"};
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
486 %! fn = tmpnam ();
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
487 %! fid = fopen (fn, "w");
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
488 %! fputs (fid, "3.1\t\t0\n0.012\tNO DATA\t128");
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
489 %! fclose (fid);
17325
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
490 %! [a,d,h] = importdata (fn, '\t');
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
491 %! unlink (fn);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
492 %! assert (a, A);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
493 %! assert (d, "\t");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
494 %! assert (h, 0);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
495
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
496 %!#test
17325
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
497 %! ## CRLF for line breaks
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
498 %! A = [3.1 -7.2 0; 0.012 6.5 128];
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
499 %! fn = tmpnam ();
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
500 %! fid = fopen (fn, "w");
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
501 %! fputs (fid, "3.1\t-7.2\t0\r\n0.012\t6.5\t128");
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
502 %! fclose (fid);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
503 %! [a,d,h] = importdata (fn, '\t');
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
504 %! unlink (fn);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
505 %! assert (a, A);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
506 %! assert (d, "\t");
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
507 %! assert (h, 0);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
508
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
509 %!#test
17325
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
510 %! ## CR for line breaks
16653
1cfa3a49247f importdata.m: Added Carriage Return as possible line break character.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15847
diff changeset
511 %! A = [3.1 -7.2 0; 0.012 6.5 128];
1cfa3a49247f importdata.m: Added Carriage Return as possible line break character.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15847
diff changeset
512 %! fn = tmpnam ();
1cfa3a49247f importdata.m: Added Carriage Return as possible line break character.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15847
diff changeset
513 %! fid = fopen (fn, "w");
1cfa3a49247f importdata.m: Added Carriage Return as possible line break character.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15847
diff changeset
514 %! fputs (fid, "3.1\t-7.2\t0\r0.012\t6.5\t128");
1cfa3a49247f importdata.m: Added Carriage Return as possible line break character.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15847
diff changeset
515 %! fclose (fid);
17325
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders.
Rik <rik@octave.org>
parents: 17245
diff changeset
516 %! [a,d,h] = importdata (fn, '\t');
16653
1cfa3a49247f importdata.m: Added Carriage Return as possible line break character.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15847
diff changeset
517 %! unlink (fn);
1cfa3a49247f importdata.m: Added Carriage Return as possible line break character.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15847
diff changeset
518 %! assert (a, A);
1cfa3a49247f importdata.m: Added Carriage Return as possible line break character.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15847
diff changeset
519 %! assert (d, "\t");
1cfa3a49247f importdata.m: Added Carriage Return as possible line break character.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15847
diff changeset
520 %! assert (h, 0);
1cfa3a49247f importdata.m: Added Carriage Return as possible line break character.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15847
diff changeset
521
18663
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
522 %!test
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
523 %! ## Only text / no numeric data; \n as EOL
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
524 %! fn = tmpnam ();
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
525 %! fid = fopen (fn, "w");
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
526 %! fputs (fid, "aaaa 11\nbbbbb 22\nccccc 3\n");
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
527 %! fclose (fid);
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
528 %! [a, d, h] = importdata (fn);
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
529 %! unlink (fn);
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
530 %! assert (a, {"aaaa 11"; "bbbbb 22"; "ccccc 3"});
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
531 %! assert (d, "");
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
532 %! assert (h, 3);
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
533
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
534 %!test
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
535 %! ## Only text / no numeric data; \r\n as EOL; missing last EOL before EOF
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
536 %! fn = tmpnam ();
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
537 %! fid = fopen (fn, "w");
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
538 %! fputs (fid, "aaaa 11\r\nbbbbb 22\r\nccccc 3");
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
539 %! fclose (fid);
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
540 %! [a, d, h] = importdata (fn);
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
541 %! unlink (fn);
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
542 %! assert (a, {"aaaa 11"; "bbbbb 22"; "ccccc 3"});
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
543 %! assert (d, "");
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
544 %! assert (h, 3);
271873b2f44f importdata.m: Return cellstr of text when no numeric data found (bug #41630).
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 18538
diff changeset
545
17358
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
546 %!error importdata ()
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
547 %!error importdata (1,2,3,4)
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
548 %!error <FNAME must be a string> importdata (1)
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
549 %!error <option -pastespecial not implemented> importdata ("-pastespecial")
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
550 %!error <DELIMITER must be a single character> importdata ("foo", 1)
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
551 %!error <DELIMITER must be a single character> importdata ("foo", "ab")
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
552 %!error <HEADER_ROWS must be an integer> importdata ("foo", " ", "1")
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
553 %!error <HEADER_ROWS must be an integer> importdata ("foo", " ", 1.5)
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
554 %!error <not implemented for file format .au> importdata ("foo.au")
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
555 %!error <not implemented for file format .avi> importdata ("foo.avi")
95412dcfa707 importdata.m: Overhaul function
Rik <rik@octave.org>
parents: 17357
diff changeset
556