Mercurial > octave-nkf

annotate src/DLD-FUNCTIONS/dlmread.cc @ 10806:7c542263a92a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
omissions from last two patches
author Jaroslav Hajek <highegg@gmail.com>
date Tue, 20 Jul 2010 13:10:40 +0200
parents 3d5c6b84ddaf
children a9e9659e1dca
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
1 /*
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
2
9245
16f53d29049f update copyright notices
John W. Eaton <jwe@octave.org>
parents: 9064
diff changeset
3 Copyright (C) 2008, 2009 Jonathan Stickel
10804
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
4 Copyright (C) 2010 Jaroslav Hajek
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
5
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
6 This file is part of Octave.
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
7
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
8 Octave is free software; you can redistribute it and/or modify it
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
9 under the terms of the GNU General Public License as published by the
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
10 Free Software Foundation; either version 3 of the License, or (at your
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
11 option) any later version.
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
12
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
13 Octave is distributed in the hope that it will be useful, but WITHOUT
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
16 for more details.
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
17
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
18 You should have received a copy of the GNU General Public License
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
19 along with Octave; see the file COPYING. If not, see
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
20 <http://www.gnu.org/licenses/>.
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
21
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
22 */
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
23
7581
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
24 // Adapted from previous version of dlmread.occ as authored by Kai
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
25 // Habel, but core code has been completely re-written.
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
26
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
27 #ifdef HAVE_CONFIG_H
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
28 #include <config.h>
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
29 #endif
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
30
7581
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
31 #include <cctype>
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
32 #include <fstream>
10804
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
33 #include <limits>
7581
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
34
9512
56e850e3b06f dlmread: perform tilde expansion to filename argument
John W. Eaton <jwe@octave.org>
parents: 9245
diff changeset
35 #include "file-ops.h"
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
36 #include "lo-ieee.h"
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
37
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
38 #include "defun-dld.h"
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
39 #include "error.h"
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
40 #include "oct-obj.h"
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
41 #include "utils.h"
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
42
10804
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
43 static const octave_idx_type idx_max = std::numeric_limits<octave_idx_type>::max ();
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
44
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
45 static bool
10804
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
46 read_cell_spec (std::istream& is, octave_idx_type& row, octave_idx_type& col)
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
47 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
48 bool stat = false;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
49
7581
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
50 if (is.peek () == std::istream::traits_type::eof ())
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
51 stat = true;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
52 else
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
53 {
7581
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
54 if (::isalpha (is.peek ()))
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
55 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
56 col = 0;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
57 while (is && ::isalpha (is.peek ()))
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
58 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
59 char ch = is.get ();
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
60 col *= 26;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
61 if (ch >= 'a')
10718
b8d76f4be94a Fix spreadsheet style range option (bug #30183).
Rik <octave@nomad.inbox5.com>
parents: 10350
diff changeset
62 col += ch - 'a' + 1;
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
63 else
10718
b8d76f4be94a Fix spreadsheet style range option (bug #30183).
Rik <octave@nomad.inbox5.com>
parents: 10350
diff changeset
64 col += ch - 'A' + 1;
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
65 }
10718
b8d76f4be94a Fix spreadsheet style range option (bug #30183).
Rik <octave@nomad.inbox5.com>
parents: 10350
diff changeset
66 col --;
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
67
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
68 if (is)
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
69 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
70 is >> row;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
71 row --;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
72 if (is)
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
73 stat = true;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
74 }
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
75 }
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
76 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
77
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
78 return stat;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
79 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
80
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
81 static bool
7581
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
82 parse_range_spec (const octave_value& range_spec,
10804
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
83 octave_idx_type& rlo, octave_idx_type& clo,
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
84 octave_idx_type& rup, octave_idx_type& cup)
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
85 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
86 bool stat = true;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
87
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
88 if (range_spec.is_string ())
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
89 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
90 std::istringstream is (range_spec.string_value ());
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
91 char ch = is.peek ();
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
92
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
93 if (ch == '.' || ch == ':')
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
94 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
95 rlo = 0;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
96 clo = 0;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
97 ch = is.get ();
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
98 if (ch == '.')
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
99 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
100 ch = is.get ();
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
101 if (ch != '.')
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
102 stat = false;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
103 }
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
104 }
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
105 else
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
106 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
107 stat = read_cell_spec (is, rlo, clo);
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
108
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
109 if (stat)
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
110 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
111 ch = is.peek ();
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
112
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
113 if (ch == '.' || ch == ':')
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
114 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
115 ch = is.get ();
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
116 if (ch == '.')
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
117 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
118 ch = is.get ();
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
119 if (!is || ch != '.')
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
120 stat = false;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
121 }
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
122
10804
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
123 rup = idx_max - 1;
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
124 cup = idx_max - 1;
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
125 }
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
126 else
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
127 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
128 rup = rlo;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
129 cup = clo;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
130 if (!is || !is.eof ())
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
131 stat = false;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
132 }
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
133 }
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
134 }
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
135
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
136 if (stat && is && !is.eof ())
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
137 stat = read_cell_spec (is, rup, cup);
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
138
7581
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
139 if (!is || !is.eof ())
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
140 stat = false;
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
141 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
142 else if (range_spec.is_real_matrix () && range_spec.numel () == 4)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
143 {
7581
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
144 ColumnVector range(range_spec.vector_value ());
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
145 // double --> unsigned int
10804
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
146 rlo = static_cast<octave_idx_type> (range(0));
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
147 clo = static_cast<octave_idx_type> (range(1));
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
148 rup = static_cast<octave_idx_type> (range(2));
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
149 cup = static_cast<octave_idx_type> (range(3));
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
150 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
151 else
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
152 stat = false;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
153
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
154 return stat;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
155 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
156
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
157 DEFUN_DLD (dlmread, args, ,
7581
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
158 "-*- texinfo -*-\n\
10718
b8d76f4be94a Fix spreadsheet style range option (bug #30183).
Rik <octave@nomad.inbox5.com>
parents: 10350
diff changeset
159 @deftypefn {Loadable Function} {@var{data} =} dlmread (@var{file})\n\
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
160 @deftypefnx {Loadable Function} {@var{data} =} dlmread (@var{file}, @var{sep})\n\
7581
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
161 @deftypefnx {Loadable Function} {@var{data} =} dlmread (@var{file}, @var{sep}, @var{r0}, @var{c0})\n\
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
162 @deftypefnx {Loadable Function} {@var{data} =} dlmread (@var{file}, @var{sep}, @var{range})\n\
9039
51dc9691f23f Cleanup documentation files errors.texi, debug.texi, io.texi
Rik <rdrider0-list@yahoo.com>
parents: 8290
diff changeset
163 Read the matrix @var{data} from a text file. If not defined the separator\n\
51dc9691f23f Cleanup documentation files errors.texi, debug.texi, io.texi
Rik <rdrider0-list@yahoo.com>
parents: 8290
diff changeset
164 between fields is determined from the file itself. Otherwise the\n\
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
165 separation character is defined by @var{sep}.\n\
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
166 \n\
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
167 Given two scalar arguments @var{r0} and @var{c0}, these define the starting\n\
9039
51dc9691f23f Cleanup documentation files errors.texi, debug.texi, io.texi
Rik <rdrider0-list@yahoo.com>
parents: 8290
diff changeset
168 row and column of the data to be read. These values are indexed from zero,\n\
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
169 such that the first row corresponds to an index of zero.\n\
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
170 \n\
10718
b8d76f4be94a Fix spreadsheet style range option (bug #30183).
Rik <octave@nomad.inbox5.com>
parents: 10350
diff changeset
171 The @var{range} parameter may be a 4 element vector containing the upper\n\
b8d76f4be94a Fix spreadsheet style range option (bug #30183).
Rik <octave@nomad.inbox5.com>
parents: 10350
diff changeset
172 left and lower right corner @code{[@var{R0},@var{C0},@var{R1},@var{C1}]}\n\
b8d76f4be94a Fix spreadsheet style range option (bug #30183).
Rik <octave@nomad.inbox5.com>
parents: 10350
diff changeset
173 where the lowest index value is zero. Alternatively, a spreadsheet style\n\
b8d76f4be94a Fix spreadsheet style range option (bug #30183).
Rik <octave@nomad.inbox5.com>
parents: 10350
diff changeset
174 range such as 'A2..Q15' or 'T1:AA5' can be used. The lowest alphabetical\n\
b8d76f4be94a Fix spreadsheet style range option (bug #30183).
Rik <octave@nomad.inbox5.com>
parents: 10350
diff changeset
175 index 'A' refers to the first column. The lowest row index is 1.\n\
b8d76f4be94a Fix spreadsheet style range option (bug #30183).
Rik <octave@nomad.inbox5.com>
parents: 10350
diff changeset
176 @seealso{csvread,dlmwrite}\n\
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
177 @end deftypefn")
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
178 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
179 octave_value_list retval;
7581
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
180
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
181 int nargin = args.length ();
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
182
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
183 if (nargin < 1 || nargin > 4)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
184 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
185 print_usage ();
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
186 return retval;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
187 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
188
7581
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
189 if (!args(0).is_string ())
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
190 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
191 error ("dlmread: 1st argument must be a string");
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
192 return retval;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
193 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
194
7581
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
195 std::string fname (args(0).string_value ());
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
196 if (error_state)
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
197 return retval;
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
198
9512
56e850e3b06f dlmread: perform tilde expansion to filename argument
John W. Eaton <jwe@octave.org>
parents: 9245
diff changeset
199 std::string tname = file_ops::tilde_expand (fname);
56e850e3b06f dlmread: perform tilde expansion to filename argument
John W. Eaton <jwe@octave.org>
parents: 9245
diff changeset
200
56e850e3b06f dlmread: perform tilde expansion to filename argument
John W. Eaton <jwe@octave.org>
parents: 9245
diff changeset
201 std::ifstream file (tname.c_str ());
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
202 if (!file)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
203 {
7581
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
204 error ("dlmread: unable to open file `%s'", fname.c_str ());
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
205 return retval;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
206 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
207
7581
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
208 // Set default separator.
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
209 std::string sep;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
210 if (nargin > 1)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
211 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
212 if (args(1).is_sq_string ())
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
213 sep = do_string_escapes (args(1).string_value ());
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
214 else
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
215 sep = args(1).string_value ();
7581
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
216
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
217 if (error_state)
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
218 return retval;
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
219 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
220
7581
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
221 // Take a subset if a range was given.
10804
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
222 octave_idx_type r0 = 0, c0 = 0, r1 = idx_max-1, c1 = idx_max-1;
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
223 if (nargin > 2)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
224 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
225 if (nargin == 3)
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
226 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
227 if (!parse_range_spec (args (2), r0, c0, r1, c1))
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
228 error ("dlmread: error parsing range");
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
229 }
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
230 else if (nargin == 4)
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
231 {
10804
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
232 r0 = args(2).idx_type_value ();
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
233 c0 = args(3).idx_type_value ();
7581
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
234
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
235 if (error_state)
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
236 return retval;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
237 }
10804
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
238
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
239 if (r0 < 0 || c0 < 0)
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
240 error ("dlmread: left & top must not be negative");
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
241 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
242
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
243 if (!error_state)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
244 {
10804
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
245 octave_idx_type i = 0, j = 0, r = 1, c = 1, rmax = 0, cmax = 0;
7581
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
246
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
247 Matrix rdata;
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
248 ComplexMatrix cdata;
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
249
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
250 bool iscmplx = false;
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
251 bool sepflag = false;
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
252
10804
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
253 octave_idx_type maxrows = r1 - r0;
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
254
7581
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
255 std::string line;
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
256
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
257 // Skip the r0 leading lines as these might be a header.
10804
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
258 for (octave_idx_type m = 0; m < r0; m++)
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
259 getline (file, line);
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
260 r1 -= r0;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
261
10804
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
262 std::istringstream tmp_stream;
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
263
7581
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
264 // Read in the data one field at a time, growing the data matrix
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
265 // as needed.
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
266 while (getline (file, line))
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
267 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
268 // Skip blank lines for compatibility.
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
269 if (line.find_first_not_of (" \t") == std::string::npos)
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
270 continue;
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
271
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
272 // To be compatible with matlab, blank separator should
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
273 // correspond to whitespace as delimter.
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
274 if (!sep.length ())
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
275 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
276 size_t n = line.find_first_of (",:; \t",
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
277 line.find_first_of ("0123456789"));
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
278 if (n == std::string::npos)
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
279 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
280 sep = " \t";
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
281 sepflag = true;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
282 }
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
283 else
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
284 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
285 char ch = line.at (n);
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
286
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
287 switch (line.at (n))
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
288 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
289 case ' ':
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
290 case '\t':
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
291 sepflag = true;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
292 sep = " \t";
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
293 break;
7581
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
294
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
295 default:
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
296 sep = ch;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
297 break;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
298 }
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
299 }
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
300 }
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
301
10804
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
302 if (cmax == 0)
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
303 {
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
304 // Try to estimate the number of columns.
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
305 size_t pos1 = 0;
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
306 do
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
307 {
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
308 size_t pos2 = line.find_first_of (sep, pos1);
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
309
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
310 if (sepflag && pos2 != std::string::npos)
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
311 // Treat consecutive separators as one.
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
312 {
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
313 pos2 = line.find_first_not_of (sep, pos2);
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
314 if (pos2 != std::string::npos)
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
315 pos2 -= 1;
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
316 else
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
317 pos2 = line.length () - 1;
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
318 }
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
319
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
320 cmax++;
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
321
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
322 if (pos2 != std::string::npos)
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
323 pos1 = pos2 + 1;
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
324 else
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
325 pos1 = std::string::npos;
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
326
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
327 }
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
328 while (pos1 != std::string::npos);
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
329
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
330 if (iscmplx)
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
331 cdata.resize (rmax, cmax);
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
332 else
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
333 rdata.resize (rmax, cmax);
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
334 }
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
335
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
336 r = (r > i + 1 ? r : i + 1);
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
337 j = 0;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
338 size_t pos1 = 0;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
339 do
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
340 {
10806
7c542263a92a omissions from last two patches
Jaroslav Hajek <highegg@gmail.com>
parents: 10804
diff changeset
341 octave_quit ();
7c542263a92a omissions from last two patches
Jaroslav Hajek <highegg@gmail.com>
parents: 10804
diff changeset
342
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
343 size_t pos2 = line.find_first_of (sep, pos1);
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
344 std::string str = line.substr (pos1, pos2 - pos1);
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
345
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
346 if (sepflag && pos2 != std::string::npos)
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
347 // Treat consecutive separators as one.
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
348 pos2 = line.find_first_not_of (sep, pos2) - 1;
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
349
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
350 c = (c > j + 1 ? c : j + 1);
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
351 if (r > rmax || c > cmax)
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
352 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
353 // Use resize_and_fill for the case of not-equal
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
354 // length rows.
10804
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
355 rmax = 2*r;
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
356 cmax = c;
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
357 if (iscmplx)
10804
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
358 cdata.resize (rmax, cmax);
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
359 else
10804
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
360 rdata.resize (rmax, cmax);
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
361 }
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
362
10804
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
363 tmp_stream.str (str);
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
364 tmp_stream.clear ();
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
365
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
366 double x = octave_read_double (tmp_stream);
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
367 if (tmp_stream)
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
368 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
369 if (tmp_stream.eof ())
10804
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
370 {
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
371 if (iscmplx)
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
372 cdata(i,j++) = x;
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
373 else
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
374 rdata(i,j++) = x;
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
375 }
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
376 else if (std::toupper (tmp_stream.peek ()) == 'I')
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
377 {
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
378 // This is to allow pure imaginary numbers.
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
379 if (iscmplx)
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
380 cdata(i,j++) = x;
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
381 else
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
382 rdata(i,j++) = x;
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
383 }
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
384 else
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
385 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
386 double y = octave_read_double (tmp_stream);
7581
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
387
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
388 if (!iscmplx && y != 0.)
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
389 {
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
390 iscmplx = true;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
391 cdata = ComplexMatrix (rdata);
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
392 }
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
393
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
394 if (iscmplx)
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
395 cdata(i,j++) = Complex (x, y);
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
396 else
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
397 rdata(i,j++) = x;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
398 }
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
399 }
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
400 else if (iscmplx)
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
401 cdata(i,j++) = 0.;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
402 else
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
403 rdata(i,j++) = 0.;
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
404
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
405 if (pos2 != std::string::npos)
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
406 pos1 = pos2 + 1;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
407 else
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
408 pos1 = std::string::npos;
7581
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
409
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
410 }
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
411 while (pos1 != std::string::npos);
7581
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
412
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
413 if (nargin == 3 && i == maxrows)
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
414 break;
7581
e0d7bb35a3ec style fixes
John W. Eaton <jwe@octave.org>
parents: 7580
diff changeset
415
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
416 i++;
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
417 }
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
418
10804
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
419 if (r1 >= r)
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
420 r1 = r - 1;
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
421 if (c1 >= c)
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
422 c1 = c - 1;
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
423
10804
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
424 // Now take the subset of the matrix.
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
425 if (iscmplx)
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
426 cdata = cdata.extract (0, c0, r1, c1);
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
427 else
3d5c6b84ddaf speed-up fixes to dlmread
Jaroslav Hajek <highegg@gmail.com>
parents: 10718
diff changeset
428 rdata = rdata.extract (0, c0, r1, c1);
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
429
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
430 if (iscmplx)
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
431 retval(0) = cdata;
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
432 else
10154
40dfc0c99116 DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents: 9512
diff changeset
433 retval(0) = rdata;
7580
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
434 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
435
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
436 return retval;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
437 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
438
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
439 /*
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
440
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
441 %!shared file
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
442 %! file = tmpnam ();
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
443 %! fid = fopen (file, "wt");
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
444 %! fwrite (fid, "1, 2, 3\n4, 5, 6\n7, 8, 9\n10, 11, 12");
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
445 %! fclose (fid);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
446
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
447 %!assert (dlmread (file), [1, 2, 3; 4, 5, 6; 7, 8, 9;10, 11, 12]);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
448 %!assert (dlmread (file, ","), [1, 2, 3; 4, 5, 6; 7, 8, 9; 10, 11, 12]);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
449 %!assert (dlmread (file, ",", [1, 0, 2, 1]), [4, 5; 7, 8]);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
450 %!assert (dlmread (file, ",", "B1..C2"), [2, 3; 5, 6]);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
451 %!assert (dlmread (file, ",", "B1:C2"), [2, 3; 5, 6]);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
452 %!assert (dlmread (file, ",", "..C2"), [1, 2, 3; 4, 5, 6]);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
453 %!assert (dlmread (file, ",", 0, 1), [2, 3; 5, 6; 8, 9; 11, 12]);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
454 %!assert (dlmread (file, ",", "B1.."), [2, 3; 5, 6; 8, 9; 11, 12]);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
455 %!error (dlmread (file, ",", [0 1]))
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
456
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
457 %!test
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
458 %! unlink (file);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
459
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
460 %!shared file
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
461 %! file = tmpnam ();
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
462 %! fid = fopen (file, "wt");
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
463 %! fwrite (fid, "1, 2, 3\n4+4i, 5, 6\n7, 8, 9\n10, 11, 12");
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
464 %! fclose (fid);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
465
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
466 %!assert (dlmread (file), [1, 2, 3; 4 + 4i, 5, 6; 7, 8, 9; 10, 11, 12]);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
467 %!assert (dlmread (file, ","), [1, 2, 3; 4 + 4i, 5, 6; 7, 8, 9; 10, 11, 12]);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
468 %!assert (dlmread (file, ",", [1, 0, 2, 1]), [4 + 4i, 5; 7, 8]);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
469 %!assert (dlmread (file, ",", "A2..B3"), [4 + 4i, 5; 7, 8]);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
470 %!assert (dlmread (file, ",", "A2:B3"), [4 + 4i, 5; 7, 8]);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
471 %!assert (dlmread (file, ",", "..B3"), [1, 2; 4 + 4i, 5; 7, 8]);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
472 %!assert (dlmread (file, ",", 1, 0), [4 + 4i, 5, 6; 7, 8, 9; 10, 11, 12]);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
473 %!assert (dlmread (file, ",", "A2.."), [4 + 4i, 5, 6; 7, 8, 9; 10, 11, 12]);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
474 %!error (dlmread (file, ",", [0 1]))
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
475
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
476 %!test
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
477 %! unlink (file);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
478
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge
David Bateman <dbateman@free.fr>
parents:
diff changeset
479 */