Mercurial > octave
annotate src/ov-cell.cc @ 8733:3ef774603887
rename all uses of sortrows_idx to sort_rows_idx
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 12 Feb 2009 15:16:35 -0500 |
parents | a669df7beb73 |
children | af907aeedbf4 |
rev | line source |
---|---|
3353 | 1 /* |
2 | |
7017 | 3 Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007 |
4 John W. Eaton | |
3353 | 5 |
6 This file is part of Octave. | |
7 | |
8 Octave is free software; you can redistribute it and/or modify it | |
9 under the terms of the GNU General Public License as published by the | |
7016 | 10 Free Software Foundation; either version 3 of the License, or (at your |
11 option) any later version. | |
3353 | 12 |
13 Octave is distributed in the hope that it will be useful, but WITHOUT | |
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
16 for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
7016 | 19 along with Octave; see the file COPYING. If not, see |
20 <http://www.gnu.org/licenses/>. | |
3353 | 21 |
22 */ | |
23 | |
24 #ifdef HAVE_CONFIG_H | |
25 #include <config.h> | |
26 #endif | |
27 | |
5850 | 28 #include <iomanip> |
3503 | 29 #include <iostream> |
5765 | 30 #include <sstream> |
5164 | 31 #include <vector> |
3353 | 32 |
5360 | 33 #include "Array-util.h" |
34 #include "byte-swap.h" | |
3353 | 35 #include "lo-utils.h" |
4153 | 36 #include "quit.h" |
8377
25bc2d31e1bf
improve OCTAVE_LOCAL_BUFFER
Jaroslav Hajek <highegg@gmail.com>
parents:
8290
diff
changeset
|
37 #include "oct-locbuf.h" |
3353 | 38 |
39 #include "defun.h" | |
40 #include "error.h" | |
41 #include "ov-cell.h" | |
3354 | 42 #include "oct-obj.h" |
3353 | 43 #include "unwind-prot.h" |
3354 | 44 #include "utils.h" |
3928 | 45 #include "ov-base-mat.h" |
46 #include "ov-base-mat.cc" | |
47 #include "ov-re-mat.h" | |
48 #include "ov-scalar.h" | |
5360 | 49 #include "pr-output.h" |
50 #include "ov-scalar.h" | |
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8551
diff
changeset
|
51 #include "gripes.h" |
3928 | 52 |
4687 | 53 #include "ls-oct-ascii.h" |
54 #include "ls-oct-binary.h" | |
55 #include "ls-hdf5.h" | |
56 #include "ls-utils.h" | |
57 | |
8679
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
58 // Cell is able to handle octave_value indexing by itself, so just forward |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
59 // everything. |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
60 |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
61 template <> |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
62 octave_value |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
63 octave_base_matrix<Cell>::do_index_op (const octave_value_list& idx, |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
64 bool resize_ok) |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
65 { |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
66 return matrix.index (idx, resize_ok); |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
67 } |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
68 |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
69 template <> |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
70 void |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
71 octave_base_matrix<Cell>::assign (const octave_value_list& idx, const Cell& rhs) |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
72 { |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
73 matrix.assign (idx, rhs); |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
74 } |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
75 |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
76 template <> |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
77 void |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
78 octave_base_matrix<Cell>::assign (const octave_value_list& idx, octave_value rhs) |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
79 { |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
80 // FIXME: Really? |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
81 if (rhs.is_cell ()) |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
82 matrix.assign (idx, rhs.cell_value ()); |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
83 else |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
84 matrix.assign (idx, Cell (rhs)); |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
85 } |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
86 |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
87 template <> |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
88 void |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
89 octave_base_matrix<Cell>::delete_elements (const octave_value_list& idx) |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
90 { |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
91 matrix.delete_elements (idx); |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
92 } |
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8626
diff
changeset
|
93 |
3928 | 94 template class octave_base_matrix<Cell>; |
3353 | 95 |
96 DEFINE_OCTAVE_ALLOCATOR (octave_cell); | |
97 | |
4612 | 98 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_cell, "cell", "cell"); |
3353 | 99 |
6833 | 100 static void |
101 gripe_failed_assignment (void) | |
102 { | |
103 error ("assignment to cell array failed"); | |
104 } | |
105 | |
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7622
diff
changeset
|
106 octave_value_list |
4247 | 107 octave_cell::subsref (const std::string& type, |
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7622
diff
changeset
|
108 const std::list<octave_value_list>& idx, |
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7622
diff
changeset
|
109 int nargout) |
3933 | 110 { |
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7622
diff
changeset
|
111 octave_value_list retval; |
3933 | 112 |
113 switch (type[0]) | |
114 { | |
115 case '(': | |
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7622
diff
changeset
|
116 retval(0) = do_index_op (idx.front ()); |
3933 | 117 break; |
118 | |
119 case '{': | |
120 { | |
121 octave_value tmp = do_index_op (idx.front ()); | |
122 | |
4582 | 123 if (! error_state) |
3933 | 124 { |
4582 | 125 Cell tcell = tmp.cell_value (); |
126 | |
127 if (tcell.length () == 1) | |
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7622
diff
changeset
|
128 retval(0) = tcell(0,0); |
4582 | 129 else |
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
130 retval = octave_value (octave_value_list (tcell), true); |
3933 | 131 } |
132 } | |
133 break; | |
134 | |
135 case '.': | |
136 { | |
137 std::string nm = type_name (); | |
138 error ("%s cannot be indexed with %c", nm.c_str (), type[0]); | |
139 } | |
140 break; | |
141 | |
142 default: | |
143 panic_impossible (); | |
144 } | |
145 | |
5775 | 146 // FIXME -- perhaps there should be an |
4994 | 147 // octave_value_list::next_subsref member function? See also |
148 // octave_user_function::subsref. | |
149 | |
150 if (idx.size () > 1) | |
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7622
diff
changeset
|
151 retval = retval(0).next_subsref (nargout, type, idx); |
4994 | 152 |
153 return retval; | |
3933 | 154 } |
155 | |
156 octave_value | |
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
157 octave_cell::subsref (const std::string& type, |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
158 const std::list<octave_value_list>& idx, |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
159 bool auto_add) |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
160 { |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
161 octave_value retval; |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
162 |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
163 switch (type[0]) |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
164 { |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
165 case '(': |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
166 retval = do_index_op (idx.front (), auto_add); |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
167 break; |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
168 |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
169 case '{': |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
170 { |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
171 octave_value tmp = do_index_op (idx.front (), auto_add); |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
172 |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
173 if (! error_state) |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
174 { |
8580
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
175 const Cell tcell = tmp.cell_value (); |
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
176 |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
177 if (tcell.length () == 1) |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
178 retval = tcell(0,0); |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
179 else |
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8551
diff
changeset
|
180 retval = octave_value (octave_value_list (tcell), true); |
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
181 } |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
182 } |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
183 break; |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
184 |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
185 case '.': |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
186 { |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
187 std::string nm = type_name (); |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
188 error ("%s cannot be indexed with %c", nm.c_str (), type[0]); |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
189 } |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
190 break; |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
191 |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
192 default: |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
193 panic_impossible (); |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
194 } |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
195 |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
196 // FIXME -- perhaps there should be an |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
197 // octave_value_list::next_subsref member function? See also |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
198 // octave_user_function::subsref. |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
199 |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
200 if (idx.size () > 1) |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
201 retval = retval.next_subsref (auto_add, type, idx); |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
202 |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
203 return retval; |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
204 } |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
205 |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
206 octave_value |
4247 | 207 octave_cell::subsasgn (const std::string& type, |
4219 | 208 const std::list<octave_value_list>& idx, |
3933 | 209 const octave_value& rhs) |
210 { | |
211 octave_value retval; | |
212 | |
213 int n = type.length (); | |
214 | |
215 octave_value t_rhs = rhs; | |
216 | |
217 if (n > 1) | |
218 { | |
219 switch (type[0]) | |
220 { | |
221 case '(': | |
222 { | |
6767 | 223 if (is_empty () && type[1] == '.') |
224 { | |
225 // Allow conversion of empty cell array to some other | |
226 // type in cases like | |
227 // | |
228 // x = []; x(i).f = rhs | |
3933 | 229 |
6767 | 230 octave_value tmp = octave_value::empty_conv (type, rhs); |
3933 | 231 |
6767 | 232 return tmp.subsasgn (type, idx, rhs); |
233 } | |
234 else | |
3933 | 235 { |
6767 | 236 octave_value tmp = do_index_op (idx.front (), true); |
3933 | 237 |
6767 | 238 if (! tmp.is_defined ()) |
239 tmp = octave_value::empty_conv (type.substr (1), rhs); | |
3933 | 240 |
6767 | 241 if (! error_state) |
242 { | |
243 std::list<octave_value_list> next_idx (idx); | |
4362 | 244 |
6767 | 245 next_idx.erase (next_idx.begin ()); |
246 | |
247 tmp.make_unique (); | |
248 | |
249 t_rhs = tmp.subsasgn (type.substr (1), next_idx, rhs); | |
250 } | |
3933 | 251 } |
252 } | |
253 break; | |
254 | |
255 case '{': | |
256 { | |
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
257 Cell tmpc = matrix.index (idx.front (), true); |
3933 | 258 |
4362 | 259 if (! error_state) |
260 { | |
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
261 std::list<octave_value_list> next_idx (idx); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
262 |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
263 next_idx.erase (next_idx.begin ()); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
264 |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
265 std::string next_type = type.substr (1); |
3933 | 266 |
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8551
diff
changeset
|
267 if (tmpc.numel () == 1) |
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
268 { |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
269 octave_value tmp = tmpc(0); |
8580
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
270 tmpc = Cell (); |
3933 | 271 |
5927 | 272 if (! tmp.is_defined () || tmp.is_zero_by_zero ()) |
8580
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
273 { |
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
274 tmp = octave_value::empty_conv (type.substr (1), rhs); |
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
275 tmp.make_unique (); // probably a no-op. |
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
276 } |
8452
d6a349c7bd39
fix {} assigment if error occurs on subsequent assignment component
Jaroslav Hajek <highegg@gmail.com>
parents:
8446
diff
changeset
|
277 else |
8580
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
278 // optimization: ignore the copy still stored inside our array. |
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
279 tmp.make_unique (1); |
4519 | 280 |
281 if (! error_state) | |
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
282 t_rhs = tmp.subsasgn (next_type, next_idx, rhs); |
4362 | 283 } |
8446
7b25349b32e6
avoid redundant copying in {} assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
284 else |
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8551
diff
changeset
|
285 gripe_indexed_cs_list (); |
3933 | 286 } |
287 } | |
288 break; | |
289 | |
290 case '.': | |
291 { | |
292 std::string nm = type_name (); | |
293 error ("%s cannot be indexed with %c", nm.c_str (), type[0]); | |
294 } | |
295 break; | |
296 | |
297 default: | |
298 panic_impossible (); | |
299 } | |
300 } | |
301 | |
3940 | 302 if (! error_state) |
3933 | 303 { |
3940 | 304 switch (type[0]) |
305 { | |
306 case '(': | |
307 { | |
308 octave_value_list i = idx.front (); | |
3933 | 309 |
3940 | 310 if (t_rhs.is_cell ()) |
311 octave_base_matrix<Cell>::assign (i, t_rhs.cell_value ()); | |
312 else | |
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7813
diff
changeset
|
313 if (t_rhs.is_null_value ()) |
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7813
diff
changeset
|
314 octave_base_matrix<Cell>::delete_elements (i); |
4941 | 315 else |
316 octave_base_matrix<Cell>::assign (i, Cell (t_rhs)); | |
3933 | 317 |
6833 | 318 if (! error_state) |
319 { | |
320 count++; | |
321 retval = octave_value (this); | |
322 } | |
323 else | |
324 gripe_failed_assignment (); | |
3940 | 325 } |
326 break; | |
3933 | 327 |
3940 | 328 case '{': |
329 { | |
8587
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
330 octave_value_list idxf = idx.front (); |
3933 | 331 |
5846 | 332 if (t_rhs.is_cs_list ()) |
333 { | |
334 Cell tmp_cell = Cell (t_rhs.list_value ()); | |
335 | |
8587
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
336 // Inquire the proper shape of the RHS. |
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
337 |
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
338 dim_vector didx = dims ().redim (idxf.length ()); |
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
339 for (octave_idx_type k = 0; k < idxf.length (); k++) |
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
340 if (! idxf(k).is_magic_colon ()) didx(k) = idxf(k).numel (); |
7040 | 341 |
8587
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
342 if (didx.numel () == tmp_cell.numel ()) |
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
343 tmp_cell = tmp_cell.reshape (didx); |
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
344 |
5846 | 345 |
8587
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
346 octave_base_matrix<Cell>::assign (idxf, tmp_cell); |
5846 | 347 } |
8587
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
348 else if (idxf.all_scalars () || do_index_op (idxf, true).numel () == 1) |
8455
fd11a08a9b31
disallow invalid {}-indexed assigments
Jaroslav Hajek <highegg@gmail.com>
parents:
8452
diff
changeset
|
349 // Regularize a null matrix if stored into a cell. |
8587
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
350 octave_base_matrix<Cell>::assign (idxf, Cell (t_rhs.storable_value ())); |
8455
fd11a08a9b31
disallow invalid {}-indexed assigments
Jaroslav Hajek <highegg@gmail.com>
parents:
8452
diff
changeset
|
351 else if (! error_state) |
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
352 error ("invalid assignment to cs-list outside multiple assignment."); |
3933 | 353 |
6833 | 354 if (! error_state) |
355 { | |
356 count++; | |
357 retval = octave_value (this); | |
358 } | |
359 else | |
360 gripe_failed_assignment (); | |
3940 | 361 } |
362 break; | |
3933 | 363 |
3940 | 364 case '.': |
365 { | |
366 std::string nm = type_name (); | |
367 error ("%s cannot be indexed with %c", nm.c_str (), type[0]); | |
368 } | |
369 break; | |
3933 | 370 |
3940 | 371 default: |
372 panic_impossible (); | |
373 } | |
3933 | 374 } |
375 | |
376 return retval; | |
377 } | |
378 | |
4791 | 379 size_t |
380 octave_cell::byte_size (void) const | |
381 { | |
382 size_t retval = 0; | |
383 | |
5275 | 384 for (octave_idx_type i = 0; i < numel (); i++) |
4791 | 385 retval += matrix(i).byte_size (); |
386 | |
387 return retval; | |
388 } | |
389 | |
8732 | 390 octave_value |
391 octave_cell::sort (octave_idx_type dim, sortmode mode) const | |
392 { | |
393 octave_value retval; | |
394 | |
395 if (is_cellstr ()) | |
396 { | |
397 Array<std::string> tmp = cellstr_value (); | |
398 | |
399 retval = Cell (tmp.sort (dim, mode)); | |
400 } | |
401 else | |
402 error ("sort: only cell arrays of character strings may be sorted"); | |
403 | |
404 return retval; | |
405 } | |
406 | |
407 octave_value | |
408 octave_cell::sort (Array<octave_idx_type> &sidx, octave_idx_type dim, | |
409 sortmode mode) const | |
410 { | |
411 octave_value retval; | |
412 | |
413 if (is_cellstr ()) | |
414 { | |
415 Array<std::string> tmp = cellstr_value (); | |
416 | |
417 retval = Cell (tmp.sort (sidx, dim, mode)); | |
418 } | |
419 else | |
420 error ("sort: only cell arrays of character strings may be sorted"); | |
421 | |
422 return retval; | |
423 } | |
424 | |
425 Array<octave_idx_type> | |
8733
3ef774603887
rename all uses of sortrows_idx to sort_rows_idx
John W. Eaton <jwe@octave.org>
parents:
8732
diff
changeset
|
426 octave_cell::sort_rows_idx (sortmode mode) const |
8732 | 427 { |
428 Array<octave_idx_type> retval; | |
429 | |
430 if (is_cellstr ()) | |
431 { | |
432 Array<std::string> tmp = cellstr_value (); | |
433 | |
434 retval = tmp.sort_rows_idx (mode); | |
435 } | |
436 else | |
437 error ("sortrows: only cell arrays of character strings may be sorted"); | |
438 | |
439 return retval; | |
440 } | |
441 | |
8626
1dce30ab0e72
don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents:
8587
diff
changeset
|
442 bool |
1dce30ab0e72
don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents:
8587
diff
changeset
|
443 octave_cell::is_true (void) const |
1dce30ab0e72
don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents:
8587
diff
changeset
|
444 { |
1dce30ab0e72
don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents:
8587
diff
changeset
|
445 error ("invalid conversion from cell array to logical value"); |
1dce30ab0e72
don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents:
8587
diff
changeset
|
446 return false; |
1dce30ab0e72
don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents:
8587
diff
changeset
|
447 } |
1dce30ab0e72
don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents:
8587
diff
changeset
|
448 |
3933 | 449 octave_value_list |
450 octave_cell::list_value (void) const | |
451 { | |
8580
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
452 return octave_value_list (matrix); |
3933 | 453 } |
454 | |
4243 | 455 string_vector |
5715 | 456 octave_cell::all_strings (bool pad) const |
4243 | 457 { |
4358 | 458 string_vector retval; |
459 | |
7285 | 460 octave_idx_type nel = numel (); |
4243 | 461 |
4358 | 462 int n_elts = 0; |
463 | |
5275 | 464 octave_idx_type max_len = 0; |
4358 | 465 |
7285 | 466 for (octave_idx_type i = 0; i < nel; i++) |
4358 | 467 { |
7285 | 468 string_vector s = matrix(i).all_strings (); |
469 | |
470 if (error_state) | |
471 return retval; | |
4358 | 472 |
7285 | 473 octave_idx_type s_len = s.length (); |
4358 | 474 |
7285 | 475 n_elts += s_len ? s_len : 1; |
4358 | 476 |
7285 | 477 octave_idx_type s_max_len = s.max_length (); |
4358 | 478 |
7285 | 479 if (s_max_len > max_len) |
480 max_len = s_max_len; | |
4358 | 481 } |
482 | |
483 retval.resize (n_elts); | |
4243 | 484 |
5275 | 485 octave_idx_type k = 0; |
4243 | 486 |
7285 | 487 for (octave_idx_type i = 0; i < nel; i++) |
4243 | 488 { |
7285 | 489 string_vector s = matrix(i).all_strings (); |
490 | |
491 octave_idx_type s_len = s.length (); | |
4358 | 492 |
7285 | 493 if (s_len) |
494 { | |
495 for (octave_idx_type j = 0; j < s_len; j++) | |
5715 | 496 { |
7285 | 497 std::string t = s[j]; |
5715 | 498 int t_len = t.length (); |
499 | |
500 if (pad && max_len > t_len) | |
501 t += std::string (max_len - t_len, ' '); | |
502 | |
503 retval[k++] = t; | |
504 } | |
4243 | 505 } |
7285 | 506 else if (pad) |
507 retval[k++] = std::string (max_len, ' '); | |
508 else | |
509 retval[k++] = std::string (); | |
4243 | 510 } |
511 | |
512 return retval; | |
513 } | |
514 | |
8732 | 515 Array<std::string> |
516 octave_cell::cellstr_value (void) const | |
517 { | |
518 Array<std::string> retval (dims ()); | |
519 | |
520 if (is_cellstr ()) | |
521 { | |
522 octave_idx_type n = numel (); | |
523 | |
524 std::string *dst = retval.fortran_vec (); | |
525 const octave_value *src = matrix.data (); | |
526 | |
527 for (octave_idx_type i = 0; i < n; i++) | |
528 dst[i] = src[i].string_value (); | |
529 } | |
530 else | |
531 error ("invalid conversion from cell array to Array<std::string>"); | |
532 | |
533 return retval; | |
534 } | |
535 | |
4604 | 536 bool |
537 octave_cell::print_as_scalar (void) const | |
538 { | |
539 return (ndims () > 2 || numel () == 0); | |
540 } | |
541 | |
3933 | 542 void |
543 octave_cell::print (std::ostream& os, bool) const | |
544 { | |
545 print_raw (os); | |
546 } | |
547 | |
548 void | |
549 octave_cell::print_raw (std::ostream& os, bool) const | |
550 { | |
4587 | 551 int nd = matrix.ndims (); |
4513 | 552 |
4587 | 553 if (nd == 2) |
4513 | 554 { |
5275 | 555 octave_idx_type nr = rows (); |
556 octave_idx_type nc = columns (); | |
4513 | 557 |
558 if (nr > 0 && nc > 0) | |
559 { | |
560 indent (os); | |
561 os << "{"; | |
562 newline (os); | |
563 | |
564 increment_indent_level (); | |
565 | |
5275 | 566 for (octave_idx_type j = 0; j < nc; j++) |
4513 | 567 { |
5275 | 568 for (octave_idx_type i = 0; i < nr; i++) |
4513 | 569 { |
570 OCTAVE_QUIT; | |
571 | |
5765 | 572 std::ostringstream buf; |
573 buf << "[" << i+1 << "," << j+1 << "]"; | |
3933 | 574 |
4513 | 575 octave_value val = matrix(i,j); |
576 | |
5765 | 577 val.print_with_name (os, buf.str ()); |
4513 | 578 } |
579 } | |
580 | |
581 decrement_indent_level (); | |
582 | |
583 indent (os); | |
584 os << "}"; | |
585 newline (os); | |
586 } | |
587 else | |
588 { | |
589 os << "{}"; | |
5360 | 590 if (Vprint_empty_dimensions) |
4513 | 591 os << "(" << nr << "x" << nc << ")"; |
592 os << "\n"; | |
593 } | |
594 } | |
595 else | |
3933 | 596 { |
597 indent (os); | |
4513 | 598 dim_vector dv = matrix.dims (); |
4587 | 599 os << "{" << dv.str () << " Cell Array}"; |
3933 | 600 newline (os); |
601 } | |
602 } | |
603 | |
4687 | 604 #define CELL_ELT_TAG "<cell-element>" |
605 | |
606 bool | |
6974 | 607 octave_cell::save_ascii (std::ostream& os) |
4687 | 608 { |
609 dim_vector d = dims (); | |
610 if (d.length () > 2) | |
611 { | |
612 os << "# ndims: " << d.length () << "\n"; | |
613 | |
5275 | 614 for (int i = 0; i < d.length (); i++) |
4687 | 615 os << " " << d (i); |
616 os << "\n"; | |
617 | |
618 Cell tmp = cell_value (); | |
619 | |
5275 | 620 for (octave_idx_type i = 0; i < d.numel (); i++) |
4687 | 621 { |
622 octave_value o_val = tmp.elem (i); | |
623 | |
624 // Recurse to print sub-value. | |
6974 | 625 bool b = save_ascii_data (os, o_val, CELL_ELT_TAG, false, 0); |
4687 | 626 |
627 if (! b) | |
628 return os; | |
629 } | |
630 } | |
631 else | |
632 { | |
633 // Keep this case, rather than use generic code above for backward | |
634 // compatiability. Makes load_ascii much more complex!! | |
635 os << "# rows: " << rows () << "\n" | |
636 << "# columns: " << columns () << "\n"; | |
637 | |
638 Cell tmp = cell_value (); | |
639 | |
5275 | 640 for (octave_idx_type j = 0; j < tmp.cols (); j++) |
4687 | 641 { |
5275 | 642 for (octave_idx_type i = 0; i < tmp.rows (); i++) |
4687 | 643 { |
644 octave_value o_val = tmp.elem (i, j); | |
645 | |
646 // Recurse to print sub-value. | |
6974 | 647 bool b = save_ascii_data (os, o_val, CELL_ELT_TAG, false, 0); |
4687 | 648 |
649 if (! b) | |
650 return os; | |
651 } | |
652 | |
653 os << "\n"; | |
654 } | |
655 } | |
656 | |
657 return true; | |
658 } | |
659 | |
660 bool | |
661 octave_cell::load_ascii (std::istream& is) | |
662 { | |
663 bool success = true; | |
5099 | 664 |
665 string_vector keywords(2); | |
4687 | 666 |
5099 | 667 keywords[0] = "ndims"; |
668 keywords[1] = "rows"; | |
669 | |
670 std::string kw; | |
5275 | 671 octave_idx_type val = 0; |
5099 | 672 |
673 if (extract_keyword (is, keywords, kw, val, true)) | |
4687 | 674 { |
5099 | 675 if (kw == "ndims") |
4687 | 676 { |
5275 | 677 int mdims = static_cast<int> (val); |
4687 | 678 |
5099 | 679 if (mdims >= 0) |
680 { | |
681 dim_vector dv; | |
682 dv.resize (mdims); | |
683 | |
684 for (int i = 0; i < mdims; i++) | |
685 is >> dv(i); | |
4687 | 686 |
5099 | 687 Cell tmp(dv); |
4687 | 688 |
5275 | 689 for (octave_idx_type i = 0; i < dv.numel (); i++) |
5099 | 690 { |
691 octave_value t2; | |
692 bool dummy; | |
693 | |
694 // recurse to read cell elements | |
695 std::string nm = read_ascii_data (is, std::string (), | |
5759 | 696 dummy, t2, i); |
4687 | 697 |
5099 | 698 if (nm == CELL_ELT_TAG) |
699 { | |
700 if (is) | |
701 tmp.elem (i) = t2; | |
702 } | |
703 else | |
704 { | |
705 error ("load: cell array element had unexpected name"); | |
706 success = false; | |
707 break; | |
708 } | |
709 } | |
4687 | 710 |
5099 | 711 if (is) |
712 matrix = tmp; | |
4687 | 713 else |
714 { | |
5099 | 715 error ("load: failed to load matrix constant"); |
4687 | 716 success = false; |
717 } | |
718 } | |
719 else | |
720 { | |
5099 | 721 error ("load: failed to extract number of rows and columns"); |
722 success = false; | |
723 } | |
724 } | |
725 else if (kw == "rows") | |
726 { | |
5275 | 727 octave_idx_type nr = val; |
728 octave_idx_type nc = 0; | |
5099 | 729 |
730 if (nr >= 0 && extract_keyword (is, "columns", nc) && nc >= 0) | |
731 { | |
732 if (nr > 0 && nc > 0) | |
733 { | |
734 Cell tmp (nr, nc); | |
735 | |
5275 | 736 for (octave_idx_type j = 0; j < nc; j++) |
5099 | 737 { |
5275 | 738 for (octave_idx_type i = 0; i < nr; i++) |
5099 | 739 { |
740 octave_value t2; | |
741 bool dummy; | |
742 | |
743 // recurse to read cell elements | |
744 std::string nm = read_ascii_data (is, std::string (), | |
5759 | 745 dummy, t2, i); |
5099 | 746 |
747 if (nm == CELL_ELT_TAG) | |
748 { | |
749 if (is) | |
750 tmp.elem (i, j) = t2; | |
751 } | |
752 else | |
753 { | |
754 error ("load: cell array element had unexpected name"); | |
755 success = false; | |
756 goto cell_read_error; | |
757 } | |
758 } | |
759 } | |
760 | |
761 cell_read_error: | |
762 | |
763 if (is) | |
764 matrix = tmp; | |
765 else | |
766 { | |
767 error ("load: failed to load cell element"); | |
768 success = false; | |
769 } | |
770 } | |
771 else if (nr == 0 || nc == 0) | |
772 matrix = Cell (nr, nc); | |
773 else | |
774 panic_impossible (); | |
775 } | |
776 else | |
777 { | |
778 error ("load: failed to extract number of rows and columns for cell array"); | |
4687 | 779 success = false; |
780 } | |
781 } | |
782 else | |
5099 | 783 panic_impossible (); |
4687 | 784 } |
785 else | |
786 { | |
5099 | 787 error ("load: failed to extract number of rows and columns"); |
788 success = false; | |
4687 | 789 } |
790 | |
791 return success; | |
792 } | |
793 | |
794 bool | |
795 octave_cell::save_binary (std::ostream& os, bool& save_as_floats) | |
796 { | |
797 dim_vector d = dims (); | |
798 if (d.length () < 1) | |
799 return false; | |
800 | |
801 // Use negative value for ndims | |
5828 | 802 int32_t di = - d.length(); |
5760 | 803 os.write (reinterpret_cast<char *> (&di), 4); |
5275 | 804 for (int i = 0; i < d.length (); i++) |
4687 | 805 { |
806 di = d(i); | |
5760 | 807 os.write (reinterpret_cast<char *> (&di), 4); |
4687 | 808 } |
809 | |
810 Cell tmp = cell_value (); | |
811 | |
5275 | 812 for (octave_idx_type i = 0; i < d.numel (); i++) |
4687 | 813 { |
814 octave_value o_val = tmp.elem (i); | |
815 | |
816 // Recurse to print sub-value. | |
817 bool b = save_binary_data (os, o_val, CELL_ELT_TAG, "", 0, | |
818 save_as_floats); | |
819 | |
820 if (! b) | |
821 return false; | |
822 } | |
823 | |
824 return true; | |
825 } | |
826 | |
827 bool | |
828 octave_cell::load_binary (std::istream& is, bool swap, | |
829 oct_mach_info::float_format fmt) | |
830 { | |
831 bool success = true; | |
5828 | 832 int32_t mdims; |
5760 | 833 if (! is.read (reinterpret_cast<char *> (&mdims), 4)) |
4687 | 834 return false; |
835 if (swap) | |
4944 | 836 swap_bytes<4> (&mdims); |
4687 | 837 if (mdims >= 0) |
838 return false; | |
839 | |
840 mdims = -mdims; | |
5828 | 841 int32_t di; |
4687 | 842 dim_vector dv; |
843 dv.resize (mdims); | |
844 | |
845 for (int i = 0; i < mdims; i++) | |
846 { | |
5760 | 847 if (! is.read (reinterpret_cast<char *> (&di), 4)) |
4687 | 848 return false; |
849 if (swap) | |
4944 | 850 swap_bytes<4> (&di); |
4687 | 851 dv(i) = di; |
852 } | |
853 | |
5157 | 854 // Convert an array with a single dimension to be a row vector. |
855 // Octave should never write files like this, other software | |
856 // might. | |
857 | |
858 if (mdims == 1) | |
859 { | |
860 mdims = 2; | |
861 dv.resize (mdims); | |
862 dv(1) = dv(0); | |
863 dv(0) = 1; | |
864 } | |
865 | |
5275 | 866 octave_idx_type nel = dv.numel (); |
4687 | 867 Cell tmp(dv); |
868 | |
5275 | 869 for (octave_idx_type i = 0; i < nel; i++) |
4687 | 870 { |
871 octave_value t2; | |
872 bool dummy; | |
873 std::string doc; | |
874 | |
875 // recurse to read cell elements | |
876 std::string nm = read_binary_data (is, swap, fmt, std::string (), | |
877 dummy, t2, doc); | |
878 | |
879 if (nm == CELL_ELT_TAG) | |
880 { | |
881 if (is) | |
882 tmp.elem (i) = t2; | |
883 } | |
884 else | |
885 { | |
886 error ("load: cell array element had unexpected name"); | |
887 success = false; | |
888 break; | |
889 } | |
890 } | |
891 | |
892 if (is) | |
893 matrix = tmp; | |
894 else | |
895 { | |
896 error ("load: failed to load matrix constant"); | |
897 success = false; | |
898 } | |
899 | |
900 return success; | |
901 } | |
902 | |
903 #if defined (HAVE_HDF5) | |
4815 | 904 |
4687 | 905 bool |
906 octave_cell::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) | |
907 { | |
4814 | 908 dim_vector dv = dims (); |
4837 | 909 int empty = save_hdf5_empty (loc_id, name, dv); |
910 if (empty) | |
911 return (empty > 0); | |
912 | |
4815 | 913 hsize_t rank = dv.length (); |
4687 | 914 hid_t space_hid = -1, data_hid = -1, size_hid = -1; |
915 | |
916 data_hid = H5Gcreate (loc_id, name, 0); | |
4815 | 917 |
918 if (data_hid < 0) | |
919 return false; | |
4687 | 920 |
4814 | 921 // Have to save cell array shape, since can't have a |
922 // dataset of groups.... | |
4815 | 923 |
924 space_hid = H5Screate_simple (1, &rank, 0); | |
925 | |
4687 | 926 if (space_hid < 0) |
927 { | |
928 H5Gclose (data_hid); | |
929 return false; | |
930 } | |
931 | |
5351 | 932 OCTAVE_LOCAL_BUFFER (octave_idx_type, hdims, rank); |
4814 | 933 |
934 // Octave uses column-major, while HDF5 uses row-major ordering | |
4933 | 935 for (hsize_t i = 0; i < rank; i++) |
4815 | 936 hdims[i] = dv(rank-i-1); |
4814 | 937 |
5351 | 938 size_hid = H5Dcreate (data_hid, "dims", H5T_NATIVE_IDX, space_hid, |
4687 | 939 H5P_DEFAULT); |
940 if (size_hid < 0) | |
941 { | |
942 H5Sclose (space_hid); | |
943 H5Gclose (data_hid); | |
944 return false; | |
945 } | |
946 | |
6276 | 947 if (H5Dwrite (size_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, |
948 H5P_DEFAULT, hdims) < 0) | |
4687 | 949 { |
950 H5Dclose (size_hid); | |
951 H5Sclose (space_hid); | |
952 H5Gclose (data_hid); | |
953 return false; | |
954 } | |
4815 | 955 |
4687 | 956 H5Dclose (size_hid); |
957 H5Sclose (space_hid); | |
958 | |
4815 | 959 // Recursively add each element of the cell to this group. |
960 | |
4687 | 961 Cell tmp = cell_value (); |
5850 | 962 |
963 octave_idx_type nel = dv.numel (); | |
964 | |
965 for (octave_idx_type i = 0; i < nel; i++) | |
4687 | 966 { |
5765 | 967 std::ostringstream buf; |
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7285
diff
changeset
|
968 int digits = static_cast<int> (::floor (::log10 (static_cast<double> (nel)) + 1.0)); |
5850 | 969 buf << "_" << std::setw (digits) << std::setfill ('0') << i; |
5765 | 970 std::string s = buf.str (); |
4687 | 971 |
5850 | 972 if (! add_hdf5_data (data_hid, tmp.elem (i), s.c_str (), "", false, |
973 save_as_floats)) | |
4814 | 974 { |
975 H5Gclose (data_hid); | |
976 return false; | |
4687 | 977 } |
978 } | |
979 | |
980 H5Gclose (data_hid); | |
4815 | 981 |
4687 | 982 return true; |
983 } | |
984 | |
985 bool | |
986 octave_cell::load_hdf5 (hid_t loc_id, const char *name, | |
987 bool have_h5giterate_bug) | |
988 { | |
989 bool retval = false; | |
4837 | 990 |
991 dim_vector dv; | |
992 int empty = load_hdf5_empty (loc_id, name, dv); | |
993 if (empty > 0) | |
994 matrix.resize(dv); | |
995 if (empty) | |
996 return (empty > 0); | |
997 | |
4687 | 998 hid_t group_id = H5Gopen (loc_id, name); |
999 | |
1000 if (group_id < 0) | |
1001 return false; | |
1002 | |
4814 | 1003 hid_t data_hid = H5Dopen (group_id, "dims"); |
4687 | 1004 hid_t space_hid = H5Dget_space (data_hid); |
1005 hsize_t rank = H5Sget_simple_extent_ndims (space_hid); | |
4814 | 1006 if (rank != 1) |
4687 | 1007 { |
4837 | 1008 H5Dclose (data_hid); |
1009 H5Gclose (group_id); | |
4687 | 1010 return false; |
1011 } | |
1012 | |
4814 | 1013 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank); |
1014 OCTAVE_LOCAL_BUFFER (hsize_t, maxdims, rank); | |
4815 | 1015 |
4814 | 1016 H5Sget_simple_extent_dims (space_hid, hdims, maxdims); |
4687 | 1017 |
4815 | 1018 // Octave uses column-major, while HDF5 uses row-major ordering. |
1019 | |
4814 | 1020 dv.resize (hdims[0]); |
4815 | 1021 |
5351 | 1022 OCTAVE_LOCAL_BUFFER (octave_idx_type, tmp, hdims[0]); |
4814 | 1023 |
5351 | 1024 if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, |
4815 | 1025 H5P_DEFAULT, tmp) < 0) |
4687 | 1026 { |
4837 | 1027 H5Dclose (data_hid); |
1028 H5Gclose (group_id); | |
4687 | 1029 return false; |
1030 } | |
4815 | 1031 |
4687 | 1032 H5Dclose (data_hid); |
1033 H5Gclose (group_id); | |
1034 | |
4815 | 1035 for (hsize_t i = 0, j = hdims[0] - 1; i < hdims[0]; i++, j--) |
4814 | 1036 dv(j) = tmp[i]; |
1037 | |
4687 | 1038 hdf5_callback_data dsub; |
1039 | |
1040 herr_t retval2 = -1; | |
4815 | 1041 |
4814 | 1042 Cell m (dv); |
4815 | 1043 |
4687 | 1044 int current_item = 0; |
4815 | 1045 |
4687 | 1046 if (have_h5giterate_bug) |
4815 | 1047 current_item = 1; // Skip dims items in group. |
4687 | 1048 |
4696 | 1049 #ifdef HAVE_H5GGET_NUM_OBJS |
1050 hsize_t num_obj = 0; | |
5060 | 1051 group_id = H5Gopen (loc_id, name); |
1052 H5Gget_num_objs (group_id, &num_obj); | |
1053 H5Gclose (group_id); | |
4696 | 1054 #endif |
1055 | |
5275 | 1056 for (octave_idx_type i = 0; i < dv.numel (); i++) |
4687 | 1057 { |
4696 | 1058 |
1059 #ifdef HAVE_H5GGET_NUM_OBJS | |
4814 | 1060 if (current_item >= static_cast<int> (num_obj)) |
1061 retval2 = -1; | |
1062 else | |
4696 | 1063 #endif |
4814 | 1064 retval2 = H5Giterate (loc_id, name, ¤t_item, |
1065 hdf5_read_next_data, &dsub); | |
1066 | |
4687 | 1067 if (retval2 <= 0) |
1068 break; | |
4814 | 1069 |
1070 octave_value ov = dsub.tc; | |
1071 m.elem (i) = ov; | |
1072 | |
1073 if (have_h5giterate_bug) | |
4815 | 1074 current_item++; // H5Giterate returned the last index processed. |
4814 | 1075 |
4687 | 1076 } |
1077 | |
1078 if (retval2 >= 0) | |
1079 { | |
1080 matrix = m; | |
1081 retval = true; | |
1082 } | |
1083 | |
1084 return retval; | |
1085 } | |
4815 | 1086 |
4687 | 1087 #endif |
1088 | |
3354 | 1089 DEFUN (iscell, args, , |
3448 | 1090 "-*- texinfo -*-\n\ |
1091 @deftypefn {Built-in Function} {} iscell (@var{x})\n\ | |
1092 Return true if @var{x} is a cell array object. Otherwise, return\n\ | |
1093 false.\n\ | |
1094 @end deftypefn") | |
3354 | 1095 { |
1096 octave_value retval; | |
1097 | |
1098 if (args.length () == 1) | |
1099 retval = args(0).is_cell (); | |
1100 else | |
5823 | 1101 print_usage (); |
3354 | 1102 |
1103 return retval; | |
1104 } | |
1105 | |
1106 DEFUN (cell, args, , | |
3448 | 1107 "-*- texinfo -*-\n\ |
1108 @deftypefn {Built-in Function} {} cell (@var{x})\n\ | |
1109 @deftypefnx {Built-in Function} {} cell (@var{n}, @var{m})\n\ | |
1110 Create a new cell array object. If invoked with a single scalar\n\ | |
1111 argument, @code{cell} returns a square cell array with the dimension\n\ | |
1112 specified. If you supply two scalar arguments, @code{cell} takes\n\ | |
1113 them to be the number of rows and columns. If given a vector with two\n\ | |
1114 elements, @code{cell} uses the values of the elements as the number of\n\ | |
1115 rows and columns, respectively.\n\ | |
1116 @end deftypefn") | |
3354 | 1117 { |
1118 octave_value retval; | |
1119 | |
1120 int nargin = args.length (); | |
1121 | |
4563 | 1122 dim_vector dims; |
1123 | |
3354 | 1124 switch (nargin) |
1125 { | |
4563 | 1126 case 0: |
1127 dims = dim_vector (0, 0); | |
3354 | 1128 break; |
1129 | |
4563 | 1130 case 1: |
1131 get_dimensions (args(0), "cell", dims); | |
3354 | 1132 break; |
1133 | |
1134 default: | |
4563 | 1135 { |
1136 dims.resize (nargin); | |
1137 | |
1138 for (int i = 0; i < nargin; i++) | |
1139 { | |
1140 dims(i) = args(i).is_empty () ? 0 : args(i).nint_value (); | |
1141 | |
1142 if (error_state) | |
1143 { | |
1144 error ("cell: expecting scalar arguments"); | |
1145 break; | |
1146 } | |
1147 } | |
1148 } | |
3354 | 1149 break; |
1150 } | |
1151 | |
4563 | 1152 if (! error_state) |
1153 { | |
8290
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1154 dims.chop_trailing_singletons (); |
4563 | 1155 |
1156 check_dimensions (dims, "cell"); | |
1157 | |
1158 if (! error_state) | |
8290
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1159 retval = Cell (dims, Matrix ()); |
4563 | 1160 } |
1161 | |
3354 | 1162 return retval; |
1163 } | |
1164 | |
4610 | 1165 DEFUN (iscellstr, args, , |
1166 "-*- texinfo -*-\n\ | |
1167 @deftypefn {Built-in Function} {} iscellstr (@var{cell})\n\ | |
1168 Return true if every element of the cell array @var{cell} is a\n\ | |
1169 character string\n\ | |
1170 @end deftypefn") | |
1171 { | |
4699 | 1172 octave_value retval; |
4610 | 1173 |
1174 if (args.length () == 1) | |
6116 | 1175 retval = args(0).is_cellstr (); |
4610 | 1176 else |
5823 | 1177 print_usage (); |
4610 | 1178 |
1179 return retval; | |
1180 } | |
1181 | |
4817 | 1182 // Note that since Fcellstr calls Fiscellstr, we need to have |
1183 // Fiscellstr defined first (to provide a declaration) and also we | |
1184 // should keep it in the same file (so we don't have to provide a | |
1185 // declaration) and so we don't have to use feval to call it. | |
1186 | |
1187 DEFUN (cellstr, args, , | |
1188 "-*- texinfo -*-\n\ | |
1189 @deftypefn {Built-in Function} {} cellstr (@var{string})\n\ | |
1190 Create a new cell array object from the elements of the string\n\ | |
1191 array @var{string}.\n\ | |
1192 @end deftypefn") | |
1193 { | |
1194 octave_value retval; | |
1195 | |
1196 if (args.length () == 1) | |
1197 { | |
1198 octave_value_list tmp = Fiscellstr (args, 1); | |
1199 | |
1200 if (tmp(0).is_true ()) | |
1201 retval = args(0); | |
1202 else | |
1203 { | |
1204 string_vector s = args(0).all_strings (); | |
1205 | |
1206 if (! error_state) | |
7813 | 1207 retval = (s.is_empty () |
1208 ? Cell (octave_value (std::string ())) | |
1209 : Cell (s, true)); | |
4817 | 1210 else |
1211 error ("cellstr: expecting argument to be a 2-d character array"); | |
1212 } | |
1213 } | |
1214 else | |
5823 | 1215 print_usage (); |
4817 | 1216 |
1217 return retval; | |
1218 } | |
1219 | |
4762 | 1220 DEFUN (struct2cell, args, , |
1221 "-*- texinfo -*-\n\ | |
1222 @deftypefn {Built-in Function} {} struct2cell (@var{S})\n\ | |
1223 Create a new cell array from the objects stored in the struct object.\n\ | |
4764 | 1224 If @var{f} is the number of fields in the structure, the resulting\n\ |
1225 cell array will have a dimension vector corresponding to\n\ | |
1226 @code{[@var{F} size(@var{S})]}.\n\ | |
5642 | 1227 @seealso{cell2struct, fieldnames}\n\ |
1228 @end deftypefn") | |
4762 | 1229 { |
1230 octave_value retval; | |
4764 | 1231 |
4762 | 1232 int nargin = args.length (); |
4764 | 1233 |
4762 | 1234 if (nargin == 1) |
1235 { | |
4764 | 1236 Octave_map m = args(0).map_value (); |
1237 | |
4762 | 1238 if (! error_state) |
1239 { | |
1240 dim_vector m_dv = m.dims (); | |
4764 | 1241 |
4762 | 1242 string_vector keys = m.keys (); |
4764 | 1243 |
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1244 octave_idx_type num_fields = keys.length (); |
4764 | 1245 |
4762 | 1246 // The resulting dim_vector should have dimensions: |
1247 // [numel(fields) size(struct)] | |
4764 | 1248 |
4762 | 1249 dim_vector result_dv; |
4764 | 1250 result_dv.resize (m_dv.length () + 1); // Add 1 for the fields. |
1251 | |
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1252 result_dv(0) = num_fields; |
4762 | 1253 |
1254 for (int i = 1; i < result_dv.length (); i++) | |
1255 result_dv(i) = m_dv(i-1); | |
4764 | 1256 |
4762 | 1257 Cell c (result_dv); |
4764 | 1258 |
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1259 octave_idx_type n_elts = m.numel (); |
4764 | 1260 |
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1261 for (octave_idx_type j = 0; j < num_fields; j++) |
4762 | 1262 { |
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1263 octave_idx_type k = j; |
4764 | 1264 |
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1265 const Cell vals = m.contents (keys(j)); |
4764 | 1266 |
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1267 for (octave_idx_type i = 0; i < n_elts; i++) |
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1268 { |
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1269 c(k) = vals(i); |
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1270 k += num_fields; |
4762 | 1271 } |
1272 } | |
1273 | |
1274 retval = c; | |
1275 } | |
1276 else | |
1277 error ("struct2cell: expecting argument to be a cell array"); | |
1278 } | |
1279 else | |
5823 | 1280 print_usage (); |
4764 | 1281 |
4762 | 1282 return retval; |
1283 } | |
1284 | |
5900 | 1285 mxArray * |
1286 octave_cell::as_mxArray (void) const | |
1287 { | |
1288 mxArray *retval = new mxArray (dims ()); | |
1289 | |
1290 mxArray **elts = static_cast<mxArray **> (retval->get_data ()); | |
1291 | |
6686 | 1292 mwSize nel = numel (); |
5900 | 1293 |
1294 const octave_value *p = matrix.data (); | |
1295 | |
6686 | 1296 for (mwIndex i = 0; i < nel; i++) |
5900 | 1297 elts[i] = new mxArray (p[i]); |
1298 | |
1299 return retval; | |
1300 } | |
1301 | |
3353 | 1302 /* |
1303 ;;; Local Variables: *** | |
1304 ;;; mode: C++ *** | |
1305 ;;; End: *** | |
1306 */ |