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