octave-dspies: scripts/io/importdata.m annotate

annotate scripts/io/importdata.m @ 17358:95412dcfa707

importdata.m: Overhaul function New delimiter detection. Use NA for missing data. Use dlmread even for space delimiter (10X speed-up). Use Octave coding standards. Add %!test and %!error tests. * scripts/io/importdata.m: Use regexp to find delimeter. Use NA for missing data. Use dlmread even for space delimiter (10X speed-up). Use Octave coding standards. Add %!test and %!error tests.

author	Rik <rik@octave.org>
date	Sat, 31 Aug 2013 14:29:55 -0700
parents	44624eb20076
children	87dfe4892ef9

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
9a455cf96dbe Incorporate importdata.m into Octave sources Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15546 diff changeset	149 fields = fieldnames (output);
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	150 if (numel (fields) == 1)
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	151 output = output.(fields{1});
15546 3bf1e0da76b0 importdata: new function Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: diff changeset	152 endif
3bf1e0da76b0 importdata: new function Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: diff changeset	153 endif
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	154
15546 3bf1e0da76b0 importdata: new function Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: diff changeset	155 endfunction
3bf1e0da76b0 importdata: new function Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: diff changeset	156
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	157 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	158
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	159 ## 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	160 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	161 output.textdata = {};
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core Daniel J Sebald <daniel.sebald@ieee.org> parents: 17325 diff changeset	162 output.rowheaders = {};
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core Daniel J Sebald <daniel.sebald@ieee.org> parents: 17325 diff changeset	163 output.colheaders = {};
15547 9a455cf96dbe Incorporate importdata.m into Octave sources Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15546 diff changeset	164
17357 44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core Daniel J Sebald <daniel.sebald@ieee.org> parents: 17325 diff changeset	165 [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	166 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	167 error (msg);
15546 3bf1e0da76b0 importdata: new function Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: diff changeset	168 endif
3bf1e0da76b0 importdata: new function Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: diff changeset	169
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	170 header_rows = 0;
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	171 header_cols = 0;
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	172
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	173 ## 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	174 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	175
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core Daniel J Sebald <daniel.sebald@ieee.org> parents: 17325 diff changeset	176 ## 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	177 if (isempty (delimiter))
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	178 ## This pattern can be fooled, but mostly does the job just fine.
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	179 delim = regexp (row, '[+-\d.eE\*ij ]+([^+-\d.ij])[+-\d.ij]',
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	180 'tokens', 'once');
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	181 if (! isempty (delim))
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	182 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	183 endif
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
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core Daniel J Sebald <daniel.sebald@ieee.org> parents: 17325 diff changeset	186 if (delimiter == " ")
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	187 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	188 else
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	189 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	190 endif
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core Daniel J Sebald <daniel.sebald@ieee.org> parents: 17325 diff changeset	191 row_data = str2double (row_entries);
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	192 if (all (isnan (row_data)) \|\| header_rows < num_header_rows)
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	193 header_rows++;
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	194 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	195 else
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	196 if (! isempty (output.textdata))
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	197 if (delimiter == " ")
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	198 output.colheaders = regexp (strtrim (output.textdata{end}),
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	199 ' +', 'split');
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	200 else
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	201 output.colheaders = ostrsplit (output.textdata{end}, delimiter);
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	202 endif
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 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	205 ## 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	206 break;
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core Daniel J Sebald <daniel.sebald@ieee.org> parents: 17325 diff changeset	207 endif
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core Daniel J Sebald <daniel.sebald@ieee.org> parents: 17325 diff changeset	208
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core Daniel J Sebald <daniel.sebald@ieee.org> parents: 17325 diff changeset	209 endwhile
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core Daniel J Sebald <daniel.sebald@ieee.org> parents: 17325 diff changeset	210
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core Daniel J Sebald <daniel.sebald@ieee.org> parents: 17325 diff changeset	211 fclose (fid);
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core Daniel J Sebald <daniel.sebald@ieee.org> parents: 17325 diff changeset	212
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	213 if (row == -1)
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	214 error ("importdata: Unable to determine delimiter");
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	215 endif
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	216 if (num_header_rows >= 0)
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	217 header_rows = num_header_rows;
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	218 endif
17357 44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core Daniel J Sebald <daniel.sebald@ieee.org> parents: 17325 diff changeset	219
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	220 ## 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	221 if (delimiter == " ")
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	222 output.data = dlmread (fname, "", header_rows, header_cols,
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	223 "emptyvalue", NA);
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	224 else
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	225 output.data = dlmread (fname, delimiter, header_rows, header_cols,
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	226 "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	227 endif
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core Daniel J Sebald <daniel.sebald@ieee.org> parents: 17325 diff changeset	228
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	229 ## Go back and correct any individual values that did not convert.
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	230 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	231 if (header_cols > 0)
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	232 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	233 endif
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	234 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	235
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	236 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	237
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	238 na_rows = find (any (na_idx, 2));
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	239 for ridx = na_rows(:)'
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	240 row = file_content{ridx+header_rows};
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	241 if (delimiter == " ")
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	242 fields = regexp (strtrim (row), ' +', 'split');
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	243 else
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	244 fields = ostrsplit (row, delimiter);
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	245 endif
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	246
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	247 text = fields(na_idx(ridx,:));
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	248 text = text(! strcmpi (text, "NA")); # Remove valid "NA" entries
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	249 if (! isempty (text))
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	250 output.textdata(end+1:end+numel (text), 1) = text;
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	251 endif
17357 44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core Daniel J Sebald <daniel.sebald@ieee.org> parents: 17325 diff changeset	252 if (header_cols)
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	253 output.rowheaders(end+1, :) = fields(1:header_cols);
15546 3bf1e0da76b0 importdata: new function Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: diff changeset	254 endif
3bf1e0da76b0 importdata: new function Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: diff changeset	255 endfor
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	256
15546 3bf1e0da76b0 importdata: new function Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: diff changeset	257 endif
3bf1e0da76b0 importdata: new function Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: diff changeset	258
17357 44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core Daniel J Sebald <daniel.sebald@ieee.org> parents: 17325 diff changeset	259 ## 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	260 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	261 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	262 elseif (! isempty (output.rowheaders) && ! isempty (output.colheaders))
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	263 output = struct ("data", {output.data}, "textdata", {output.textdata});
15546 3bf1e0da76b0 importdata: new function Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: diff changeset	264 endif
15557 13206177060b importdata.m: 3X speedup by using str2double rather than num2str. Rik <rik@octave.org> parents: 15555 diff changeset	265
15546 3bf1e0da76b0 importdata: new function Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: diff changeset	266 endfunction
15560 305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	267
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	268
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	269 %!test
17325 8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	270 %! ## Comma separated values
15560 305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	271 %! 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	272 %! fn = tmpnam ();
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	273 %! fid = fopen (fn, "w");
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	274 %! 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	275 %! 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	276 %! [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	277 %! [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	278 %! 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	279 %! 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	280 %! assert (d1, ",");
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core Daniel J Sebald <daniel.sebald@ieee.org> parents: 17325 diff changeset	281 %! 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	282 %! 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	283 %! assert (d2, ",");
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core Daniel J Sebald <daniel.sebald@ieee.org> parents: 17325 diff changeset	284 %! assert (h2, 0);
15560 305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	285
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	286 %!test
17325 8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	287 %! ## Tab separated values
15560 305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	288 %! 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	289 %! fn = tmpnam ();
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	290 %! fid = fopen (fn, "w");
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	291 %! 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	292 %! 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	293 %! [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	294 %! [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	295 %! 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	296 %! 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	297 %! 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	298 %! 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	299 %! 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	300 %! 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	301 %! assert (h2, 0);
15560 305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	302
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	303 %!test
17325 8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	304 %! ## 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	305 %! 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	306 %! fn = tmpnam ();
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	307 %! fid = fopen (fn, "w");
17325 8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	308 %! 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	309 %! 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	310 %! [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	311 %! [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	312 %! 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	313 %! 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	314 %! assert (d1, " ");
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core Daniel J Sebald <daniel.sebald@ieee.org> parents: 17325 diff changeset	315 %! 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	316 %! 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	317 %! assert (d2, " ");
44624eb20076 Speed up importdata() ASCII CSV processing using dlmread() as core Daniel J Sebald <daniel.sebald@ieee.org> parents: 17325 diff changeset	318 %! assert (h2, 0);
15560 305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	319
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	320 %!test
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	321 %! ## No separator, 1 column of data only
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	322 %! A = [3.1;-7.2;0;0.012;6.5;128];
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	323 %! fn = tmpnam ();
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	324 %! fid = fopen (fn, "w");
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	325 %! fprintf (fid, "%f\n", A);
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	326 %! fclose (fid);
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	327 %! [a1,d1,h1] = importdata (fn, "");
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	328 %! [a2,d2,h2] = importdata (fn);
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	329 %! unlink (fn);
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	330 %! assert (a1, A);
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	331 %! assert (d1, "");
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	332 %! assert (h1, 0);
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	333 %! assert (a2, A);
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	334 %! assert (d2, "");
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	335 %! assert (h2, 0);
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	336
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	337 %!test
17325 8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	338 %! ## Header text
15560 305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	339 %! 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	340 %! 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	341 %! "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	342 %! 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	343 %! fn = tmpnam ();
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	344 %! fid = fopen (fn, "w");
17325 8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	345 %! 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	346 %! 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	347 %! fclose (fid);
17325 8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	348 %! [a,d,h] = importdata (fn, '\t');
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	349 %! unlink (fn);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	350 %! assert (a, A);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	351 %! assert (d, "\t");
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	352 %! assert (h, 2);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	353
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	354 %!test
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	355 %! ## 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	356 %! 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	357 %! A.textdata = {"Label1\tLabel2\tLabel3";
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	358 %! "col 1\tcol 2\tcol 3"};
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	359 %! 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	360 %! fn = tmpnam ();
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	361 %! fid = fopen (fn, "w");
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	362 %! fprintf (fid, "%s\n", A.textdata{:});
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	363 %! 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	364 %! fclose (fid);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	365 %! [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	366 %! unlink (fn);
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	367 %! assert (a, A);
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	368 %! assert (d, "\t");
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	369 %! assert (h, 2);
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	370
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	371 %!test
17325 8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	372 %! ## Row headers
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	373 %! 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	374 %! 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	375 %! A.rowheaders = A.textdata;
17325 8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	376 %! fn = tmpnam ();
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	377 %! fid = fopen (fn, "w");
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	378 %! 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	379 %! fclose (fid);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	380 %! [a,d,h] = importdata (fn, '\t');
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	381 %! unlink (fn);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	382 %! assert (a, A);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	383 %! 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	384 %! assert (h, 0);
17325 8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	385
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	386 %!test
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	387 %! ## Row/Column headers and Header Text
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	388 %! 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	389 %! A.textdata = {"This is introductory header text"
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	390 %! " col1 col2 col3"
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	391 %! "row1"
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	392 %! "row2"};
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	393 %! fn = tmpnam ();
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	394 %! fid = fopen (fn, "w");
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	395 %! 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	396 %! 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	397 %! fclose (fid);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	398 %! [a,d,h] = importdata (fn, '\t');
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	399 %! unlink (fn);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	400 %! assert (a, A);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	401 %! assert (d, "\t");
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	402 %! assert (h, 2);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	403
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	404 %!test
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	405 %! ## 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	406 %! 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	407 %! fn = tmpnam ();
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	408 %! fid = fopen (fn, "w");
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	409 %! 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	410 %! fputs (fid, " ");
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	411 %! 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	412 %! fclose (fid);
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	413 %! [a,d,h] = importdata (fn, " ");
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	414 %! unlink (fn);
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	415 %! assert (a, A);
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	416 %! assert (d, " ");
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	417 %! assert (h, 0);
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	418
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	419 %!test
17325 8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	420 %! ## Exponentials
15560 305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	421 %! 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	422 %! fn = tmpnam ();
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	423 %! fid = fopen (fn, "w");
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	424 %! 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	425 %! fclose (fid);
17325 8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	426 %! [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	427 %! 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	428 %! 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	429 %! 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	430 %! 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	431
1feb913c34ca importdata.m: Correction for non-numeric data and added test for complex numbers. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15560 diff changeset	432 %!test
17325 8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	433 %! ## Complex numbers
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	434 %! 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	435 %! fn = tmpnam ();
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	436 %! fid = fopen (fn, "w");
17325 8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	437 %! 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	438 %! fclose (fid);
17325 8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	439 %! [a,d,h] = importdata (fn, '\t');
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	440 %! unlink (fn);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	441 %! assert (a, A);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	442 %! assert (d, "\t");
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	443 %! assert (h, 0);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	444
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	445 %!test
17325 8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	446 %! ## Exceptional values (Inf, NaN, NA)
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	447 %! 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	448 %! fn = tmpnam ();
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	449 %! fid = fopen (fn, "w");
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	450 %! 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	451 %! fclose (fid);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	452 %! [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	453 %! unlink (fn);
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	454 %! assert (a, A);
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	455 %! assert (d, "\t");
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	456 %! assert (h, 0);
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	457
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	458 %!test
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	459 %! ## Missing values and Text Values
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	460 %! A.data = [3.1 NA 0; 0.012 NA 128];
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	461 %! A.textdata = {char(zeros(1,0))
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	462 %! "NO DATA"};
15560 305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	463 %! fn = tmpnam ();
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	464 %! fid = fopen (fn, "w");
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	465 %! 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	466 %! fclose (fid);
17325 8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	467 %! [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	468 %! unlink (fn);
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	469 %! assert (a, A);
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	470 %! assert (d, "\t");
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	471 %! assert (h, 0);
305ad0a215ba importdata.m: Added tests and made small corrections. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15557 diff changeset	472
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	473 %!#test
17325 8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	474 %! ## CRLF for line breaks
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	475 %! 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	476 %! fn = tmpnam ();
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	477 %! fid = fopen (fn, "w");
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	478 %! 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	479 %! fclose (fid);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	480 %! [a,d,h] = importdata (fn, '\t');
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	481 %! unlink (fn);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	482 %! assert (a, A);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	483 %! assert (d, "\t");
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	484 %! assert (h, 0);
8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	485
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	486 %!#test
17325 8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	487 %! ## 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	488 %! 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	489 %! fn = tmpnam ();
1cfa3a49247f importdata.m: Added Carriage Return as possible line break character. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15847 diff changeset	490 %! 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	491 %! 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	492 %! fclose (fid);
17325 8cfc28809a07 importdata.m: Add %!tests for colheaders and rowheaders. Rik <rik@octave.org> parents: 17245 diff changeset	493 %! [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	494 %! unlink (fn);
1cfa3a49247f importdata.m: Added Carriage Return as possible line break character. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15847 diff changeset	495 %! assert (a, A);
1cfa3a49247f importdata.m: Added Carriage Return as possible line break character. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15847 diff changeset	496 %! assert (d, "\t");
1cfa3a49247f importdata.m: Added Carriage Return as possible line break character. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15847 diff changeset	497 %! assert (h, 0);
1cfa3a49247f importdata.m: Added Carriage Return as possible line break character. Erik Kjellson <erikiiofph7@users.sourceforge.net> parents: 15847 diff changeset	498
17358 95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	499 %!error importdata ()
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	500 %!error importdata (1,2,3,4)
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	501 %!error <FNAME must be a string> importdata (1)
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	502 %!error <option -pastespecial not implemented> importdata ("-pastespecial")
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	503 %!error <DELIMITER must be a single character> importdata ("foo", 1)
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	504 %!error <DELIMITER must be a single character> importdata ("foo", "ab")
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	505 %!error <HEADER_ROWS must be an integer> importdata ("foo", " ", "1")
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	506 %!error <HEADER_ROWS must be an integer> importdata ("foo", " ", 1.5)
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	507 %!error <not implemented for file format .au> importdata ("foo.au")
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	508 %!error <not implemented for file format .avi> importdata ("foo.avi")
95412dcfa707 importdata.m: Overhaul function Rik <rik@octave.org> parents: 17357 diff changeset	509

Mercurial > octave-dspies

annotate scripts/io/importdata.m @ 17358:95412dcfa707