octave: libinterp/corefcn/dlmread.cc annotate

annotate libinterp/corefcn/dlmread.cc @ 19278:6ca096827123

Use tempname() rather than tmpnam() in core Octave. * scripts/miscellaneous/tempname.m: Removed m-file as function is now C++. * scripts/miscellaneous/tmpnam.m: New m-file is an alias that calls tempname. * scripts/miscellaneous/module.mk: Add tmpnam.m to build system. * io.txi: Place tempname, tempdir, P_tmpdir docstrings in section on temporary files. * system.txi: Remove tempname, tempdir, P_tmpdir docstrings from generic system functions section of manual. * dirfns.cc, dlmread.cc, md5sum.cc, ov-fcn-handle.cc: Replace instances of tmpnam with tempname in BIST code. * file-io.cc (Ftempname): Change DEFUNX for tmpnam to DEFUN for tempname. Remove seealso links to tmpnam. * ftp.m, playaudio.m, wavwrite.m, imformats.m, imread.m, imwrite.m, imageIO.m, csvwrite.m, dlmwrite.m, fileread.m, importdata.m, textread.m, textscan.m, genvarname.m, unpack.m, install.m, legend.m, __gnuplot_drawnow__.m, copyobj.m, hgsave.m, print.m, __ghostscript__.m, __gnuplot_get_var__.m, __gnuplot_ginput__.m, __gnuplot_print__.m: Replace tmpnam with tempname in core code. * build-sparse-tests.sh, io.tst, prefer.tst, system.tst: Replace tmpnam with tempname in test code.

