Mercurial > hg > octave-lyh

annotate scripts/io/importdata.m @ 16768:e2de3c8882be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copyright notice fixes * libgui/src/color-picker.cc, libgui/src/color-picker.h, libgui/src/m-editor/octave-qscintilla.cc, libgui/src/m-editor/octave-qscintilla.h, libgui/src/qtinfo/parser.cc, libgui/src/qtinfo/parser.h, libgui/src/qtinfo/webinfo.cc, libgui/src/qtinfo/webinfo.h, libinterp/corefcn/ellipj.cc, libinterp/interp-core/jit-ir.cc, libinterp/interp-core/jit-ir.h, libinterp/interp-core/jit-typeinfo.cc, libinterp/interp-core/jit-typeinfo.h, libinterp/interp-core/jit-util.cc, libinterp/interp-core/jit-util.h, libinterp/interp-core/pt-jit.cc, libinterp/interp-core/pt-jit.h, libinterp/template-inst/Array-jit.cc, liboctave/numeric/bsxfun.h, liboctave/util/kpse.cc, scripts/image/imfinfo.m, scripts/image/imread.m, scripts/io/importdata.m, scripts/io/textscan.m, scripts/java/usejava.m, scripts/linear-algebra/logm.m, scripts/sparse/bicg.m, scripts/specfun/ellipke.m, scripts/specfun/expint.m, scripts/strings/strjoin.m: List email addresses in Author: lines. Update copyright notices to use web address for FSF.
author John W. Eaton <jwe@octave.org>
date Tue, 18 Jun 2013 06:39:12 -0400
parents 47fbafc6e8e2
children 12005245b645
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{})
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
25 ## Importing data from file.
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
26 ##
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
27 ## Importing the contents of file @var{fname} into workspace.
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
28 ##
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
29 ## Input parameters:
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
30 ## @itemize
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
31 ## @item @var{fname}
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
32 ## The file name for the file to import.
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
33 ##
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
34 ## @item @var{delimiter}
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
35 ## The character separating columns of data. Use @code{\t} for tab.
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
36 ## (Only valid for ascii files)
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
37 ##
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
38 ## @item @var{header_rows}
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
39 ## Number of header rows before the data begins. (Only valid for ascii 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:
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
43 ## @itemize
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
44 ## @item Ascii table
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
45 ##
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
46 ## Importing ascii table using the specified number of header rows and
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
47 ## the specified delimiter.
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
48 ##
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
49 ## @item Image file
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
50 ##
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
51 ## @item @sc{Matlab} file
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
52 ##
15551
e21b21c2a20d importdata.m: properly fall back to unimplemented.m & allow spreadheet I/O
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 15549
diff changeset
53 ## @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
54 ##
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
55 ## @item Wav file
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
56 ##
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
57 ## @end itemize
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
58 ##
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
59 ## @seealso{textscan, dlmread, csvread, load}
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
60 ## @end deftypefn
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
61
16768
e2de3c8882be copyright notice fixes
John W. Eaton <jwe@octave.org>
parents: 16767
diff changeset
62 ## Author: Erik Kjellson <erikiiofph7@users.sourceforge.net>
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
63
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
64 function [output, delimiter, header_rows] = importdata (varargin)
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
65
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
66 ## Default values
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
67 fname = "";
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
68 delimiter = "";
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
69 header_rows = -1;
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
70
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
71 ##########
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
72
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
73 ## Check input arguments
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
74
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
75 if (nargin < 1)
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
76 print_usage ();
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
77 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
78
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
79 fname = varargin{1};
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
80 ## Check that the file name really is a string
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
81 if (! ischar (fname))
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
82 error ("importdata: file name needs to be a string");
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
83 endif
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
84 if ( strcmpi (fname, "-pastespecial"))
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
85 error ("importdata: option -pastespecial not implemented");
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
86 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
87
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
88 if (nargin > 1)
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
89 delimiter = varargin{2};
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
90 ## Check that the delimiter really is a string
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
91 if (!ischar (delimiter))
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
92 error("importdata: delimiter needs to be a character");
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
93 endif
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
94 if (length (delimiter) > 1 && !strcmpi (delimiter, "\\t"))
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
95 error("importdata: delimiter cannot be longer than 1 character");
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
96 endif
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
97 if (strcmpi (delimiter, "\\"))
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
98 delimiter = "\\\\";
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
99 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
100 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
101
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
102 if (nargin > 2)
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
103 header_rows = varargin{3};
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
104 if (!isnumeric (header_rows) || header_rows < 0)
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
105 error ("importdata: number of header rows needs to be an integer number >= 0");
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
106 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
107 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
108
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
109 if (nargin > 3)
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
110 error ("importdata: too many input arguments");
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
111 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
112
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
113 ##########
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
114
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
115 ## Check file format
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
116 ## Get the extension from the file name.
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
117 [d n fileExt v] = fileparts (fname);
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
118 ## Make sure file extension is in lower case.
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
119 fileExt = lower (fileExt);
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
120
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
121 switch fileExt
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
122 case {".au", ".snd"}
16767
47fbafc6e8e2 * importdata.m: Don't use sprintf to format error messages.
John W. Eaton <jwe@octave.org>
parents: 16653
diff changeset
123 error ("importdata: not implemented for file format %s", fileExt);
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
124 case ".avi"
16767
47fbafc6e8e2 * importdata.m: Don't use sprintf to format error messages.
John W. Eaton <jwe@octave.org>
parents: 16653
diff changeset
125 error ("importdata: not implemented for file format %s", fileExt);
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
126 case {".bmp", ".cur", ".gif", ".hdf", ".ico", ".jpe", ".jpeg", ".jpg", \
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
127 ".pbm", ".pcx", ".pgm", ".png", ".pnm", ".ppm", ".ras", \
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
128 ".tif", ".tiff", ".xwd"}
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
129 delimiter = NaN;
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
130 header_rows = 0;
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
131 [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
132 case ".mat"
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
133 delimiter = NaN;
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
134 header_rows = 0;
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
135 output = load (fname);
15551
e21b21c2a20d importdata.m: properly fall back to unimplemented.m & allow spreadheet I/O
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 15549
diff changeset
136 case {".wk1", ".xls", ".xlsx", ".dbf", ".pxl"}
e21b21c2a20d importdata.m: properly fall back to unimplemented.m & allow spreadheet I/O
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 15549
diff changeset
137 ## 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
138 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
139 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
140 ## 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
141 try
e21b21c2a20d importdata.m: properly fall back to unimplemented.m & allow spreadheet I/O
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 15549
diff changeset
142 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
143 catch
e21b21c2a20d importdata.m: properly fall back to unimplemented.m & allow spreadheet I/O
Philip Nienhuis <prnienhuis@users.sf.net>
parents: 15549
diff changeset
144 ## 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
145 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
146 end_try_catch
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
147 case {".wav", ".wave"}
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
148 delimiter = NaN;
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
149 header_rows = 0;
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
150 [output.data, output.fs] = wavread (fname);
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
151 otherwise
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
152 ## Assume the file is in ascii format.
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
153 [output, delimiter, header_rows] = \
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
154 importdata_ascii (fname, delimiter, header_rows);
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
155 endswitch
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
156
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
157 ## If there are any empty fields in the output structure, then remove them
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
158 if (isstruct (output) && length (output) == 1)
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
159 fields = fieldnames (output);
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
160 for i=1:length (fields)
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
161 if (isempty (getfield (output, fields{i})))
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
162 output = rmfield (output, fields{i});
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
163 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
164 endfor
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
165
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
166 ## If only one field is left, replace the structure with the field,
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
167 ## i.e. output = output.onlyFieldLeft
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
168
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
169 ## Update the list of fields
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
170 fields = fieldnames (output);
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
171 if (length (fields) == 1)
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
172 output = getfield (output, fields{1});
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
173 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
174 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
175 endfunction
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
176
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
177
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
178 ########################################
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
179
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
180 function [output, delimiter, header_rows] = \
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
181 importdata_ascii (fname, delimiter, header_rows)
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
182
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
183 ## Define the fields in the output structure so that the order will be
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
184 ## correct.
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
185
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
186 output.data = [];
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
187 output.textdata = [];
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
188 output.rowheaders = [];
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
189 output.colheaders = [];
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
190
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
191 ## Read file into string and count the number of header rows
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
192 file_content = fileread (fname);
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
193
16653
1cfa3a49247f importdata.m: Added Carriage Return as possible line break character.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15847
diff changeset
194 ## Split the file into rows (using \n and/or \r as delimiters between rows).
1cfa3a49247f importdata.m: Added Carriage Return as possible line break character.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15847
diff changeset
195 file_content_rows = regexp (file_content, "\n|\n\r|\r|\r\n", "split");
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
196
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
197 ## FIXME: guess delimiter, if it isn't defined
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
198 if (isempty (delimiter))
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
199 error ("importdata: Guessing delimiter is not implemented yet, you have to specify it.");
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
200 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
201
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
202 ## FIXME: A more intelligent way to count number of header rows. This
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
203 ## is needed e.g. when delimiter=' ' and the header contains spaces...
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
204
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
205 ## If number of header rows is undefined, then count the number of
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
206 ## header rows by step through row by row and look for the delimiter.
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
207 ## Assume that the header can't contain any delimiter.
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
208 if (header_rows < 0)
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
209 header_rows = 0;
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
210 for i=1:length (file_content_rows)
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
211 if (isempty (regexp(file_content_rows{i}, delimiter, "once")))
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
212 header_rows++;
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
213 else
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
214 ## Data part has begun and therefore no more header rows can be
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
215 ## found
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
216 break;
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
217 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
218 endfor
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
219 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
220
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
221 ## Put the header rows in output.textdata.
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
222 if (header_rows > 0)
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
223 output.textdata = file_content_rows (1:header_rows)';
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
224 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
225
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
226 ## If space is the delimiter, then remove spaces in the beginning of
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
227 ## each data row.
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
228 if (strcmpi (delimiter, " "))
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
229 for i=(header_rows+1):length (file_content_rows)
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
230 ## strtrim does not only remove the leading spaces but also the
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
231 ## tailing spaces, but that doesn't really matter.
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
232 file_content_rows{i} = strtrim (file_content_rows{i});
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
233 endfor
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
234 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
235
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
236 ## Remove empty data rows. Go through them backwards so that you wont
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
237 ## get out of bounds.
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
238 for i=length (file_content_rows):-1:(header_rows + 1)
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
239 if (length (file_content_rows{i}) < 1)
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
240 file_content_rows = [file_content_rows(1:i-1), \
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
241 file_content_rows(i+1:length(file_content_rows))];
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
242 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
243 endfor
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
244
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
245 ## Count the number of data columns. If there are different number of
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
246 ## columns, use the greatest value.
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
247 data_columns = 0;
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
248 delimiter_pattern = delimiter;
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
249 ## If space is the delimiter, then multiple spaces should count as ONE
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
250 ## delimiter. Also ignore leading spaces.
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
251 if (strcmpi (delimiter, " "))
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
252 delimiter_pattern = ' +';
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
253 endif
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
254 for i=(header_rows+1):length(file_content_rows)
15555
17b04c4c268d importdata.m: style fixes
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15554
diff changeset
255 data_columns = max (data_columns,
17b04c4c268d importdata.m: style fixes
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15554
diff changeset
256 length (regexp (file_content_rows{i},
17b04c4c268d importdata.m: style fixes
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15554
diff changeset
257 delimiter_pattern, "split")));
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
258 endfor
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
259
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
260 ## FIXME: Make it behave like Matlab when importing a table where a whole
1feb913c34ca importdata.m: Correction for non-numeric data and added test for complex numbers.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15560
diff changeset
261 ## column is text only. E.g.
1feb913c34ca importdata.m: Correction for non-numeric data and added test for complex numbers.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15560
diff changeset
262 ## abc 12 34
1feb913c34ca importdata.m: Correction for non-numeric data and added test for complex numbers.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15560
diff changeset
263 ## def 56 78
1feb913c34ca importdata.m: Correction for non-numeric data and added test for complex numbers.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15560
diff changeset
264 ## This would give a 3x2 data matrix with the left column = nan(2,1), and
1feb913c34ca importdata.m: Correction for non-numeric data and added test for complex numbers.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15560
diff changeset
265 ## the text would end up in textdata.
1feb913c34ca importdata.m: Correction for non-numeric data and added test for complex numbers.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15560
diff changeset
266 ## In Matlab the data matrix would only be a 2x2 matrix, see example at:
1feb913c34ca importdata.m: Correction for non-numeric data and added test for complex numbers.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15560
diff changeset
267 ## http://www.mathworks.se/help/matlab/import_export/import-numeric-data-and-header-text-from-a-text-file.html
1feb913c34ca importdata.m: Correction for non-numeric data and added test for complex numbers.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15560
diff changeset
268
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
269 ## Go through the data and put it in either output.data or
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
270 ## output.textdata depending on if it is numeric or not.
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
271 output.data = NaN (length (file_content_rows) - header_rows, data_columns);
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
272 for i=(header_rows+1):length(file_content_rows)
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
273 ## Only use the row if it contains anything other than white-space
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
274 ## characters.
15554
499467c51cd5 importdata: Speeded up the import by a factor 2.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15551
diff changeset
275 if (any (file_content_rows{i} != " "))
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
276 row_data = regexp (file_content_rows{i}, delimiter_pattern, "split");
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
277
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
278 for j=1:length(row_data)
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
279 ## Try to convert the column to a number, if it works put it in
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
280 ## output.data, otherwise in output.textdata
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
281 if (!isempty (row_data{j}))
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
282 data_numeric = str2double (row_data{j});
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
283 if (!isnan (data_numeric))
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
284 output.data(i-header_rows, j) = data_numeric;
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
285 else
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
286 output.textdata{i,j} = row_data{j};
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
287 endif
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
288 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
289 endfor
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
290
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
291 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
292 endfor
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
293
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
294 ## Check wether rowheaders or colheaders should be used
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
295 if ((header_rows == data_columns) && (size (output.textdata, 2) == 1))
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
296 output.rowheaders = output.textdata;
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
297 elseif (size (output.textdata, 2) == data_columns)
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
298 output.colheaders = output.textdata(end,:);
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
299 endif
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
300
15557
13206177060b importdata.m: 3X speedup by using str2double rather than num2str.
Rik <rik@octave.org>
parents: 15555
diff changeset
301 ## When delimiter = "\\t" convert it to a tab, done for Matlab compatibility.
13206177060b importdata.m: 3X speedup by using str2double rather than num2str.
Rik <rik@octave.org>
parents: 15555
diff changeset
302 if (strcmp (delimiter, '\t'))
15547
9a455cf96dbe Incorporate importdata.m into Octave sources
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 15546
diff changeset
303 delimiter = "\t";
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
304 endif
15557
13206177060b importdata.m: 3X speedup by using str2double rather than num2str.
Rik <rik@octave.org>
parents: 15555
diff changeset
305
15546
3bf1e0da76b0 importdata: new function
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents:
diff changeset
306 endfunction
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
307
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 ########################################
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
310
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
311 %!test
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
312 %! # Comma separated values
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
313 %! 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
314 %! fn = tmpnam ();
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
315 %! fid = fopen (fn, "w");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
316 %! 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
317 %! fclose (fid);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
318 %! [a,d,h] = importdata (fn, ",");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
319 %! unlink (fn);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
320 %! assert (a, A);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
321 %! assert (d, ",");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
322 %! assert (h, 0);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
323
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
324 %!test
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
325 %! # Tab separated values
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
326 %! 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
327 %! fn = tmpnam ();
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
328 %! fid = fopen (fn, "w");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
329 %! 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
330 %! fclose (fid);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
331 %! [a,d,h] = importdata (fn, "\\t");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
332 %! unlink (fn);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
333 %! assert (a, A);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
334 %! assert (d, "\t");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
335 %! assert (h, 0);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
336
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
337 %!test
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
338 %! # Space separated values, using multiple spaces to align in columns.
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
339 %! 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
340 %! fn = tmpnam ();
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
341 %! fid = fopen (fn, "w");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
342 %! 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
343 %! 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
344 %! fclose (fid);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
345 %! [a,d,h] = importdata (fn, " ");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
346 %! unlink (fn);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
347 %! assert (a, A);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
348 %! assert (d, " ");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
349 %! assert (h, 0);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
350
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
351 %!test
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
352 %! # Header
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
353 %! A.data = [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
354 %! A.textdata = {"This is a header row."; \
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
355 %! "this row does not contain any data, but the next one does."};
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
356 %! fn = tmpnam ();
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
357 %! fid = fopen (fn, "w");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
358 %! fputs (fid, [A.textdata{1} "\n"]);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
359 %! fputs (fid, [A.textdata{2} "\n"]);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
360 %! 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
361 %! fclose (fid);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
362 %! [a,d,h] = importdata (fn, "\\t");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
363 %! unlink (fn);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
364 %! assert (a, A);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
365 %! assert (d, "\t");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
366 %! assert (h, 2);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
367
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
368 %!test
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
369 %! # Ignore empty rows containing only spaces
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
370 %! 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
371 %! fn = tmpnam ();
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
372 %! fid = fopen (fn, "w");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
373 %! 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
374 %! fputs (fid, " ");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
375 %! 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
376 %! fclose (fid);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
377 %! [a,d,h] = importdata (fn, " ");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
378 %! unlink (fn);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
379 %! assert (a, A);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
380 %! assert (d, " ");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
381 %! assert (h, 0);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
382
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
383 %!test
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
384 %! # Exponentials
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
385 %! 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
386 %! fn = tmpnam ();
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
387 %! fid = fopen (fn, "w");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
388 %! 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
389 %! fclose (fid);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
390 %! [a,d,h] = importdata (fn, "\\t");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
391 %! unlink (fn);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
392 %! assert (a, A);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
393 %! assert (d, "\t");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
394 %! assert (h, 0);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
395
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
396 %!test
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
397 %! # Complex numbers
1feb913c34ca importdata.m: Correction for non-numeric data and added test for complex numbers.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15560
diff changeset
398 %! A = [3.1 -7.2 0-3.4i; 0.012 -6.5+7.2i 128];
1feb913c34ca importdata.m: Correction for non-numeric data and added test for complex numbers.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15560
diff changeset
399 %! fn = tmpnam ();
1feb913c34ca importdata.m: Correction for non-numeric data and added test for complex numbers.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15560
diff changeset
400 %! fid = fopen (fn, "w");
1feb913c34ca importdata.m: Correction for non-numeric data and added test for complex numbers.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15560
diff changeset
401 %! fputs (fid, "3.1\t-7.2\t0-3.4i\n0.012\t-6.5+7.2i\t128");
1feb913c34ca importdata.m: Correction for non-numeric data and added test for complex numbers.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15560
diff changeset
402 %! fclose (fid);
1feb913c34ca importdata.m: Correction for non-numeric data and added test for complex numbers.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15560
diff changeset
403 %! [a,d,h] = importdata (fn, "\\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
404 %! 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
405 %! 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
406 %! 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
407 %! 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
408
1feb913c34ca importdata.m: Correction for non-numeric data and added test for complex numbers.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15560
diff changeset
409 %!test
15560
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
410 %! # Missing values
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
411 %! A = [3.1 NaN 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
412 %! fn = tmpnam ();
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
413 %! fid = fopen (fn, "w");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
414 %! fputs (fid, "3.1\t\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
415 %! fclose (fid);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
416 %! [a,d,h] = importdata (fn, "\\t");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
417 %! unlink (fn);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
418 %! assert (a, A);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
419 %! assert (d, "\t");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
420 %! assert (h, 0);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
421
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
422 %!test
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
423 %! # CRLF for line breaks
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
424 %! 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
425 %! fn = tmpnam ();
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
426 %! fid = fopen (fn, "w");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
427 %! fputs (fid, "3.1\t-7.2\t0\r\n0.012\t6.5\t128");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
428 %! fclose (fid);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
429 %! [a,d,h] = importdata (fn, "\\t");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
430 %! unlink (fn);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
431 %! assert (a, A);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
432 %! assert (d, "\t");
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
433 %! assert (h, 0);
305ad0a215ba importdata.m: Added tests and made small corrections.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15557
diff changeset
434
16653
1cfa3a49247f importdata.m: Added Carriage Return as possible line break character.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15847
diff changeset
435 %!test
1cfa3a49247f importdata.m: Added Carriage Return as possible line break character.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15847
diff changeset
436 %! # CR for line breaks
1cfa3a49247f importdata.m: Added Carriage Return as possible line break character.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15847
diff changeset
437 %! 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
438 %! fn = tmpnam ();
1cfa3a49247f importdata.m: Added Carriage Return as possible line break character.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15847
diff changeset
439 %! 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
440 %! 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
441 %! fclose (fid);
1cfa3a49247f importdata.m: Added Carriage Return as possible line break character.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15847
diff changeset
442 %! [a,d,h] = importdata (fn, "\\t");
1cfa3a49247f importdata.m: Added Carriage Return as possible line break character.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15847
diff changeset
443 %! unlink (fn);
1cfa3a49247f importdata.m: Added Carriage Return as possible line break character.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15847
diff changeset
444 %! assert (a, A);
1cfa3a49247f importdata.m: Added Carriage Return as possible line break character.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15847
diff changeset
445 %! assert (d, "\t");
1cfa3a49247f importdata.m: Added Carriage Return as possible line break character.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15847
diff changeset
446 %! assert (h, 0);
1cfa3a49247f importdata.m: Added Carriage Return as possible line break character.
Erik Kjellson <erikiiofph7@users.sourceforge.net>
parents: 15847
diff changeset
447