octave: src/DLD-FUNCTIONS/dlmread.cc annotate

annotate src/DLD-FUNCTIONS/dlmread.cc @ 9245:16f53d29049f

update copyright notices

author	John W. Eaton <jwe@octave.org>
date	Fri, 22 May 2009 10:46:00 -0400
parents	7c02ec148a3c
children	56e850e3b06f

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
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	4
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	5 This file is part of Octave.
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	6
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	7 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	8 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	9 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	10 option) any later version.
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	11
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	12 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	13 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	14 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	15 for more details.
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	16
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	17 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	18 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	19 <http://www.gnu.org/licenses/>.
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	20
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
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	23 // Adapted from previous version of dlmread.occ as authored by Kai
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	24 // 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	25
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	26 #ifdef HAVE_CONFIG_H
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	27 #include <config.h>
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	28 #endif
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	29
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	30 #include <cctype>
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	31 #include <fstream>
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	32
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	33 #include "lo-ieee.h"
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	34
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	35 #include "defun-dld.h"
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	36 #include "error.h"
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	37 #include "oct-obj.h"
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	38 #include "utils.h"
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	39
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	40 static bool
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	41 read_cell_spec (std::istream& is, unsigned long& row, unsigned long& col)
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	42 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	43 bool stat = false;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	44
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	45 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	46 stat = true;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	47 else
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	48 {
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	49 if (::isalpha (is.peek ()))
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	50 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	51 col = 0;
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	52 while (is && ::isalpha (is.peek ()))
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	53 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	54 char ch = is.get ();
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	55 col *= 26;
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	56 if (ch >= 'a')
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	57 col += ch - 'a';
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	58 else
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	59 col += ch - 'A';
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	60 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	61
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	62 if (is)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	63 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	64 is >> row;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	65 row --;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	66 if (is)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	67 stat = true;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	68 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	69 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	70 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	71
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	72 return stat;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	73 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	74
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	75 static bool
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	76 parse_range_spec (const octave_value& range_spec,
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	77 unsigned long& rlo, unsigned long& clo,
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	78 unsigned long& rup, unsigned long& cup)
7580 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 bool stat = true;
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 if (range_spec.is_string ())
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	83 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	84 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	85 char ch = is.peek ();
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	86
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	87 if (ch == '.' \|\| ch == ':')
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	88 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	89 rlo = 0;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	90 clo = 0;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	91 ch = is.get ();
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	92 if (ch == '.')
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	93 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	94 ch = is.get ();
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	95 if (ch != '.')
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	96 stat = false;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	97 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	98 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	99 else
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	100 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	101 stat = read_cell_spec (is, rlo, clo);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	102
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	103 if (stat)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	104 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	105 ch = is.peek ();
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	106
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	107 if (ch == '.' \|\| ch == ':')
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	108 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	109 ch = is.get ();
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	110 if (ch == '.')
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	111 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	112 ch = is.get ();
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	113 if (!is \|\| ch != '.')
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	114 stat = false;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	115 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	116
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	117 rup = ULONG_MAX - 1;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	118 cup = ULONG_MAX - 1;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	119 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	120 else
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	121 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	122 rup = rlo;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	123 cup = clo;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	124 if (!is \|\| !is.eof ())
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	125 stat = false;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	126 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	127 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	128 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	129
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	130 if (stat && is && !is.eof ())
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	131 stat = read_cell_spec (is, rup, cup);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	132
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	133 if (!is \|\| !is.eof ())
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	134 stat = false;
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 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	137 {
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	138 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	139 // double --> unsigned int
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	140 rlo = static_cast<unsigned long> (range(0));
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	141 clo = static_cast<unsigned long> (range(1));
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	142 rup = static_cast<unsigned long> (range(2));
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	143 cup = static_cast<unsigned long> (range(3));
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	144 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	145 else
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	146 stat = false;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	147
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	148 return stat;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	149 }
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 DEFUN_DLD (dlmread, args, ,
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	152 "-- texinfo --\n\
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	153 @deftypefn {Loadable Function} {@var{data} =} dlmread (@var{file})\n\
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	154 @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	155 @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	156 @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	157 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	158 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	159 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	160 \n\
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	161 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	162 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	163 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	164 \n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 9039 diff changeset	165 The @var{range} parameter must be a 4 element vector containing the upper\n\
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	166 left and lower right corner @code{[@var{R0},@var{C0},@var{R1},@var{C1}]} or\n\
9039 51dc9691f23f Cleanup documentation files errors.texi, debug.texi, io.texi Rik <rdrider0-list@yahoo.com> parents: 8290 diff changeset	167 a spreadsheet style range such as 'A2..Q15'. The lowest index value is zero.\n\
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	168 @end deftypefn")
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	169 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	170 octave_value_list retval;
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	171
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	172 int nargin = args.length ();
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	173
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	174 if (nargin < 1 \|\| nargin > 4)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	175 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	176 print_usage ();
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	177 return retval;
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
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	180 if (!args(0).is_string ())
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	181 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	182 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	183 return retval;
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
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	186 std::string fname (args(0).string_value ());
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	187 if (error_state)
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	188 return retval;
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	189
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	190 std::ifstream file (fname.c_str ());
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	191 if (!file)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	192 {
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	193 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	194 return retval;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	195 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	196
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	197 // Set default separator.
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	198 std::string sep;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	199 if (nargin > 1)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	200 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	201 if (args(1).is_sq_string ())
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	202 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	203 else
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	204 sep = args(1).string_value ();
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	205
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	206 if (error_state)
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	207 return retval;
7580 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
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	210 // Take a subset if a range was given.
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	211 unsigned long r0 = 0, c0 = 0, r1 = ULONG_MAX-1, c1 = ULONG_MAX-1;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	212 if (nargin > 2)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	213 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	214 if (nargin == 3)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	215 {
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	216 if (!parse_range_spec (args (2), r0, c0, r1, c1))
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	217 error ("dlmread: error parsing range");
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	218 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	219 else if (nargin == 4)
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 r0 = args(2).ulong_value ();
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	222 c0 = args(3).ulong_value ();
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	223
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	224 if (error_state)
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	225 return retval;
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	226 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	227 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	228
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	229 if (!error_state)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	230 {
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	231 unsigned long i = 0, j = 0, r = 1, c = 1, rmax = 0, cmax = 0;
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	232
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	233 Matrix rdata;
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	234 ComplexMatrix cdata;
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	235
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	236 bool iscmplx = false;
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	237 bool sepflag = false;
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	238
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	239 unsigned long maxrows = r1 - r0;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	240
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	241 std::string line;
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	242
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	243 // Skip the r0 leading lines as these might be a header.
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	244 for (unsigned long m = 0; m < r0; m++)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	245 getline (file, line);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	246 r1 -= r0;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	247
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	248 // 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	249 // as needed.
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	250 while (getline (file, line))
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 // Skip blank lines for compatibility.
8021 85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	253 if (line.find_first_not_of (" \t") == std::string::npos)
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	254 continue;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	255
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	256 // To be compatible with matlab, blank separator should
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	257 // correspond to whitespace as delimter.
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	258 if (!sep.length ())
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	259 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	260 size_t n = line.find_first_of (",:; \t",
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	261 line.find_first_of ("0123456789"));
8021 85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	262 if (n == std::string::npos)
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	263 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	264 sep = " \t";
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	265 sepflag = true;
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	266 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	267 else
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	268 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	269 char ch = line.at (n);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	270
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	271 switch (line.at (n))
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 case ' ':
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	274 case '\t':
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	275 sepflag = true;
7584 a5307fa238ac Trivial dlmread fix David Bateman <dbateman@free.fr> parents: 7581 diff changeset	276 sep = " \t";
a5307fa238ac Trivial dlmread fix David Bateman <dbateman@free.fr> parents: 7581 diff changeset	277 break;
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	278
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	279 default:
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	280 sep = ch;
7584 a5307fa238ac Trivial dlmread fix David Bateman <dbateman@free.fr> parents: 7581 diff changeset	281 break;
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	282 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	283 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	284 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	285
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	286 r = (r > i + 1 ? r : i + 1);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	287 j = 0;
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	288 size_t pos1 = 0;
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	289 do
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	290 {
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	291 size_t pos2 = line.find_first_of (sep, pos1);
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	292 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	293
8021 85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	294 if (sepflag && pos2 != std::string::npos)
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	295 // Treat consecutive separators as one.
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	296 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	297
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	298 c = (c > j + 1 ? c : j + 1);
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	299 if (r > rmax \|\| c > cmax)
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	300 {
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	301 // Use resize_and_fill for the case of not-equal
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	302 // length rows.
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	303 if (iscmplx)
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8021 diff changeset	304 cdata.resize_fill (r, c, 0);
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	305 else
8290 7cbe01c21986 improve dense array indexing Jaroslav Hajek <highegg@gmail.com> parents: 8021 diff changeset	306 rdata.resize_fill (r, c, 0);
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	307 rmax = r;
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	308 cmax = c;
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	309 }
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	310
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	311 std::istringstream tmp_stream (str);
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	312 double x = octave_read_double (tmp_stream);
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	313 if (tmp_stream)
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	314 {
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	315 if (tmp_stream.eof ())
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	316 if (iscmplx)
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	317 cdata(i,j++) = x;
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	318 else
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	319 rdata(i,j++) = x;
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	320 else
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	321 {
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	322 double y = octave_read_double (tmp_stream);
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	323
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	324 if (!iscmplx && y != 0.)
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	325 {
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	326 iscmplx = true;
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	327 cdata = ComplexMatrix (rdata);
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	328 }
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	329
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	330 if (iscmplx)
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	331 cdata(i,j++) = Complex (x, y);
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	332 else
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	333 rdata(i,j++) = x;
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	334 }
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	335 }
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	336 else if (iscmplx)
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	337 cdata(i,j++) = 0.;
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	338 else
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	339 rdata(i,j++) = 0.;
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	340
8021 85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	341 if (pos2 != std::string::npos)
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	342 pos1 = pos2 + 1;
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	343 else
8021 85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	344 pos1 = std::string::npos;
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	345
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	346 }
8021 85184151822e fix typo in NPOS change John W. Eaton <jwe@octave.org> parents: 8019 diff changeset	347 while (pos1 != std::string::npos);
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	348
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	349 if (nargin == 3 && i == maxrows)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	350 break;
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	351
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	352 i++;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	353 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	354
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	355 if (nargin > 2)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	356 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	357 if (nargin == 3)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	358 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	359 if (r1 >= r)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	360 r1 = r - 1;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	361 if (c1 >= c)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	362 c1 = c - 1;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	363 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	364 else if (nargin == 4)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	365 {
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	366 // If r1 and c1 are not given, use what was found to be
e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	367 // the maximum.
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	368 r1 = r - 1;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	369 c1 = c - 1;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	370 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	371
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	372 // Now take the subset of the matrix.
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	373 if (iscmplx)
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	374 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	375 cdata = cdata.extract (0, c0, r1, c1);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	376 cdata.resize (r1 + 1, c1 - c0 + 1);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	377 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	378 else
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	379 {
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	380 rdata = rdata.extract (0, c0, r1, c1);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	381 rdata.resize (r1 + 1, c1 - c0 + 1);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	382 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	383 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	384
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	385 if (iscmplx)
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	386 retval(0) = cdata;
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	387 else
7581 e0d7bb35a3ec style fixes John W. Eaton <jwe@octave.org> parents: 7580 diff changeset	388 retval(0) = rdata;
7580 b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	389 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	390
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	391 return retval;
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	392 }
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	393
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	394 /*
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	395
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	396 %!shared file
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	397 %! file = tmpnam ();
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	398 %! fid = fopen (file, "wt");
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	399 %! 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	400 %! fclose (fid);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	401
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	402 %!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	403 %!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	404 %!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	405 %!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	406 %!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	407 %!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	408 %!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	409 %!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	410 %!error (dlmread (file, ",", [0 1]))
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	411
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	412 %!test
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	413 %! unlink (file);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	414
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	415 %!shared file
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	416 %! file = tmpnam ();
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	417 %! fid = fopen (file, "wt");
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	418 %! 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	419 %! fclose (fid);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	420
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	421 %!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	422 %!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	423 %!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	424 %!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	425 %!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	426 %!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	427 %!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	428 %!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	429 %!error (dlmread (file, ",", [0 1]))
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	430
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	431 %!test
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	432 %! unlink (file);
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	433
b4aa9ef3d3ef Port dlmread, dlmwrite, csvread and csvwrite from octave-forge David Bateman <dbateman@free.fr> parents: diff changeset	434 */

Mercurial > octave

annotate src/DLD-FUNCTIONS/dlmread.cc @ 9245:16f53d29049f