octave-nkf: src/pt-mat.cc annotate

annotate src/pt-mat.cc @ 12842:a52b4e9f45e3

codesprint: new tests for pt-mat.cc * pt-mat.cc (Fstring_fill_char): New tests.

author	John W. Eaton <jwe@octave.org>
date	Sat, 16 Jul 2011 18:05:35 -0400
parents	7a5aacf65f81
children	213c791292a6

rev	line source
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	1 /*
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	2
11523 fd0a3ac60b0e update copyright notices John W. Eaton <jwe@octave.org> parents: 10939 diff changeset	3 Copyright (C) 1996-2011 John W. Eaton
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	4
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	6
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	8 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6867 diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6867 diff changeset	10 option) any later version.
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	11
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	15 for more details.
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	16
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	17 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6867 diff changeset	18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6867 diff changeset	19 <http://www.gnu.org/licenses/>.
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	20
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	21 */
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	22
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	23 #ifdef HAVE_CONFIG_H
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	24 #include <config.h>
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	25 #endif
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	26
3503 d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe] jwe parents: 3373 diff changeset	27 #include <iostream>
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	28
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	29 #include "quit.h"
dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	30
2172 0de32e614930 [project @ 1996-05-13 15:00:42 by jwe] jwe parents: 2124 diff changeset	31 #include "defun.h"
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	32 #include "error.h"
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	33 #include "oct-obj.h"
2982 20f5cec4f11c [project @ 1997-05-16 03:29:26 by jwe] jwe parents: 2971 diff changeset	34 #include "pt-arg-list.h"
3770 bf6116ca10eb [project @ 2001-02-02 02:21:40 by jwe] jwe parents: 3661 diff changeset	35 #include "pt-bp.h"
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	36 #include "pt-exp.h"
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	37 #include "pt-mat.h"
2124 97a566037a75 [project @ 1996-05-12 07:16:36 by jwe] jwe parents: 2086 diff changeset	38 #include "pt-walk.h"
2201 e5db2ea7f7c8 [project @ 1996-05-15 05:37:55 by jwe] jwe parents: 2200 diff changeset	39 #include "utils.h"
2371 dd29ab8af9e7 [project @ 1996-10-12 00:09:55 by jwe] jwe parents: 2254 diff changeset	40 #include "ov.h"
dd29ab8af9e7 [project @ 1996-10-12 00:09:55 by jwe] jwe parents: 2254 diff changeset	41 #include "variables.h"
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	42
9460 1fddcf651559 avoid complex -> real conversion when constructing arrays with [] John W. Eaton <jwe@octave.org> parents: 9389 diff changeset	43 #include "ov-cx-mat.h"
1fddcf651559 avoid complex -> real conversion when constructing arrays with [] John W. Eaton <jwe@octave.org> parents: 9389 diff changeset	44 #include "ov-flt-cx-mat.h"
5630 512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5533 diff changeset	45 #include "ov-re-sparse.h"
512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5533 diff changeset	46 #include "ov-cx-sparse.h"
512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5533 diff changeset	47
2254 0158c64f940c [project @ 1996-05-22 19:13:36 by jwe] jwe parents: 2201 diff changeset	48 // The character to fill with when creating string arrays.
3836 b8c1cb5b9fd9 [project @ 2001-05-31 19:30:49 by jwe] jwe parents: 3770 diff changeset	49 char Vstring_fill_char = ' ';
2254 0158c64f940c [project @ 1996-05-22 19:13:36 by jwe] jwe parents: 2201 diff changeset	50
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	51 // General matrices. This list type is much more work to handle than
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	52 // constant matrices, but it allows us to construct matrices from
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	53 // other matrices, variables, and functions.
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	54
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	55 // But first, some internal classes that make our job much easier.
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	56
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	57 class
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	58 tm_row_const
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	59 {
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	60 private:
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	61
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	62 class
4219 23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4212 diff changeset	63 tm_row_const_rep : public octave_base_list<octave_value>
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	64 {
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	65 public:
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	66
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	67 tm_row_const_rep (void)
5514 e0011660696c [project @ 2005-10-27 15:43:29 by jwe] jwe parents: 5502 diff changeset	68 : count (1), dv (0, 0), all_str (false),
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	69 all_sq_str (false), all_dq_str (false),
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	70 some_str (false), all_real (false), all_cmplx (false),
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	71 all_mt (true), any_sparse (false), any_class (false),
10764 e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	72 all_1x1 (false), class_nm (), ok (false)
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	73 { }
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	74
2971 f2be17e6f1ea [project @ 1997-05-15 18:55:44 by jwe] jwe parents: 2891 diff changeset	75 tm_row_const_rep (const tree_argument_list& row)
5514 e0011660696c [project @ 2005-10-27 15:43:29 by jwe] jwe parents: 5502 diff changeset	76 : count (1), dv (0, 0), all_str (false), all_sq_str (false),
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	77 some_str (false), all_real (false), all_cmplx (false),
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	78 all_mt (true), any_sparse (false), any_class (false),
10764 e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	79 all_1x1 (! row.empty ()), class_nm (), ok (false)
3110 fe2d1ae8926b [project @ 1997-11-21 02:11:19 by jwe] jwe parents: 2990 diff changeset	80 { init (row); }
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	81
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	82 ~tm_row_const_rep (void) { }
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	83
12125 a21a3875ca83 implement a common class for reference counts Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	84 octave_refcount<int> count;
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	85
4765 e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4587 diff changeset	86 dim_vector dv;
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	87
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	88 bool all_str;
5280 25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	89 bool all_sq_str;
25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	90 bool all_dq_str;
3110 fe2d1ae8926b [project @ 1997-11-21 02:11:19 by jwe] jwe parents: 2990 diff changeset	91 bool some_str;
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	92 bool all_real;
dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	93 bool all_cmplx;
2602 9cbbbcf5b6f5 [project @ 1997-01-07 06:18:23 by jwe] jwe parents: 2580 diff changeset	94 bool all_mt;
5630 512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5533 diff changeset	95 bool any_sparse;
8147 9a5ef4f632a3 Add class dispatch for [] operator to vertcat/horzcat methods David Bateman <dbateman@free.fr> parents: 8107 diff changeset	96 bool any_class;
10764 e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	97 bool all_1x1;
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	98
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	99 std::string class_nm;
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	100
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	101 bool ok;
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	102
4501 693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe] jwe parents: 4460 diff changeset	103 bool do_init_element (tree_expression *, const octave_value&, bool&);
693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe] jwe parents: 4460 diff changeset	104
2971 f2be17e6f1ea [project @ 1997-05-15 18:55:44 by jwe] jwe parents: 2891 diff changeset	105 void init (const tree_argument_list&);
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	106
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	107 private:
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	108
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	109 tm_row_const_rep (const tm_row_const_rep&);
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	110
2971 f2be17e6f1ea [project @ 1997-05-15 18:55:44 by jwe] jwe parents: 2891 diff changeset	111 tm_row_const_rep& operator = (const tm_row_const_rep&);
2419 015cbef2b75f [project @ 1996-10-16 17:46:12 by jwe] jwe parents: 2371 diff changeset	112
015cbef2b75f [project @ 1996-10-16 17:46:12 by jwe] jwe parents: 2371 diff changeset	113 void eval_warning (const char *msg, int l, int c) const;
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	114 };
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	115
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	116 public:
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	117
4219 23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4212 diff changeset	118 typedef tm_row_const_rep::iterator iterator;
23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4212 diff changeset	119 typedef tm_row_const_rep::const_iterator const_iterator;
23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4212 diff changeset	120
2990 35bd1b05cfbe [project @ 1997-05-16 09:19:11 by jwe] jwe parents: 2982 diff changeset	121 tm_row_const (void)
35bd1b05cfbe [project @ 1997-05-16 09:19:11 by jwe] jwe parents: 2982 diff changeset	122 : rep (0) { }
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	123
2971 f2be17e6f1ea [project @ 1997-05-15 18:55:44 by jwe] jwe parents: 2891 diff changeset	124 tm_row_const (const tree_argument_list& row)
f2be17e6f1ea [project @ 1997-05-15 18:55:44 by jwe] jwe parents: 2891 diff changeset	125 : rep (new tm_row_const_rep (row)) { }
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	126
2990 35bd1b05cfbe [project @ 1997-05-16 09:19:11 by jwe] jwe parents: 2982 diff changeset	127 tm_row_const (const tm_row_const& x)
35bd1b05cfbe [project @ 1997-05-16 09:19:11 by jwe] jwe parents: 2982 diff changeset	128 : rep (x.rep)
35bd1b05cfbe [project @ 1997-05-16 09:19:11 by jwe] jwe parents: 2982 diff changeset	129 {
35bd1b05cfbe [project @ 1997-05-16 09:19:11 by jwe] jwe parents: 2982 diff changeset	130 if (rep)
35bd1b05cfbe [project @ 1997-05-16 09:19:11 by jwe] jwe parents: 2982 diff changeset	131 rep->count++;
35bd1b05cfbe [project @ 1997-05-16 09:19:11 by jwe] jwe parents: 2982 diff changeset	132 }
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	133
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	134 tm_row_const& operator = (const tm_row_const& x)
2990 35bd1b05cfbe [project @ 1997-05-16 09:19:11 by jwe] jwe parents: 2982 diff changeset	135 {
35bd1b05cfbe [project @ 1997-05-16 09:19:11 by jwe] jwe parents: 2982 diff changeset	136 if (this != &x && rep != x.rep)
35bd1b05cfbe [project @ 1997-05-16 09:19:11 by jwe] jwe parents: 2982 diff changeset	137 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	138 if (rep && --rep->count == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	139 delete rep;
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	140
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	141 rep = x.rep;
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	142
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	143 if (rep)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	144 rep->count++;
2990 35bd1b05cfbe [project @ 1997-05-16 09:19:11 by jwe] jwe parents: 2982 diff changeset	145 }
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	146
2990 35bd1b05cfbe [project @ 1997-05-16 09:19:11 by jwe] jwe parents: 2982 diff changeset	147 return *this;
35bd1b05cfbe [project @ 1997-05-16 09:19:11 by jwe] jwe parents: 2982 diff changeset	148 }
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	149
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	150 ~tm_row_const (void)
2990 35bd1b05cfbe [project @ 1997-05-16 09:19:11 by jwe] jwe parents: 2982 diff changeset	151 {
35bd1b05cfbe [project @ 1997-05-16 09:19:11 by jwe] jwe parents: 2982 diff changeset	152 if (rep && --rep->count == 0)
35bd1b05cfbe [project @ 1997-05-16 09:19:11 by jwe] jwe parents: 2982 diff changeset	153 delete rep;
35bd1b05cfbe [project @ 1997-05-16 09:19:11 by jwe] jwe parents: 2982 diff changeset	154 }
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	155
5514 e0011660696c [project @ 2005-10-27 15:43:29 by jwe] jwe parents: 5502 diff changeset	156 octave_idx_type rows (void) { return rep->dv(0); }
e0011660696c [project @ 2005-10-27 15:43:29 by jwe] jwe parents: 5502 diff changeset	157 octave_idx_type cols (void) { return rep->dv(1); }
4765 e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4587 diff changeset	158
6200 1ec9de3cd12c [project @ 2006-12-05 18:05:11 by jwe] jwe parents: 6039 diff changeset	159 bool empty (void) const { return rep->empty (); }
1ec9de3cd12c [project @ 2006-12-05 18:05:11 by jwe] jwe parents: 6039 diff changeset	160
8147 9a5ef4f632a3 Add class dispatch for [] operator to vertcat/horzcat methods David Bateman <dbateman@free.fr> parents: 8107 diff changeset	161 size_t length (void) const { return rep->length (); }
9a5ef4f632a3 Add class dispatch for [] operator to vertcat/horzcat methods David Bateman <dbateman@free.fr> parents: 8107 diff changeset	162
4765 e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4587 diff changeset	163 dim_vector dims (void) { return rep->dv; }
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	164
2868 30e1f6f41161 [project @ 1997-04-19 01:05:52 by jwe] jwe parents: 2859 diff changeset	165 bool all_strings_p (void) const { return rep->all_str; }
5280 25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	166 bool all_sq_strings_p (void) const { return rep->all_sq_str; }
25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	167 bool all_dq_strings_p (void) const { return rep->all_dq_str; }
3110 fe2d1ae8926b [project @ 1997-11-21 02:11:19 by jwe] jwe parents: 2990 diff changeset	168 bool some_strings_p (void) const { return rep->some_str; }
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	169 bool all_real_p (void) const { return rep->all_real; }
dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	170 bool all_complex_p (void) const { return rep->all_cmplx; }
2868 30e1f6f41161 [project @ 1997-04-19 01:05:52 by jwe] jwe parents: 2859 diff changeset	171 bool all_empty_p (void) const { return rep->all_mt; }
5630 512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5533 diff changeset	172 bool any_sparse_p (void) const { return rep->any_sparse; }
8147 9a5ef4f632a3 Add class dispatch for [] operator to vertcat/horzcat methods David Bateman <dbateman@free.fr> parents: 8107 diff changeset	173 bool any_class_p (void) const { return rep->any_class; }
10764 e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	174 bool all_1x1_p (void) const { return rep->all_1x1; }
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	175
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	176 std::string class_name (void) const { return rep->class_nm; }
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	177
4219 23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4212 diff changeset	178 operator bool () const { return (rep && rep->ok); }
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	179
4219 23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4212 diff changeset	180 iterator begin (void) { return rep->begin (); }
23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4212 diff changeset	181 const_iterator begin (void) const { return rep->begin (); }
23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4212 diff changeset	182
23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4212 diff changeset	183 iterator end (void) { return rep->end (); }
23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4212 diff changeset	184 const_iterator end (void) const { return rep->end (); }
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	185
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	186 private:
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	187
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	188 tm_row_const_rep *rep;
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	189 };
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	190
8107 8655dc0906e6 Special case single type conacation in Fcat. Rework cell2mat to take advantage David Bateman <dbateman@free.fr> parents: 7789 diff changeset	191 std::string
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	192 get_concat_class (const std::string& c1, const std::string& c2)
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	193 {
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	194 std::string retval = octave_base_value::static_class_name ();
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	195
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	196 if (c1 == c2)
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	197 retval = c1;
9389 0f85d9564057 fix result class calculation in pt-mat.cc Jaroslav Hajek <highegg@gmail.com> parents: 9145 diff changeset	198 else if (c1.empty ())
9145 53364bb317d4 fix concatenation with all-zero matrices Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	199 retval = c2;
9389 0f85d9564057 fix result class calculation in pt-mat.cc Jaroslav Hajek <highegg@gmail.com> parents: 9145 diff changeset	200 else if (c2.empty ())
0f85d9564057 fix result class calculation in pt-mat.cc Jaroslav Hajek <highegg@gmail.com> parents: 9145 diff changeset	201 retval = c1;
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	202 else
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	203 {
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	204 bool c1_is_int = (c1 == "int8" \|\| c1 == "uint8"
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	205 \|\| c1 == "int16" \|\| c1 == "uint16"
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	206 \|\| c1 == "int32" \|\| c1 == "uint32"
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	207 \|\| c1 == "int64" \|\| c1 == "uint64");
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	208 bool c2_is_int = (c2 == "int8" \|\| c2 == "uint8"
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	209 \|\| c2 == "int16" \|\| c2 == "uint16"
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	210 \|\| c2 == "int32" \|\| c2 == "uint32"
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	211 \|\| c2 == "int64" \|\| c2 == "uint64");
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	212
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	213 bool c1_is_char = (c1 == "char");
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	214 bool c2_is_char = (c2 == "char");
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	215
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	216 bool c1_is_double = (c1 == "double");
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	217 bool c2_is_double = (c2 == "double");
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	218
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	219 bool c1_is_single = (c1 == "single");
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	220 bool c2_is_single = (c2 == "single");
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	221
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	222 bool c1_is_logical = (c1 == "logical");
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	223 bool c2_is_logical = (c2 == "logical");
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	224
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	225 bool c1_is_built_in_type
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	226 = (c1_is_int \|\| c1_is_char \|\| c1_is_double \|\| c1_is_single
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	227 \|\| c1_is_logical);
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	228
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	229 bool c2_is_built_in_type
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	230 = (c2_is_int \|\| c2_is_char \|\| c2_is_double \|\| c2_is_single
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	231 \|\| c2_is_logical);
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	232
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	233 // Order is important here...
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	234
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	235 if (c1_is_char && c2_is_built_in_type)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	236 retval = c1;
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	237 else if (c2_is_char && c1_is_built_in_type)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	238 retval = c2;
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	239 else if (c1_is_int && c2_is_built_in_type)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	240 retval = c1;
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	241 else if (c2_is_int && c1_is_built_in_type)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	242 retval = c2;
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	243 else if (c1_is_single && c2_is_built_in_type)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	244 retval = c1;
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	245 else if (c2_is_single && c1_is_built_in_type)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	246 retval = c2;
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	247 else if (c1_is_double && c2_is_built_in_type)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	248 retval = c1;
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	249 else if (c2_is_double && c1_is_built_in_type)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	250 retval = c2;
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	251 else if (c1_is_logical && c2_is_logical)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	252 retval = c1;
10758 f3892d8eea9f optimize horzcat/vertcat for scalars, cells and structs Jaroslav Hajek <highegg@gmail.com> parents: 10715 diff changeset	253 else if (c1 == "struct" && c2 == c1)
f3892d8eea9f optimize horzcat/vertcat for scalars, cells and structs Jaroslav Hajek <highegg@gmail.com> parents: 10715 diff changeset	254 retval = c1;
f3892d8eea9f optimize horzcat/vertcat for scalars, cells and structs Jaroslav Hajek <highegg@gmail.com> parents: 10715 diff changeset	255 else if (c1 == "cell" && c2 == c1)
f3892d8eea9f optimize horzcat/vertcat for scalars, cells and structs Jaroslav Hajek <highegg@gmail.com> parents: 10715 diff changeset	256 retval = c1;
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	257 }
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	258
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	259 return retval;
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	260 }
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	261
10715 53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	262 static void
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	263 eval_error (const char *msg, int l, int c,
10715 53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	264 const dim_vector& x, const dim_vector& y)
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	265 {
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	266 if (l == -1 && c == -1)
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	267 {
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	268 ::error ("%s (%s vs %s)", msg, x.str ().c_str (), y.str ().c_str ());
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	269 }
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	270 else
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	271 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	272 ::error ("%s (%s vs %s) near line %d, column %d", msg,
10715 53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	273 x.str ().c_str (), y.str ().c_str (), l, c);
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	274 }
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	275 }
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	276
4501 693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe] jwe parents: 4460 diff changeset	277 bool
693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe] jwe parents: 4460 diff changeset	278 tm_row_const::tm_row_const_rep::do_init_element (tree_expression *elt,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	279 const octave_value& val,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	280 bool& first_elem)
4501 693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe] jwe parents: 4460 diff changeset	281 {
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	282 std::string this_elt_class_nm = val.class_name ();
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	283
4765 e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4587 diff changeset	284 dim_vector this_elt_dv = val.dims ();
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4587 diff changeset	285
9145 53364bb317d4 fix concatenation with all-zero matrices Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	286 class_nm = get_concat_class (class_nm, this_elt_class_nm);
53364bb317d4 fix concatenation with all-zero matrices Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	287
10715 53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	288 if (! this_elt_dv.zero_by_zero ())
4501 693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe] jwe parents: 4460 diff changeset	289 {
693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe] jwe parents: 4460 diff changeset	290 all_mt = false;
693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe] jwe parents: 4460 diff changeset	291
693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe] jwe parents: 4460 diff changeset	292 if (first_elem)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	293 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	294 first_elem = false;
10715 53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	295 dv = this_elt_dv;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	296 }
10715 53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	297 else if (! dv.hvcat (this_elt_dv, 1))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	298 {
10715 53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	299 eval_error ("horizontal dimensions mismatch", elt->line (), elt->column (), dv, this_elt_dv);
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	300 return false;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	301 }
4501 693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe] jwe parents: 4460 diff changeset	302 }
693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe] jwe parents: 4460 diff changeset	303
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4765 diff changeset	304 append (val);
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4765 diff changeset	305
4501 693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe] jwe parents: 4460 diff changeset	306 if (all_str && ! val.is_string ())
693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe] jwe parents: 4460 diff changeset	307 all_str = false;
693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe] jwe parents: 4460 diff changeset	308
5280 25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	309 if (all_sq_str && ! val.is_sq_string ())
25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	310 all_sq_str = false;
25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	311
25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	312 if (all_dq_str && ! val.is_dq_string ())
25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	313 all_dq_str = false;
25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	314
4501 693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe] jwe parents: 4460 diff changeset	315 if (! some_str && val.is_string ())
693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe] jwe parents: 4460 diff changeset	316 some_str = true;
693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe] jwe parents: 4460 diff changeset	317
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	318 if (all_real && ! val.is_real_type ())
dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	319 all_real = false;
dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	320
dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	321 if (all_cmplx && ! (val.is_complex_type () \|\| val.is_real_type ()))
dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	322 all_cmplx = false;
4501 693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe] jwe parents: 4460 diff changeset	323
5631 7171d19706df [project @ 2006-02-22 20:15:06 by dbateman] dbateman parents: 5630 diff changeset	324 if (!any_sparse && val.is_sparse_type ())
5630 512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5533 diff changeset	325 any_sparse = true;
512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5533 diff changeset	326
8147 9a5ef4f632a3 Add class dispatch for [] operator to vertcat/horzcat methods David Bateman <dbateman@free.fr> parents: 8107 diff changeset	327 if (!any_class && val.is_object ())
9a5ef4f632a3 Add class dispatch for [] operator to vertcat/horzcat methods David Bateman <dbateman@free.fr> parents: 8107 diff changeset	328 any_class = true;
9a5ef4f632a3 Add class dispatch for [] operator to vertcat/horzcat methods David Bateman <dbateman@free.fr> parents: 8107 diff changeset	329
10764 e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	330 all_1x1 = all_1x1 && val.numel () == 1;
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	331
4501 693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe] jwe parents: 4460 diff changeset	332 return true;
693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe] jwe parents: 4460 diff changeset	333 }
693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe] jwe parents: 4460 diff changeset	334
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	335 void
2971 f2be17e6f1ea [project @ 1997-05-15 18:55:44 by jwe] jwe parents: 2891 diff changeset	336 tm_row_const::tm_row_const_rep::init (const tree_argument_list& row)
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	337 {
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	338 all_str = true;
5280 25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	339 all_sq_str = true;
25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	340 all_dq_str = true;
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	341 all_real = true;
dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	342 all_cmplx = true;
5630 512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5533 diff changeset	343 any_sparse = false;
8147 9a5ef4f632a3 Add class dispatch for [] operator to vertcat/horzcat methods David Bateman <dbateman@free.fr> parents: 8107 diff changeset	344 any_class = false;
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	345
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	346 bool first_elem = true;
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	347
4219 23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4212 diff changeset	348 for (tree_argument_list::const_iterator p = row.begin ();
23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4212 diff changeset	349 p != row.end ();
23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4212 diff changeset	350 p++)
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	351 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 10116 diff changeset	352 octave_quit ();
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	353
4219 23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4212 diff changeset	354 tree_expression elt = p;
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	355
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8147 diff changeset	356 octave_value tmp = elt->rvalue1 ();
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	357
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	358 if (error_state \|\| tmp.is_undefined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	359 break;
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	360 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	361 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	362 if (tmp.is_cs_list ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	363 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	364 octave_value_list tlst = tmp.list_value ();
2602 9cbbbcf5b6f5 [project @ 1997-01-07 06:18:23 by jwe] jwe parents: 2580 diff changeset	365
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	366 for (octave_idx_type i = 0; i < tlst.length (); i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	367 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	368 octave_quit ();
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	369
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	370 if (! do_init_element (elt, tlst(i), first_elem))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	371 goto done;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	372 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	373 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	374 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	375 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	376 if (! do_init_element (elt, tmp, first_elem))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	377 goto done;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	378 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	379 }
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	380 }
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	381
4501 693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe] jwe parents: 4460 diff changeset	382 done:
693ad5220d1e [project @ 2003-09-05 20:55:40 by jwe] jwe parents: 4460 diff changeset	383
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	384 ok = ! error_state;
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	385 }
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	386
2419 015cbef2b75f [project @ 1996-10-16 17:46:12 by jwe] jwe parents: 2371 diff changeset	387 void
015cbef2b75f [project @ 1996-10-16 17:46:12 by jwe] jwe parents: 2371 diff changeset	388 tm_row_const::tm_row_const_rep::eval_warning (const char *msg, int l,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	389 int c) const
2419 015cbef2b75f [project @ 1996-10-16 17:46:12 by jwe] jwe parents: 2371 diff changeset	390 {
015cbef2b75f [project @ 1996-10-16 17:46:12 by jwe] jwe parents: 2371 diff changeset	391 if (l == -1 && c == -1)
5781 faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe] jwe parents: 5631 diff changeset	392 warning_with_id ("Octave:empty-list-elements", "%s", msg);
2419 015cbef2b75f [project @ 1996-10-16 17:46:12 by jwe] jwe parents: 2371 diff changeset	393 else
5781 faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe] jwe parents: 5631 diff changeset	394 warning_with_id ("Octave:empty-list-elements",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	395 "%s near line %d, column %d", msg, l, c);
2419 015cbef2b75f [project @ 1996-10-16 17:46:12 by jwe] jwe parents: 2371 diff changeset	396 }
015cbef2b75f [project @ 1996-10-16 17:46:12 by jwe] jwe parents: 2371 diff changeset	397
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	398 class
4219 23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4212 diff changeset	399 tm_const : public octave_base_list<tm_row_const>
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	400 {
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	401 public:
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	402
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	403 tm_const (const tree_matrix& tm)
5514 e0011660696c [project @ 2005-10-27 15:43:29 by jwe] jwe parents: 5502 diff changeset	404 : dv (0, 0), all_str (false), all_sq_str (false), all_dq_str (false),
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	405 some_str (false), all_real (false), all_cmplx (false),
8147 9a5ef4f632a3 Add class dispatch for [] operator to vertcat/horzcat methods David Bateman <dbateman@free.fr> parents: 8107 diff changeset	406 all_mt (true), any_sparse (false), any_class (false),
9389 0f85d9564057 fix result class calculation in pt-mat.cc Jaroslav Hajek <highegg@gmail.com> parents: 9145 diff changeset	407 class_nm (), ok (false)
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	408 { init (tm); }
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	409
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	410 ~tm_const (void) { }
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	411
5514 e0011660696c [project @ 2005-10-27 15:43:29 by jwe] jwe parents: 5502 diff changeset	412 octave_idx_type rows (void) const { return dv.elem (0); }
e0011660696c [project @ 2005-10-27 15:43:29 by jwe] jwe parents: 5502 diff changeset	413 octave_idx_type cols (void) const { return dv.elem (1); }
4765 e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4587 diff changeset	414
e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4587 diff changeset	415 dim_vector dims (void) const { return dv; }
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	416
2868 30e1f6f41161 [project @ 1997-04-19 01:05:52 by jwe] jwe parents: 2859 diff changeset	417 bool all_strings_p (void) const { return all_str; }
5280 25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	418 bool all_sq_strings_p (void) const { return all_sq_str; }
25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	419 bool all_dq_strings_p (void) const { return all_dq_str; }
3110 fe2d1ae8926b [project @ 1997-11-21 02:11:19 by jwe] jwe parents: 2990 diff changeset	420 bool some_strings_p (void) const { return some_str; }
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	421 bool all_real_p (void) const { return all_real; }
dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	422 bool all_complex_p (void) const { return all_cmplx; }
2868 30e1f6f41161 [project @ 1997-04-19 01:05:52 by jwe] jwe parents: 2859 diff changeset	423 bool all_empty_p (void) const { return all_mt; }
5630 512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5533 diff changeset	424 bool any_sparse_p (void) const { return any_sparse; }
8147 9a5ef4f632a3 Add class dispatch for [] operator to vertcat/horzcat methods David Bateman <dbateman@free.fr> parents: 8107 diff changeset	425 bool any_class_p (void) const { return any_class; }
10764 e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	426 bool all_1x1_p (void) const { return all_1x1; }
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	427
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	428 std::string class_name (void) const { return class_nm; }
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	429
3145 0d640dc625c7 [project @ 1998-02-05 08:44:59 by jwe] jwe parents: 3110 diff changeset	430 operator bool () const { return ok; }
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	431
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	432 private:
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	433
4765 e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4587 diff changeset	434 dim_vector dv;
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	435
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	436 bool all_str;
5280 25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	437 bool all_sq_str;
25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	438 bool all_dq_str;
3110 fe2d1ae8926b [project @ 1997-11-21 02:11:19 by jwe] jwe parents: 2990 diff changeset	439 bool some_str;
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	440 bool all_real;
dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	441 bool all_cmplx;
2602 9cbbbcf5b6f5 [project @ 1997-01-07 06:18:23 by jwe] jwe parents: 2580 diff changeset	442 bool all_mt;
5630 512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5533 diff changeset	443 bool any_sparse;
8147 9a5ef4f632a3 Add class dispatch for [] operator to vertcat/horzcat methods David Bateman <dbateman@free.fr> parents: 8107 diff changeset	444 bool any_class;
10764 e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	445 bool all_1x1;
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	446
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	447 std::string class_nm;
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	448
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	449 bool ok;
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	450
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	451 tm_const (void);
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	452
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	453 tm_const (const tm_const&);
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	454
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	455 tm_const& operator = (const tm_const&);
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	456
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	457 void init (const tree_matrix& tm);
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	458 };
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	459
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	460 void
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	461 tm_const::init (const tree_matrix& tm)
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	462 {
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	463 all_str = true;
5280 25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	464 all_sq_str = true;
25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	465 all_dq_str = true;
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	466 all_real = true;
dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	467 all_cmplx = true;
5630 512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5533 diff changeset	468 any_sparse = false;
8147 9a5ef4f632a3 Add class dispatch for [] operator to vertcat/horzcat methods David Bateman <dbateman@free.fr> parents: 8107 diff changeset	469 any_class = false;
10764 e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	470 all_1x1 = ! empty ();
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	471
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	472 bool first_elem = true;
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	473
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	474 // Just eval and figure out if what we have is complex or all
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	475 // strings. We can't check columns until we know that this is a
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	476 // numeric matrix -- collections of strings can have elements of
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	477 // different lengths.
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	478
4219 23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4212 diff changeset	479 for (tree_matrix::const_iterator p = tm.begin (); p != tm.end (); p++)
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	480 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 10116 diff changeset	481 octave_quit ();
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	482
4219 23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4212 diff changeset	483 tree_argument_list elt = p;
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	484
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	485 tm_row_const tmp (*elt);
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	486
6200 1ec9de3cd12c [project @ 2006-12-05 18:05:11 by jwe] jwe parents: 6039 diff changeset	487 if (tmp && ! tmp.empty ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	488 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	489 if (all_str && ! tmp.all_strings_p ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	490 all_str = false;
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	491
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	492 if (all_sq_str && ! tmp.all_sq_strings_p ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	493 all_sq_str = false;
5280 25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	494
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	495 if (all_dq_str && ! tmp.all_dq_strings_p ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	496 all_dq_str = false;
5280 25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	497
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	498 if (! some_str && tmp.some_strings_p ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	499 some_str = true;
3110 fe2d1ae8926b [project @ 1997-11-21 02:11:19 by jwe] jwe parents: 2990 diff changeset	500
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	501 if (all_real && ! tmp.all_real_p ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	502 all_real = false;
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	503
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	504 if (all_cmplx && ! tmp.all_complex_p ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	505 all_cmplx = false;
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	506
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	507 if (all_mt && ! tmp.all_empty_p ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	508 all_mt = false;
2602 9cbbbcf5b6f5 [project @ 1997-01-07 06:18:23 by jwe] jwe parents: 2580 diff changeset	509
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	510 if (!any_sparse && tmp.any_sparse_p ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	511 any_sparse = true;
5630 512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5533 diff changeset	512
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	513 if (!any_class && tmp.any_class_p ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	514 any_class = true;
8147 9a5ef4f632a3 Add class dispatch for [] operator to vertcat/horzcat methods David Bateman <dbateman@free.fr> parents: 8107 diff changeset	515
10764 e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	516 all_1x1 = all_1x1 && tmp.all_1x1_p ();
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	517
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	518 append (tmp);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	519 }
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	520 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	521 break;
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	522 }
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	523
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	524 if (! error_state)
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	525 {
4219 23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4212 diff changeset	526 for (iterator p = begin (); p != end (); p++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	527 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	528 octave_quit ();
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	529
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	530 tm_row_const elt = *p;
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	531
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	532 octave_idx_type this_elt_nr = elt.rows ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	533 octave_idx_type this_elt_nc = elt.cols ();
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	534
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	535 std::string this_elt_class_nm = elt.class_name ();
10715 53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	536 class_nm = get_concat_class (class_nm, this_elt_class_nm);
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	537
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	538 dim_vector this_elt_dv = elt.dims ();
4765 e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4587 diff changeset	539
10715 53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	540 all_mt = false;
4765 e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4587 diff changeset	541
10715 53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	542 if (first_elem)
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	543 {
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	544 first_elem = false;
4765 e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4587 diff changeset	545
10715 53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	546 dv = this_elt_dv;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	547 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	548 else if (all_str && dv.length () == 2
10715 53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	549 && this_elt_dv.length () == 2)
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	550 {
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	551 // FIXME: this is Octave's specialty. Character matrices allow
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	552 // rows of unequal length.
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	553 if (this_elt_nc > cols ())
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	554 dv(1) = this_elt_nc;
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	555 dv(0) += this_elt_nr;
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	556 }
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	557 else if (! dv.hvcat (this_elt_dv, 0))
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	558 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	559 eval_error ("vertical dimensions mismatch", -1, -1,
10715 53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	560 dv, this_elt_dv);
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	561 return;
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	562 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	563 }
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	564 }
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	565
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	566 ok = ! error_state;
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	567 }
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	568
2990 35bd1b05cfbe [project @ 1997-05-16 09:19:11 by jwe] jwe parents: 2982 diff changeset	569 tree_matrix::~tree_matrix (void)
35bd1b05cfbe [project @ 1997-05-16 09:19:11 by jwe] jwe parents: 2982 diff changeset	570 {
4219 23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4212 diff changeset	571 while (! empty ())
2990 35bd1b05cfbe [project @ 1997-05-16 09:19:11 by jwe] jwe parents: 2982 diff changeset	572 {
4219 23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4212 diff changeset	573 iterator p = begin ();
23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4212 diff changeset	574 delete *p;
23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4212 diff changeset	575 erase (p);
2990 35bd1b05cfbe [project @ 1997-05-16 09:19:11 by jwe] jwe parents: 2982 diff changeset	576 }
35bd1b05cfbe [project @ 1997-05-16 09:19:11 by jwe] jwe parents: 2982 diff changeset	577 }
35bd1b05cfbe [project @ 1997-05-16 09:19:11 by jwe] jwe parents: 2982 diff changeset	578
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	579 bool
4267 7cd865a8c815 [project @ 2003-01-03 15:27:05 by jwe] jwe parents: 4257 diff changeset	580 tree_matrix::has_magic_end (void) const
7cd865a8c815 [project @ 2003-01-03 15:27:05 by jwe] jwe parents: 4257 diff changeset	581 {
7cd865a8c815 [project @ 2003-01-03 15:27:05 by jwe] jwe parents: 4257 diff changeset	582 for (const_iterator p = begin (); p != end (); p++)
7cd865a8c815 [project @ 2003-01-03 15:27:05 by jwe] jwe parents: 4257 diff changeset	583 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 10116 diff changeset	584 octave_quit ();
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	585
4267 7cd865a8c815 [project @ 2003-01-03 15:27:05 by jwe] jwe parents: 4257 diff changeset	586 tree_argument_list elt = p;
7cd865a8c815 [project @ 2003-01-03 15:27:05 by jwe] jwe parents: 4257 diff changeset	587
7cd865a8c815 [project @ 2003-01-03 15:27:05 by jwe] jwe parents: 4257 diff changeset	588 if (elt && elt->has_magic_end ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	589 return true;
4267 7cd865a8c815 [project @ 2003-01-03 15:27:05 by jwe] jwe parents: 4257 diff changeset	590 }
7cd865a8c815 [project @ 2003-01-03 15:27:05 by jwe] jwe parents: 4257 diff changeset	591
7cd865a8c815 [project @ 2003-01-03 15:27:05 by jwe] jwe parents: 4257 diff changeset	592 return false;
7cd865a8c815 [project @ 2003-01-03 15:27:05 by jwe] jwe parents: 4257 diff changeset	593 }
7cd865a8c815 [project @ 2003-01-03 15:27:05 by jwe] jwe parents: 4257 diff changeset	594
7cd865a8c815 [project @ 2003-01-03 15:27:05 by jwe] jwe parents: 4257 diff changeset	595 bool
2529 90fa35bd0216 [project @ 1996-11-19 18:02:22 by jwe] jwe parents: 2495 diff changeset	596 tree_matrix::all_elements_are_constant (void) const
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	597 {
4219 23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4212 diff changeset	598 for (const_iterator p = begin (); p != end (); p++)
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	599 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 10116 diff changeset	600 octave_quit ();
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	601
4219 23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4212 diff changeset	602 tree_argument_list elt = p;
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	603
2529 90fa35bd0216 [project @ 1996-11-19 18:02:22 by jwe] jwe parents: 2495 diff changeset	604 if (! elt->all_elements_are_constant ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	605 return false;
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	606 }
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	607
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	608 return true;
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	609 }
effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	610
2971 f2be17e6f1ea [project @ 1997-05-15 18:55:44 by jwe] jwe parents: 2891 diff changeset	611 octave_value_list
f2be17e6f1ea [project @ 1997-05-15 18:55:44 by jwe] jwe parents: 2891 diff changeset	612 tree_matrix::rvalue (int nargout)
f2be17e6f1ea [project @ 1997-05-15 18:55:44 by jwe] jwe parents: 2891 diff changeset	613 {
f2be17e6f1ea [project @ 1997-05-15 18:55:44 by jwe] jwe parents: 2891 diff changeset	614 octave_value_list retval;
f2be17e6f1ea [project @ 1997-05-15 18:55:44 by jwe] jwe parents: 2891 diff changeset	615
f2be17e6f1ea [project @ 1997-05-15 18:55:44 by jwe] jwe parents: 2891 diff changeset	616 if (nargout > 1)
f2be17e6f1ea [project @ 1997-05-15 18:55:44 by jwe] jwe parents: 2891 diff changeset	617 error ("invalid number of output arguments for matrix list");
f2be17e6f1ea [project @ 1997-05-15 18:55:44 by jwe] jwe parents: 2891 diff changeset	618 else
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8147 diff changeset	619 retval = rvalue1 (nargout);
2971 f2be17e6f1ea [project @ 1997-05-15 18:55:44 by jwe] jwe parents: 2891 diff changeset	620
f2be17e6f1ea [project @ 1997-05-15 18:55:44 by jwe] jwe parents: 2891 diff changeset	621 return retval;
f2be17e6f1ea [project @ 1997-05-15 18:55:44 by jwe] jwe parents: 2891 diff changeset	622 }
f2be17e6f1ea [project @ 1997-05-15 18:55:44 by jwe] jwe parents: 2891 diff changeset	623
8107 8655dc0906e6 Special case single type conacation in Fcat. Rework cell2mat to take advantage David Bateman <dbateman@free.fr> parents: 7789 diff changeset	624 void
5280 25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	625 maybe_warn_string_concat (bool all_dq_strings_p, bool all_sq_strings_p)
25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	626 {
5781 faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe] jwe parents: 5631 diff changeset	627 if (! (all_dq_strings_p \|\| all_sq_strings_p))
faafc2d98b8d [project @ 2006-05-02 19:40:19 by jwe] jwe parents: 5631 diff changeset	628 warning_with_id ("Octave:string-concat",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	629 "concatenation of different character string types may have unintended consequences");
5280 25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	630 }
25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	631
10535 3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	632 template<class TYPE, class T>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	633 static void
10535 3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	634 single_type_concat (Array<T>& result,
10116 fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	635 tm_const& tmp)
fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	636 {
fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	637 octave_idx_type r = 0, c = 0;
fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	638
fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	639 for (tm_const::iterator p = tmp.begin (); p != tmp.end (); p++)
fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	640 {
fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	641 tm_row_const row = *p;
10715 53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	642 // Skip empty arrays to allow looser rules.
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	643 if (row.dims ().any_zero ())
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	644 continue;
10116 fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	645
fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	646 for (tm_row_const::iterator q = row.begin ();
fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	647 q != row.end ();
fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	648 q++)
fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	649 {
10142 829e69ec3110 make OCTAVE_QUIT a function Jaroslav Hajek <highegg@gmail.com> parents: 10116 diff changeset	650 octave_quit ();
10116 fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	651
fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	652 TYPE ra = octave_value_extract<TYPE> (*q);
fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	653
10715 53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	654 // Skip empty arrays to allow looser rules.
10116 fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	655 if (! error_state)
fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	656 {
10715 53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	657 if (! ra.is_empty ())
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	658 {
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	659 result.insert (ra, r, c);
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	660
10715 53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	661 if (! error_state)
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	662 c += ra.columns ();
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	663 else
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	664 return;
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	665 }
10116 fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	666 }
fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	667 else
fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	668 return;
fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	669 }
fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	670
fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	671 r += row.rows ();
fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	672 c = 0;
fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	673 }
fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	674 }
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	675
10535 3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	676 template<class TYPE, class T>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	677 static void
10535 3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	678 single_type_concat (Array<T>& result,
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	679 const dim_vector& dv,
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	680 tm_const& tmp)
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	681 {
10715 53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	682 if (dv.any_zero ())
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	683 {
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	684 result = Array<T> (dv);
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	685 return;
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	686 }
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	687
10535 3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	688 if (tmp.length () == 1)
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	689 {
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	690 // If possible, forward the operation to liboctave.
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	691 // Single row.
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	692 tm_row_const& row = tmp.front ();
10939 c07cb4ef80db optimize [a{:}] when a{i} are all scalars Jaroslav Hajek <highegg@gmail.com> parents: 10937 diff changeset	693 if (! (equal_types<T, char>::value \|\| equal_types<T, octave_value>::value)
c07cb4ef80db optimize [a{:}] when a{i} are all scalars Jaroslav Hajek <highegg@gmail.com> parents: 10937 diff changeset	694 && row.all_1x1_p ())
c07cb4ef80db optimize [a{:}] when a{i} are all scalars Jaroslav Hajek <highegg@gmail.com> parents: 10937 diff changeset	695 {
c07cb4ef80db optimize [a{:}] when a{i} are all scalars Jaroslav Hajek <highegg@gmail.com> parents: 10937 diff changeset	696 // Optimize all scalars case.
c07cb4ef80db optimize [a{:}] when a{i} are all scalars Jaroslav Hajek <highegg@gmail.com> parents: 10937 diff changeset	697 result.clear (dv);
c07cb4ef80db optimize [a{:}] when a{i} are all scalars Jaroslav Hajek <highegg@gmail.com> parents: 10937 diff changeset	698 assert (result.numel () == row.length ());
c07cb4ef80db optimize [a{:}] when a{i} are all scalars Jaroslav Hajek <highegg@gmail.com> parents: 10937 diff changeset	699 octave_idx_type i = 0;
c07cb4ef80db optimize [a{:}] when a{i} are all scalars Jaroslav Hajek <highegg@gmail.com> parents: 10937 diff changeset	700 for (tm_row_const::iterator q = row.begin ();
c07cb4ef80db optimize [a{:}] when a{i} are all scalars Jaroslav Hajek <highegg@gmail.com> parents: 10937 diff changeset	701 q != row.end () && ! error_state; q++)
c07cb4ef80db optimize [a{:}] when a{i} are all scalars Jaroslav Hajek <highegg@gmail.com> parents: 10937 diff changeset	702 result(i++) = octave_value_extract<T> (*q);
c07cb4ef80db optimize [a{:}] when a{i} are all scalars Jaroslav Hajek <highegg@gmail.com> parents: 10937 diff changeset	703
c07cb4ef80db optimize [a{:}] when a{i} are all scalars Jaroslav Hajek <highegg@gmail.com> parents: 10937 diff changeset	704 return;
c07cb4ef80db optimize [a{:}] when a{i} are all scalars Jaroslav Hajek <highegg@gmail.com> parents: 10937 diff changeset	705 }
c07cb4ef80db optimize [a{:}] when a{i} are all scalars Jaroslav Hajek <highegg@gmail.com> parents: 10937 diff changeset	706
10535 3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	707 octave_idx_type ncols = row.length (), i = 0;
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	708 OCTAVE_LOCAL_BUFFER (Array<T>, array_list, ncols);
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	709
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	710 for (tm_row_const::iterator q = row.begin ();
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	711 q != row.end () && ! error_state;
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	712 q++)
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	713 {
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	714 octave_quit ();
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	715
10937 f42e8c6196c3 tweaks in concatenation of empty structs Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	716 array_list[i] = octave_value_extract<TYPE> (*q);
10715 53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	717 i++;
10535 3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	718 }
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	719
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	720 if (! error_state)
10937 f42e8c6196c3 tweaks in concatenation of empty structs Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	721 result = Array<T>::cat (-2, ncols, array_list);
10535 3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	722 }
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	723 else
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	724 {
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	725 result = Array<T> (dv);
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	726 single_type_concat<TYPE> (result, tmp);
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	727 }
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	728 }
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	729
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	730 template<class TYPE, class T>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	731 static void
10535 3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	732 single_type_concat (Sparse<T>& result,
10715 53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	733 const dim_vector& dv,
10535 3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	734 tm_const& tmp)
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	735 {
10715 53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	736 if (dv.any_zero ())
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	737 {
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	738 result = Sparse<T> (dv);
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	739 return;
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	740 }
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	741
10535 3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	742 // Sparse matrices require preallocation for efficient indexing; besides,
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	743 // only horizontal concatenation can be efficiently handled by indexing.
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	744 // So we just cat all rows through liboctave, then cat the final column.
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	745 octave_idx_type nrows = tmp.length (), j = 0;
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	746 OCTAVE_LOCAL_BUFFER (Sparse<T>, sparse_row_list, nrows);
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	747 for (tm_const::iterator p = tmp.begin (); p != tmp.end (); p++)
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	748 {
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	749 tm_row_const row = *p;
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	750 octave_idx_type ncols = row.length (), i = 0;
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	751 OCTAVE_LOCAL_BUFFER (Sparse<T>, sparse_list, ncols);
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	752
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	753 for (tm_row_const::iterator q = row.begin ();
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	754 q != row.end () && ! error_state;
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	755 q++)
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	756 {
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	757 octave_quit ();
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	758
10937 f42e8c6196c3 tweaks in concatenation of empty structs Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	759 sparse_list[i] = octave_value_extract<TYPE> (*q);
10715 53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	760 i++;
10535 3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	761 }
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	762
10937 f42e8c6196c3 tweaks in concatenation of empty structs Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	763 Sparse<T> stmp = Sparse<T>::cat (-2, ncols, sparse_list);
f42e8c6196c3 tweaks in concatenation of empty structs Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	764 sparse_row_list[j] = stmp;
10715 53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	765 j++;
10535 3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	766 }
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	767
10937 f42e8c6196c3 tweaks in concatenation of empty structs Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	768 result = Sparse<T>::cat (-1, nrows, sparse_row_list);
10535 3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	769 }
3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	770
10764 e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	771 template<class MAP>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	772 static void
10764 e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	773 single_type_concat (octave_map& result,
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	774 const dim_vector& dv,
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	775 tm_const& tmp)
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	776 {
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	777 if (dv.any_zero ())
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	778 {
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	779 result = octave_map (dv);
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	780 return;
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	781 }
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	782
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	783 octave_idx_type nrows = tmp.length (), j = 0;
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	784 OCTAVE_LOCAL_BUFFER (octave_map, map_row_list, nrows);
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	785 for (tm_const::iterator p = tmp.begin (); p != tmp.end (); p++)
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	786 {
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	787 tm_row_const row = *p;
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	788 octave_idx_type ncols = row.length (), i = 0;
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	789 OCTAVE_LOCAL_BUFFER (MAP, map_list, ncols);
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	790
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	791 for (tm_row_const::iterator q = row.begin ();
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	792 q != row.end () && ! error_state;
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	793 q++)
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	794 {
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	795 octave_quit ();
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	796
10937 f42e8c6196c3 tweaks in concatenation of empty structs Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	797 map_list[i] = octave_value_extract<MAP> (*q);
10764 e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	798 i++;
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	799 }
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	800
10937 f42e8c6196c3 tweaks in concatenation of empty structs Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	801 octave_map mtmp = octave_map::cat (-2, ncols, map_list);
f42e8c6196c3 tweaks in concatenation of empty structs Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	802 map_row_list[j] = mtmp;
10764 e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	803 j++;
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	804 }
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	805
10937 f42e8c6196c3 tweaks in concatenation of empty structs Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	806 result = octave_map::cat (-1, nrows, map_row_list);
10764 e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	807 }
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	808
10116 fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	809 template<class TYPE>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	810 static octave_value
10116 fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	811 do_single_type_concat (const dim_vector& dv,
fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	812 tm_const& tmp)
fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	813 {
10535 3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	814 TYPE result;
10116 fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	815
10535 3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	816 single_type_concat<TYPE> (result, dv, tmp);
10116 fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	817
fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	818 return result;
fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	819 }
fecebef27388 improve concatenation code using templates instead of macros Jaroslav Hajek <highegg@gmail.com> parents: 9689 diff changeset	820
10764 e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	821 template<>
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	822 octave_value
10764 e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	823 do_single_type_concat<octave_map> (const dim_vector& dv,
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	824 tm_const& tmp)
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	825 {
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	826 octave_map result;
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	827
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	828 if (tmp.all_1x1_p ())
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	829 single_type_concat<octave_scalar_map> (result, dv, tmp);
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	830 else
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	831 single_type_concat<octave_map> (result, dv, tmp);
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	832
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	833 return result;
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	834 }
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	835
2086 bfb775fb6fe8 [project @ 1996-04-25 05:55:19 by jwe] jwe parents: 1996 diff changeset	836 octave_value
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8147 diff changeset	837 tree_matrix::rvalue1 (int)
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	838 {
6200 1ec9de3cd12c [project @ 2006-12-05 18:05:11 by jwe] jwe parents: 6039 diff changeset	839 octave_value retval = Matrix ();
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	840
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4765 diff changeset	841 bool all_strings_p = false;
5280 25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	842 bool all_sq_strings_p = false;
25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	843 bool all_dq_strings_p = false;
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4765 diff changeset	844 bool all_empty_p = false;
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	845 bool all_real_p = false;
dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	846 bool all_complex_p = false;
5630 512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5533 diff changeset	847 bool any_sparse_p = false;
8147 9a5ef4f632a3 Add class dispatch for [] operator to vertcat/horzcat methods David Bateman <dbateman@free.fr> parents: 8107 diff changeset	848 bool any_class_p = false;
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4765 diff changeset	849 bool frc_str_conv = false;
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	850
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4765 diff changeset	851 tm_const tmp (*this);
3110 fe2d1ae8926b [project @ 1997-11-21 02:11:19 by jwe] jwe parents: 2990 diff changeset	852
6200 1ec9de3cd12c [project @ 2006-12-05 18:05:11 by jwe] jwe parents: 6039 diff changeset	853 if (tmp && ! tmp.empty ())
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	854 {
4765 e941e1470d7b [project @ 2004-02-16 05:56:50 by jwe] jwe parents: 4587 diff changeset	855 dim_vector dv = tmp.dims ();
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4765 diff changeset	856 all_strings_p = tmp.all_strings_p ();
5280 25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	857 all_sq_strings_p = tmp.all_sq_strings_p ();
25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	858 all_dq_strings_p = tmp.all_dq_strings_p ();
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4765 diff changeset	859 all_empty_p = tmp.all_empty_p ();
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	860 all_real_p = tmp.all_real_p ();
dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	861 all_complex_p = tmp.all_complex_p ();
5630 512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5533 diff changeset	862 any_sparse_p = tmp.any_sparse_p ();
8147 9a5ef4f632a3 Add class dispatch for [] operator to vertcat/horzcat methods David Bateman <dbateman@free.fr> parents: 8107 diff changeset	863 any_class_p = tmp.any_class_p ();
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4765 diff changeset	864 frc_str_conv = tmp.some_strings_p ();
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	865
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	866 // Try to speed up the common cases.
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4765 diff changeset	867
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	868 std::string result_type = tmp.class_name ();
667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	869
8147 9a5ef4f632a3 Add class dispatch for [] operator to vertcat/horzcat methods David Bateman <dbateman@free.fr> parents: 8107 diff changeset	870 if (any_class_p)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	871 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	872 octave_value_list tmp3 (tmp.length (), octave_value ());
8147 9a5ef4f632a3 Add class dispatch for [] operator to vertcat/horzcat methods David Bateman <dbateman@free.fr> parents: 8107 diff changeset	873
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	874 int j = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	875 for (tm_const::iterator p = tmp.begin (); p != tmp.end (); p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	876 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	877 octave_quit ();
8147 9a5ef4f632a3 Add class dispatch for [] operator to vertcat/horzcat methods David Bateman <dbateman@free.fr> parents: 8107 diff changeset	878
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	879 tm_row_const row = *p;
8147 9a5ef4f632a3 Add class dispatch for [] operator to vertcat/horzcat methods David Bateman <dbateman@free.fr> parents: 8107 diff changeset	880
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	881 if (row.length () == 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	882 tmp3 (j++) = *(row.begin ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	883 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	884 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	885 octave_value_list tmp1 (row.length (), octave_value ());
8147 9a5ef4f632a3 Add class dispatch for [] operator to vertcat/horzcat methods David Bateman <dbateman@free.fr> parents: 8107 diff changeset	886
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	887 int i = 0;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	888 for (tm_row_const::iterator q = row.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	889 q != row.end (); q++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	890 tmp1 (i++) = *q;
8147 9a5ef4f632a3 Add class dispatch for [] operator to vertcat/horzcat methods David Bateman <dbateman@free.fr> parents: 8107 diff changeset	891
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	892 octave_value_list tmp2;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	893 octave_value fcn =
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	894 symbol_table::find_function ("horzcat", tmp1);
8147 9a5ef4f632a3 Add class dispatch for [] operator to vertcat/horzcat methods David Bateman <dbateman@free.fr> parents: 8107 diff changeset	895
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	896 if (fcn.is_defined ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	897 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	898 tmp2 = fcn.do_multi_index_op (1, tmp1);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	899
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	900 if (error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	901 goto done;
8147 9a5ef4f632a3 Add class dispatch for [] operator to vertcat/horzcat methods David Bateman <dbateman@free.fr> parents: 8107 diff changeset	902
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	903 tmp3 (j++) = tmp2 (0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	904 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	905 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	906 {
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 12125 diff changeset	907 ::error ("cannot find overloaded horzcat function");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	908 goto done;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	909 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	910 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	911 }
8147 9a5ef4f632a3 Add class dispatch for [] operator to vertcat/horzcat methods David Bateman <dbateman@free.fr> parents: 8107 diff changeset	912
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	913 if (tmp.length () == 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	914 retval = tmp3 (0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	915 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	916 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	917 octave_value_list tmp2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	918 octave_value fcn = symbol_table::find_function ("vertcat", tmp3);
8147 9a5ef4f632a3 Add class dispatch for [] operator to vertcat/horzcat methods David Bateman <dbateman@free.fr> parents: 8107 diff changeset	919
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	920 if (fcn.is_defined ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	921 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	922 tmp2 = fcn.do_multi_index_op (1, tmp3);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	923
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	924 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	925 retval = tmp2 (0);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	926 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	927 else
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 12125 diff changeset	928 ::error ("cannot find overloaded vertcat function");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	929 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	930 }
8147 9a5ef4f632a3 Add class dispatch for [] operator to vertcat/horzcat methods David Bateman <dbateman@free.fr> parents: 8107 diff changeset	931 else if (result_type == "double")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	932 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	933 if (any_sparse_p)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	934 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	935 if (all_real_p)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	936 retval = do_single_type_concat<SparseMatrix> (dv, tmp);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	937 else
10814 83896a06adaf don't skip narrowing when concatenating complex matrices Jaroslav Hajek <highegg@gmail.com> parents: 10764 diff changeset	938 retval = do_single_type_concat<SparseComplexMatrix> (dv, tmp);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	939 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	940 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	941 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	942 if (all_real_p)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	943 retval = do_single_type_concat<NDArray> (dv, tmp);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	944 else
10814 83896a06adaf don't skip narrowing when concatenating complex matrices Jaroslav Hajek <highegg@gmail.com> parents: 10764 diff changeset	945 retval = do_single_type_concat<ComplexNDArray> (dv, tmp);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	946 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	947 }
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	948 else if (result_type == "single")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	949 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	950 if (all_real_p)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	951 retval = do_single_type_concat<FloatNDArray> (dv, tmp);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	952 else
10814 83896a06adaf don't skip narrowing when concatenating complex matrices Jaroslav Hajek <highegg@gmail.com> parents: 10764 diff changeset	953 retval = do_single_type_concat<FloatComplexNDArray> (dv, tmp);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	954 }
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	955 else if (result_type == "char")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	956 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	957 char type = all_dq_strings_p ? '"' : '\'';
5280 25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	958
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	959 maybe_warn_string_concat (all_dq_strings_p, all_sq_strings_p);
5280 25c12c80ccc3 [project @ 2005-04-14 19:19:45 by jwe] jwe parents: 5275 diff changeset	960
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	961 charNDArray result (dv, Vstring_fill_char);
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	962
10535 3f973f6c841c improve sparse concatenation operator Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	963 single_type_concat<charNDArray> (result, tmp);
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	964
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	965 retval = octave_value (result, type);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	966 }
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	967 else if (result_type == "logical")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	968 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	969 if (any_sparse_p)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	970 retval = do_single_type_concat<SparseBoolMatrix> (dv, tmp);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	971 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	972 retval = do_single_type_concat<boolNDArray> (dv, tmp);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	973 }
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	974 else if (result_type == "int8")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	975 retval = do_single_type_concat<int8NDArray> (dv, tmp);
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	976 else if (result_type == "int16")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	977 retval = do_single_type_concat<int16NDArray> (dv, tmp);
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	978 else if (result_type == "int32")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	979 retval = do_single_type_concat<int32NDArray> (dv, tmp);
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	980 else if (result_type == "int64")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	981 retval = do_single_type_concat<int64NDArray> (dv, tmp);
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	982 else if (result_type == "uint8")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	983 retval = do_single_type_concat<uint8NDArray> (dv, tmp);
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	984 else if (result_type == "uint16")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	985 retval = do_single_type_concat<uint16NDArray> (dv, tmp);
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	986 else if (result_type == "uint32")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	987 retval = do_single_type_concat<uint32NDArray> (dv, tmp);
5533 667ad2becb63 [project @ 2005-11-10 21:40:48 by jwe] jwe parents: 5514 diff changeset	988 else if (result_type == "uint64")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	989 retval = do_single_type_concat<uint64NDArray> (dv, tmp);
10764 e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	990 else if (result_type == "cell")
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	991 retval = do_single_type_concat<Cell> (dv, tmp);
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	992 else if (result_type == "struct")
e141bcb1befd implement map concat optimizations for [] operator Jaroslav Hajek <highegg@gmail.com> parents: 10758 diff changeset	993 retval = do_single_type_concat<octave_map> (dv, tmp);
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4765 diff changeset	994 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	995 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	996 // The line below might seem crazy, since we take a copy of
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	997 // the first argument, resize it to be empty and then resize
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	998 // it to be full. This is done since it means that there is
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	999 // no recopying of data, as would happen if we used a single
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1000 // resize. It should be noted that resize operation is also
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1001 // significantly slower than the do_cat_op function, so it
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1002 // makes sense to have an empty matrix and copy all data.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1003 //
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1004 // We might also start with a empty octave_value using
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1005 //
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1006 // ctmp = octave_value_typeinfo::lookup_type
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1007 // (tmp.begin() -> begin() -> type_name());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1008 //
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1009 // and then directly resize. However, for some types there
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1010 // might be some additional setup needed, and so this should
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1011 // be avoided.
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	1012
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1013 octave_value ctmp;
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	1014
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1015 // Find the first non-empty object
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	1016
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1017 if (any_sparse_p)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1018 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1019 // Start with sparse matrix to avoid issues memory issues
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1020 // with things like [ones(1,4),sprandn(1e8,4,1e-4)]
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1021 if (all_real_p)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1022 ctmp = octave_sparse_matrix ().resize (dv);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1023 else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1024 ctmp = octave_sparse_complex_matrix ().resize (dv);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1025 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1026 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1027 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1028 for (tm_const::iterator p = tmp.begin (); p != tmp.end (); p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1029 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1030 octave_quit ();
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	1031
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1032 tm_row_const row = *p;
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	1033
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1034 for (tm_row_const::iterator q = row.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1035 q != row.end (); q++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1036 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1037 octave_quit ();
5630 512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5533 diff changeset	1038
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1039 ctmp = *q;
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5144 diff changeset	1040
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1041 if (! ctmp.all_zero_dims ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1042 goto found_non_empty;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1043 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1044 }
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5144 diff changeset	1045
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1046 ctmp = (*(tmp.begin() -> begin()));
5630 512d0d11ae39 [project @ 2006-02-20 22:05:30 by dbateman] dbateman parents: 5533 diff changeset	1047
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1048 found_non_empty:
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	1049
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1050 if (! all_empty_p)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1051 ctmp = ctmp.resize (dim_vector (0,0)).resize (dv);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1052 }
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4765 diff changeset	1053
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1054 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1055 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1056 // Now, extract the values from the individual elements and
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1057 // insert them in the result matrix.
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	1058
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1059 int dv_len = dv.length ();
11570 57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1060 octave_idx_type ntmp = dv_len > 1 ? dv_len : 2;
57632dea2446 attempt better backward compatibility for Array constructors John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1061 Array<octave_idx_type> ra_idx (dim_vector (ntmp, 1), 0);
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	1062
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1063 for (tm_const::iterator p = tmp.begin (); p != tmp.end (); p++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1064 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1065 octave_quit ();
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	1066
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1067 tm_row_const row = *p;
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	1068
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1069 for (tm_row_const::iterator q = row.begin ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1070 q != row.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1071 q++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1072 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1073 octave_quit ();
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	1074
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1075 octave_value elt = *q;
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	1076
10715 53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	1077 if (elt.is_empty ())
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	1078 continue;
53253f796351 make [] (hopefully) more Matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10535 diff changeset	1079
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1080 ctmp = do_cat_op (ctmp, elt, ra_idx);
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	1081
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1082 if (error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1083 goto done;
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	1084
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1085 ra_idx (1) += elt.columns ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1086 }
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	1087
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1088 ra_idx (0) += row.rows ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1089 ra_idx (1) = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1090 }
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	1091
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1092 retval = ctmp;
5502 dae5ba706ff2 [project @ 2005-10-20 06:37:30 by jwe] jwe parents: 5391 diff changeset	1093
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1094 if (frc_str_conv && ! retval.is_string ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1095 retval = retval.convert_to_str ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1096 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1097 }
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	1098 }
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	1099
1827 effa9400766f [project @ 1996-02-02 14:07:51 by jwe] jwe parents: 1742 diff changeset	1100 done:
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	1101 return retval;
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	1102 }
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	1103
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5794 diff changeset	1104 tree_expression *
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7336 diff changeset	1105 tree_matrix::dup (symbol_table::scope_id scope,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1106 symbol_table::context_id context) const
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5794 diff changeset	1107 {
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5794 diff changeset	1108 tree_matrix *new_matrix = new tree_matrix (0, line (), column ());
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5794 diff changeset	1109
8913 35cd375d4bb3 make tree::dup functions const John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	1110 for (const_iterator p = begin (); p != end (); p++)
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5794 diff changeset	1111 {
8913 35cd375d4bb3 make tree::dup functions const John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	1112 const tree_argument_list elt = p;
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5794 diff changeset	1113
7767 71f068b22fcc scope and context fixes for function handles John W. Eaton <jwe@octave.org> parents: 7336 diff changeset	1114 new_matrix->append (elt ? elt->dup (scope, context) : 0);
5861 2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5794 diff changeset	1115 }
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5794 diff changeset	1116
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5794 diff changeset	1117 new_matrix->copy_base (*this);
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5794 diff changeset	1118
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5794 diff changeset	1119 return new_matrix;
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5794 diff changeset	1120 }
2a6cb4ed8f1e [project @ 2006-06-16 05:09:41 by jwe] jwe parents: 5794 diff changeset	1121
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	1122 void
2124 97a566037a75 [project @ 1996-05-12 07:16:36 by jwe] jwe parents: 2086 diff changeset	1123 tree_matrix::accept (tree_walker& tw)
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	1124 {
2124 97a566037a75 [project @ 1996-05-12 07:16:36 by jwe] jwe parents: 2086 diff changeset	1125 tw.visit_matrix (*this);
1741 6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	1126 }
6ec1465f60f0 [project @ 1996-01-12 11:09:39 by jwe] jwe parents: diff changeset	1127
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5781 diff changeset	1128 DEFUN (string_fill_char, args, nargout,
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5781 diff changeset	1129 "-- texinfo --\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10814 diff changeset	1130 @deftypefn {Built-in Function} {@var{val} =} string_fill_char ()\n\
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5781 diff changeset	1131 @deftypefnx {Built-in Function} {@var{old_val} =} string_fill_char (@var{new_val})\n\
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5781 diff changeset	1132 Query or set the internal variable used to pad all rows of a character\n\
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5781 diff changeset	1133 matrix to the same length. It must be a single character. The default\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10814 diff changeset	1134 value is @code{\" \"} (a single space). For example:\n\
3361 4f40efa995c1 [project @ 1999-11-19 21:19:37 by jwe] jwe parents: 3333 diff changeset	1135 \n\
4f40efa995c1 [project @ 1999-11-19 21:19:37 by jwe] jwe parents: 3333 diff changeset	1136 @example\n\
4f40efa995c1 [project @ 1999-11-19 21:19:37 by jwe] jwe parents: 3333 diff changeset	1137 @group\n\
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5781 diff changeset	1138 string_fill_char (\"X\");\n\
3361 4f40efa995c1 [project @ 1999-11-19 21:19:37 by jwe] jwe parents: 3333 diff changeset	1139 [ \"these\"; \"are\"; \"strings\" ]\n\
4f40efa995c1 [project @ 1999-11-19 21:19:37 by jwe] jwe parents: 3333 diff changeset	1140 @result{} \"theseXX\"\n\
4f40efa995c1 [project @ 1999-11-19 21:19:37 by jwe] jwe parents: 3333 diff changeset	1141 \"areXXXX\"\n\
4f40efa995c1 [project @ 1999-11-19 21:19:37 by jwe] jwe parents: 3333 diff changeset	1142 \"strings\"\n\
4f40efa995c1 [project @ 1999-11-19 21:19:37 by jwe] jwe parents: 3333 diff changeset	1143 @end group\n\
4f40efa995c1 [project @ 1999-11-19 21:19:37 by jwe] jwe parents: 3333 diff changeset	1144 @end example\n\
5794 1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5781 diff changeset	1145 @end deftypefn")
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5781 diff changeset	1146 {
1138ced03f14 [project @ 2006-05-08 20:23:04 by jwe] jwe parents: 5781 diff changeset	1147 return SET_INTERNAL_VARIABLE (string_fill_char);
2172 0de32e614930 [project @ 1996-05-13 15:00:42 by jwe] jwe parents: 2124 diff changeset	1148 }
12842 a52b4e9f45e3 codesprint: new tests for pt-mat.cc John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	1149
a52b4e9f45e3 codesprint: new tests for pt-mat.cc John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	1150 /*
a52b4e9f45e3 codesprint: new tests for pt-mat.cc John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	1151 %!error (string_fill_char (1, 2));
a52b4e9f45e3 codesprint: new tests for pt-mat.cc John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	1152 %!test
a52b4e9f45e3 codesprint: new tests for pt-mat.cc John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	1153 %! orig_val = string_fill_char ();
a52b4e9f45e3 codesprint: new tests for pt-mat.cc John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	1154 %! old_val = string_fill_char ("X");
a52b4e9f45e3 codesprint: new tests for pt-mat.cc John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	1155 %! assert (orig_val, old_val);
a52b4e9f45e3 codesprint: new tests for pt-mat.cc John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	1156 %! assert (string_fill_char (), "X");
a52b4e9f45e3 codesprint: new tests for pt-mat.cc John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	1157 %! assert (["these"; "are"; "strings"], ["theseXX"; "areXXXX"; "strings"]);
a52b4e9f45e3 codesprint: new tests for pt-mat.cc John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	1158 %! string_fill_char (orig_val);
a52b4e9f45e3 codesprint: new tests for pt-mat.cc John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	1159 %! assert (string_fill_char (), orig_val);
a52b4e9f45e3 codesprint: new tests for pt-mat.cc John W. Eaton <jwe@octave.org> parents: 12483 diff changeset	1160 */

Mercurial > hg > octave-nkf

annotate src/pt-mat.cc @ 12842:a52b4e9f45e3