author	Rik <rik@octave.org>
date	Wed, 22 Oct 2014 10:41:15 -0700
parents	b560bac0fca2
children	4197fc428c7d

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
17744 d63878346099 maint: Update copyright notices for release. John W. Eaton <jwe@octave.org> parents: 17281 diff changeset	3 Copyright (C) 2008-2013 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
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14501 diff changeset	38 #include "defun.h"
10927 a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	39 #include "oct-stream.h"
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	40 #include "error.h"
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	41 #include "oct-obj.h"
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	42 #include "utils.h"
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	43
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	44 static const octave_idx_type idx_max =
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	45 std::numeric_limits<octave_idx_type>::max ();
10804 3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	46
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	47 static bool
10804 3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	48 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	49 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	50 bool stat = false;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	51
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	52 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	53 stat = true;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	54 else
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	55 {
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	56 if (::isalpha (is.peek ()))
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	57 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	58 col = 0;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	59 while (is && ::isalpha (is.peek ()))
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	60 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	61 char ch = is.get ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	62 col *= 26;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	63 if (ch >= 'a')
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 else
10718 b8d76f4be94a Fix spreadsheet style range option (bug #30183). Rik <octave@nomad.inbox5.com> parents: 10350 diff changeset	66 col += ch - 'A' + 1;
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	67 }
10718 b8d76f4be94a Fix spreadsheet style range option (bug #30183). Rik <octave@nomad.inbox5.com> parents: 10350 diff changeset	68 col --;
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	69
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	70 if (is)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	71 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	72 is >> row;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	73 row --;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	74 if (is)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	75 stat = true;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	76 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	77 }
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	78 }
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 return stat;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	81 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	82
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	83 static bool
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	84 parse_range_spec (const octave_value& range_spec,
10804 3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	85 octave_idx_type& rlo, octave_idx_type& clo,
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	86 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	87 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	88 bool stat = true;
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 if (range_spec.is_string ())
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	91 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	92 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	93 char ch = is.peek ();
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	94
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	95 if (ch == '.' \|\| ch == ':')
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	96 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	97 rlo = 0;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	98 clo = 0;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	99 ch = is.get ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	100 if (ch == '.')
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	101 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	102 ch = is.get ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	103 if (ch != '.')
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	104 stat = false;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	105 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	106 }
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	107 else
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	108 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	109 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	110
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	111 if (stat)
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 ch = is.peek ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	114
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	115 if (ch == '.' \|\| ch == ':')
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	116 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	117 ch = is.get ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	118 if (ch == '.')
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	119 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	120 ch = is.get ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	121 if (!is \|\| ch != '.')
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	122 stat = false;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	123 }
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	124
10804 3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	125 rup = idx_max - 1;
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	126 cup = idx_max - 1;
10154 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 else
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	129 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	130 rup = rlo;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	131 cup = clo;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	132 if (!is \|\| !is.eof ())
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	133 stat = false;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	134 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	135 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	136 }
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	137
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	138 if (stat && is && !is.eof ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	139 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	140
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	141 if (!is \|\| !is.eof ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	142 stat = false;
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	143 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	144 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	145 {
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	146 ColumnVector range(range_spec.vector_value ());
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	147 // double --> unsigned int
10804 3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	148 rlo = static_cast<octave_idx_type> (range(0));
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	149 clo = static_cast<octave_idx_type> (range(1));
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	150 rup = static_cast<octave_idx_type> (range(2));
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	151 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	152 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	153 else
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	154 stat = false;
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 return stat;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	157 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	158
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14501 diff changeset	159 DEFUN (dlmread, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	160 "-- texinfo --\n\
15039 e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14501 diff changeset	161 @deftypefn {Built-in Function} {@var{data} =} dlmread (@var{file})\n\
e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14501 diff changeset	162 @deftypefnx {Built-in Function} {@var{data} =} dlmread (@var{file}, @var{sep})\n\
e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14501 diff changeset	163 @deftypefnx {Built-in Function} {@var{data} =} dlmread (@var{file}, @var{sep}, @var{r0}, @var{c0})\n\
e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14501 diff changeset	164 @deftypefnx {Built-in Function} {@var{data} =} dlmread (@var{file}, @var{sep}, @var{range})\n\
e753177cde93 maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory Rik <rik@octave.org> parents: 14501 diff changeset	165 @deftypefnx {Built-in Function} {@var{data} =} dlmread (@dots{}, \"emptyvalue\", @var{EMPTYVAL})\n\
9039 51dc9691f23f Cleanup documentation files errors.texi, debug.texi, io.texi Rik <rdrider0-list@yahoo.com> parents: 8290 diff changeset	166 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	167 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	168 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	169 \n\
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	170 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	171 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	172 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	173 \n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	174 The @var{range} parameter may be a 4-element vector containing the upper\n\
10718 b8d76f4be94a Fix spreadsheet style range option (bug #30183). Rik <octave@nomad.inbox5.com> parents: 10350 diff changeset	175 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	176 where the lowest index value is zero. Alternatively, a spreadsheet style\n\
17281 bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 15467 diff changeset	177 range such as @qcode{\"A2..Q15\"} or @qcode{\"T1:AA5\"} can be used. The\n\
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 15467 diff changeset	178 lowest alphabetical index @qcode{'A'} refers to the first column. The\n\
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 15467 diff changeset	179 lowest row index is 1.\n\
10927 a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	180 \n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	181 @var{file} should be a file name or file id given by @code{fopen}. In the\n\
10927 a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	182 latter case, the file is read until end of file is reached.\n\
10935 3cb4889dd6f7 support specific empty value in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10927 diff changeset	183 \n\
17281 bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 15467 diff changeset	184 The @qcode{\"emptyvalue\"} option may be used to specify the value used to\n\
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 15467 diff changeset	185 fill empty fields. The default is zero.\n\
11572 7d6d8c1e471f Grammarcheck Texinfo for files in src directory. Rik <octave@nomad.inbox5.com> parents: 11553 diff changeset	186 @seealso{csvread, textscan, textread, dlmwrite}\n\
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	187 @end deftypefn")
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	188 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	189 octave_value_list retval;
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	190
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	191 int nargin = args.length ();
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	192
10935 3cb4889dd6f7 support specific empty value in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10927 diff changeset	193 double empty_value = 0.0;
3cb4889dd6f7 support specific empty value in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10927 diff changeset	194
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	195 if (nargin > 2 && args(nargin-2).is_string ()
10935 3cb4889dd6f7 support specific empty value in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10927 diff changeset	196 && args(nargin-2).string_value () == "emptyvalue")
3cb4889dd6f7 support specific empty value in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10927 diff changeset	197 {
3cb4889dd6f7 support specific empty value in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10927 diff changeset	198 empty_value = args(nargin-1).double_value ();
3cb4889dd6f7 support specific empty value in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10927 diff changeset	199 if (error_state)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	200 return retval;
10935 3cb4889dd6f7 support specific empty value in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10927 diff changeset	201 nargin -= 2;
3cb4889dd6f7 support specific empty value in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10927 diff changeset	202 }
3cb4889dd6f7 support specific empty value in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10927 diff changeset	203
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	204 if (nargin < 1 \|\| nargin > 4)
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	205 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	206 print_usage ();
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	207 return retval;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	208 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	209
10927 a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	210 std::istream *input = 0;
11389 934ed3e07542 dlmread: simplify file name/id logic John W. Eaton <jwe@octave.org> parents: 10935 diff changeset	211 std::ifstream input_file;
10927 a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	212
a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	213 if (args(0).is_string ())
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	214 {
10927 a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	215 // File name.
a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	216 std::string fname (args(0).string_value ());
a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	217 if (error_state)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	218 return retval;
10927 a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	219
a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	220 std::string tname = file_ops::tilde_expand (fname);
a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	221
11389 934ed3e07542 dlmread: simplify file name/id logic John W. Eaton <jwe@octave.org> parents: 10935 diff changeset	222 input_file.open (tname.c_str (), std::ios::in);
934ed3e07542 dlmread: simplify file name/id logic John W. Eaton <jwe@octave.org> parents: 10935 diff changeset	223
934ed3e07542 dlmread: simplify file name/id logic John W. Eaton <jwe@octave.org> parents: 10935 diff changeset	224 if (! input_file)
10927 a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	225 {
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	226 error ("dlmread: unable to open file '%s'", fname.c_str ());
10927 a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	227 return retval;
a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	228 }
a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	229 else
11389 934ed3e07542 dlmread: simplify file name/id logic John W. Eaton <jwe@octave.org> parents: 10935 diff changeset	230 input = &input_file;
10927 a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	231 }
a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	232 else if (args(0).is_scalar_type ())
a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	233 {
11389 934ed3e07542 dlmread: simplify file name/id logic John W. Eaton <jwe@octave.org> parents: 10935 diff changeset	234 octave_stream is = octave_stream_list::lookup (args(0), "dlmread");
934ed3e07542 dlmread: simplify file name/id logic John W. Eaton <jwe@octave.org> parents: 10935 diff changeset	235
10927 a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	236 if (error_state)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	237 return retval;
10927 a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	238
11389 934ed3e07542 dlmread: simplify file name/id logic John W. Eaton <jwe@octave.org> parents: 10935 diff changeset	239 input = is.input_stream ();
934ed3e07542 dlmread: simplify file name/id logic John W. Eaton <jwe@octave.org> parents: 10935 diff changeset	240
10927 a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	241 if (! input)
a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	242 {
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	243 error ("dlmread: stream FILE not open for input");
10927 a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	244 return retval;
a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	245 }
a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	246 }
a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	247 else
a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	248 {
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	249 error ("dlmread: FILE argument must be a string or file id");
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	250 return retval;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	251 }
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	252
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	253 // Set default separator.
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	254 std::string sep;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	255 if (nargin > 1)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	256 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	257 if (args(1).is_sq_string ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	258 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	259 else
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	260 sep = args(1).string_value ();
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	261
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	262 if (error_state)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	263 return retval;
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	264 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	265
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	266 // Take a subset if a range was given.
18100 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	267 octave_idx_type r0 = 0;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	268 octave_idx_type c0 = 0;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	269 octave_idx_type r1 = idx_max-1;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	270 octave_idx_type c1 = idx_max-1;
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	271 if (nargin > 2)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	272 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	273 if (nargin == 3)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	274 {
18112 b560bac0fca2 maint: Don't use space between 'args' and '(' when doing indexing. Rik <rik@octave.org> parents: 18100 diff changeset	275 if (!parse_range_spec (args(2), r0, c0, r1, c1))
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	276 error ("dlmread: error parsing RANGE");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	277 }
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	278 else if (nargin == 4)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	279 {
10804 3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	280 r0 = args(2).idx_type_value ();
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	281 c0 = args(3).idx_type_value ();
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	282
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	283 if (error_state)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	284 return retval;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	285 }
10804 3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	286
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	287 if (r0 < 0 \|\| c0 < 0)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11523 diff changeset	288 error ("dlmread: left & top must be positive");
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	289 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	290
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	291 if (!error_state)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	292 {
18100 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	293 octave_idx_type i = 0;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	294 octave_idx_type j = 0;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	295 octave_idx_type r = 1;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	296 octave_idx_type c = 1;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	297 octave_idx_type rmax = 0;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17787 diff changeset	298 octave_idx_type cmax = 0;
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	299
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	300 Matrix rdata;
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	301 ComplexMatrix cdata;
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	302
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	303 bool iscmplx = false;
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	304 bool sepflag = false;
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	305
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	306 std::string line;
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	307
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	308 // 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	309 for (octave_idx_type m = 0; m < r0; m++)
10927 a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	310 getline (*input, line);
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	311 r1 -= r0;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	312
10804 3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	313 std::istringstream tmp_stream;
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	314
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	315 // 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	316 // as needed.
10927 a9e9659e1dca support file IDs in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10806 diff changeset	317 while (getline (*input, line))
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	318 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	319 // Skip blank lines for compatibility.
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	320 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	321 continue;
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	322
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	323 // To be compatible with matlab, blank separator should
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	324 // correspond to whitespace as delimter.
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	325 if (!sep.length ())
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	326 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	327 size_t n = line.find_first_of (",:; \t",
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	328 line.find_first_of ("0123456789"));
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	329 if (n == std::string::npos)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	330 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	331 sep = " \t";
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	332 sepflag = true;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	333 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	334 else
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	335 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	336 char ch = line.at (n);
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	337
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	338 switch (line.at (n))
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	339 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	340 case ' ':
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	341 case '\t':
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	342 sepflag = true;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	343 sep = " \t";
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	344 break;
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	345
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	346 default:
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	347 sep = ch;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	348 break;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	349 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	350 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	351 }
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	352
10804 3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	353 if (cmax == 0)
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	354 {
12182 99b00a9a5147 dlmread: skip leading whitespace on each line John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	355 // Try to estimate the number of columns. Skip leading
99b00a9a5147 dlmread: skip leading whitespace on each line John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	356 // whitespace.
99b00a9a5147 dlmread: skip leading whitespace on each line John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	357 size_t pos1 = line.find_first_not_of (" \t");
10804 3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	358 do
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	359 {
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	360 size_t pos2 = line.find_first_of (sep, pos1);
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	361
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	362 if (sepflag && pos2 != std::string::npos)
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	363 // Treat consecutive separators as one.
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	364 {
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	365 pos2 = line.find_first_not_of (sep, pos2);
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	366 if (pos2 != std::string::npos)
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	367 pos2 -= 1;
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	368 else
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	369 pos2 = line.length () - 1;
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
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	372 cmax++;
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	373
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	374 if (pos2 != std::string::npos)
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	375 pos1 = pos2 + 1;
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	376 else
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	377 pos1 = std::string::npos;
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	378
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	379 }
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	380 while (pos1 != std::string::npos);
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	381
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	382 if (iscmplx)
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	383 cdata.resize (rmax, cmax);
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	384 else
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	385 rdata.resize (rmax, cmax);
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	386 }
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	387
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	388 r = (r > i + 1 ? r : i + 1);
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	389 j = 0;
12182 99b00a9a5147 dlmread: skip leading whitespace on each line John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	390 // Skip leading whitespace.
99b00a9a5147 dlmread: skip leading whitespace on each line John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	391 size_t pos1 = line.find_first_not_of (" \t");
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	392 do
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	393 {
10806 7c542263a92a omissions from last two patches Jaroslav Hajek <highegg@gmail.com> parents: 10804 diff changeset	394 octave_quit ();
7c542263a92a omissions from last two patches Jaroslav Hajek <highegg@gmail.com> parents: 10804 diff changeset	395
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	396 size_t pos2 = line.find_first_of (sep, pos1);
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	397 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	398
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	399 if (sepflag && pos2 != std::string::npos)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	400 // Treat consecutive separators as one.
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	401 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	402
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	403 c = (c > j + 1 ? c : j + 1);
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	404 if (r > rmax \|\| c > cmax)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	405 {
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	406 // 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	407 // length rows.
10804 3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	408 rmax = 2*r;
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	409 cmax = c;
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	410 if (iscmplx)
10804 3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	411 cdata.resize (rmax, cmax);
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	412 else
10804 3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	413 rdata.resize (rmax, cmax);
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	414 }
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	415
10804 3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	416 tmp_stream.str (str);
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	417 tmp_stream.clear ();
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	418
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	419 double x = octave_read_double (tmp_stream);
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	420 if (tmp_stream)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	421 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	422 if (tmp_stream.eof ())
10804 3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	423 {
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	424 if (iscmplx)
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	425 cdata(i,j++) = x;
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	426 else
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	427 rdata(i,j++) = x;
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	428 }
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	429 else if (std::toupper (tmp_stream.peek ()) == 'I')
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	430 {
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	431 // This is to allow pure imaginary numbers.
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	432 if (iscmplx)
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	433 cdata(i,j++) = x;
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	434 else
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	435 rdata(i,j++) = x;
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	436 }
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	437 else
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	438 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	439 double y = octave_read_double (tmp_stream);
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	440
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	441 if (!iscmplx && y != 0.)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	442 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	443 iscmplx = true;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	444 cdata = ComplexMatrix (rdata);
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	445 }
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	446
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	447 if (iscmplx)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	448 cdata(i,j++) = Complex (x, y);
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	449 else
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	450 rdata(i,j++) = x;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	451 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	452 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	453 else if (iscmplx)
10935 3cb4889dd6f7 support specific empty value in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10927 diff changeset	454 cdata(i,j++) = empty_value;
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	455 else
10935 3cb4889dd6f7 support specific empty value in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10927 diff changeset	456 rdata(i,j++) = empty_value;
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	457
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	458 if (pos2 != std::string::npos)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	459 pos1 = pos2 + 1;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	460 else
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	461 pos1 = std::string::npos;
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	462
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	463 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	464 while (pos1 != std::string::npos);
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	465
10935 3cb4889dd6f7 support specific empty value in dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10927 diff changeset	466 if (i == r1)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	467 break;
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	468
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	469 i++;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	470 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	471
10804 3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	472 if (r1 >= r)
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	473 r1 = r - 1;
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	474 if (c1 >= c)
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	475 c1 = c - 1;
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	476
10804 3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	477 // Now take the subset of the matrix.
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	478 if (iscmplx)
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	479 cdata = cdata.extract (0, c0, r1, c1);
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	480 else
3d5c6b84ddaf speed-up fixes to dlmread Jaroslav Hajek <highegg@gmail.com> parents: 10718 diff changeset	481 rdata = rdata.extract (0, c0, r1, c1);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11572 diff changeset	482
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	483 if (iscmplx)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	484 retval(0) = cdata;
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	485 else
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 9512 diff changeset	486 retval(0) = rdata;
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	487 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	488
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	489 return retval;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	490 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	491
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	492 /*
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	493 %!shared file
19278 6ca096827123 Use tempname() rather than tmpnam() in core Octave. Rik <rik@octave.org> parents: 18112 diff changeset	494 %! file = tempname ();
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	495 %! fid = fopen (file, "wt");
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	496 %! 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	497 %! fclose (fid);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	498
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	499 %!assert (dlmread (file), [1, 2, 3; 4, 5, 6; 7, 8, 9;10, 11, 12])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	500 %!assert (dlmread (file, ","), [1, 2, 3; 4, 5, 6; 7, 8, 9; 10, 11, 12])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	501 %!assert (dlmread (file, ",", [1, 0, 2, 1]), [4, 5; 7, 8])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	502 %!assert (dlmread (file, ",", "B1..C2"), [2, 3; 5, 6])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	503 %!assert (dlmread (file, ",", "B1:C2"), [2, 3; 5, 6])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	504 %!assert (dlmread (file, ",", "..C2"), [1, 2, 3; 4, 5, 6])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	505 %!assert (dlmread (file, ",", 0, 1), [2, 3; 5, 6; 8, 9; 11, 12])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	506 %!assert (dlmread (file, ",", "B1.."), [2, 3; 5, 6; 8, 9; 11, 12])
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	507 %!error (dlmread (file, ",", [0 1]))
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	508
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	509 %!test
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	510 %! unlink (file);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	511
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	512 %!shared file
19278 6ca096827123 Use tempname() rather than tmpnam() in core Octave. Rik <rik@octave.org> parents: 18112 diff changeset	513 %! file = tempname ();
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	514 %! fid = fopen (file, "wt");
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	515 %! 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	516 %! fclose (fid);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	517
14501 60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	518 %!assert (dlmread (file), [1, 2, 3; 4 + 4i, 5, 6; 7, 8, 9; 10, 11, 12])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	519 %!assert (dlmread (file, ","), [1, 2, 3; 4 + 4i, 5, 6; 7, 8, 9; 10, 11, 12])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	520 %!assert (dlmread (file, ",", [1, 0, 2, 1]), [4 + 4i, 5; 7, 8])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	521 %!assert (dlmread (file, ",", "A2..B3"), [4 + 4i, 5; 7, 8])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	522 %!assert (dlmread (file, ",", "A2:B3"), [4 + 4i, 5; 7, 8])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	523 %!assert (dlmread (file, ",", "..B3"), [1, 2; 4 + 4i, 5; 7, 8])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	524 %!assert (dlmread (file, ",", 1, 0), [4 + 4i, 5, 6; 7, 8, 9; 10, 11, 12])
60e5cf354d80 Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14361 diff changeset	525 %!assert (dlmread (file, ",", "A2.."), [4 + 4i, 5, 6; 7, 8, 9; 10, 11, 12])
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	526 %!error (dlmread (file, ",", [0 1]))
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	527
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	528 %!test
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	529 %! unlink (file);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	530 */

Mercurial > octave

annotate libinterp/corefcn/dlmread.cc @ 19278:6ca096827123