Mercurial > hg > octave-lyh

annotate src/pt-mat.cc @ 10764:e141bcb1befd

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