2376
|
1 /* |
|
2 |
7017
|
3 Copyright (C) 1996, 1997, 1998, 2000, 2002, 2003, 2004, 2005, 2006, |
|
4 2007 John W. Eaton |
2376
|
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. |
2376
|
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/>. |
2376
|
21 |
|
22 */ |
|
23 |
|
24 #ifdef HAVE_CONFIG_H |
|
25 #include <config.h> |
|
26 #endif |
|
27 |
3503
|
28 #include <iostream> |
2376
|
29 |
3933
|
30 #include "Cell.h" |
4358
|
31 #include "defun.h" |
2376
|
32 #include "error.h" |
4358
|
33 #include "gripes.h" |
2979
|
34 #include "oct-lvalue.h" |
3932
|
35 #include "ov-list.h" |
2376
|
36 #include "ov-struct.h" |
|
37 #include "unwind-prot.h" |
6811
|
38 #include "utils.h" |
2948
|
39 #include "variables.h" |
2376
|
40 |
4750
|
41 #include "Array-util.h" |
|
42 |
4687
|
43 #include "byte-swap.h" |
|
44 #include "ls-oct-ascii.h" |
|
45 #include "ls-oct-binary.h" |
|
46 #include "ls-hdf5.h" |
|
47 #include "ls-utils.h" |
5759
|
48 #include "pr-output.h" |
4687
|
49 |
3219
|
50 DEFINE_OCTAVE_ALLOCATOR(octave_struct); |
2376
|
51 |
4612
|
52 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(octave_struct, "struct", "struct"); |
2376
|
53 |
4513
|
54 Cell |
3933
|
55 octave_struct::dotref (const octave_value_list& idx) |
2962
|
56 { |
4513
|
57 Cell retval; |
3933
|
58 |
|
59 assert (idx.length () == 1); |
2962
|
60 |
3933
|
61 std::string nm = idx(0).string_value (); |
|
62 |
4219
|
63 Octave_map::const_iterator p = map.seek (nm); |
2376
|
64 |
4219
|
65 if (p != map.end ()) |
3933
|
66 retval = map.contents (p); |
|
67 else |
2376
|
68 error ("structure has no member `%s'", nm.c_str ()); |
|
69 |
|
70 return retval; |
|
71 } |
|
72 |
4513
|
73 #if 0 |
3933
|
74 static void |
|
75 gripe_invalid_index (void) |
|
76 { |
|
77 error ("invalid index for structure array"); |
|
78 } |
4513
|
79 #endif |
3933
|
80 |
|
81 static void |
|
82 gripe_invalid_index_for_assignment (void) |
|
83 { |
|
84 error ("invalid index for structure array assignment"); |
|
85 } |
|
86 |
|
87 static void |
|
88 gripe_invalid_index_type (const std::string& nm, char t) |
|
89 { |
|
90 error ("%s cannot be indexed with %c", nm.c_str (), t); |
|
91 } |
|
92 |
|
93 static void |
|
94 gripe_failed_assignment (void) |
|
95 { |
|
96 error ("assignment to structure element failed"); |
|
97 } |
|
98 |
4994
|
99 octave_value_list |
4247
|
100 octave_struct::subsref (const std::string& type, |
4994
|
101 const std::list<octave_value_list>& idx, |
|
102 int nargout) |
3933
|
103 { |
4994
|
104 octave_value_list retval; |
3933
|
105 |
|
106 int skip = 1; |
|
107 |
|
108 switch (type[0]) |
|
109 { |
|
110 case '(': |
|
111 { |
|
112 if (type.length () > 1 && type[1] == '.') |
|
113 { |
4219
|
114 std::list<octave_value_list>::const_iterator p = idx.begin (); |
|
115 octave_value_list key_idx = *++p; |
3933
|
116 |
4513
|
117 Cell tmp = dotref (key_idx); |
3933
|
118 |
|
119 if (! error_state) |
|
120 { |
7460
|
121 Cell t = tmp.index (idx.front (), true); |
3933
|
122 |
4994
|
123 retval(0) = (t.length () == 1) ? t(0) : octave_value (t, true); |
3933
|
124 |
4513
|
125 // We handled two index elements, so tell |
|
126 // next_subsref to skip both of them. |
3933
|
127 |
4513
|
128 skip++; |
3933
|
129 } |
|
130 } |
|
131 else |
7460
|
132 retval(0) = map.index (idx.front (), true); |
3933
|
133 } |
|
134 break; |
|
135 |
|
136 case '.': |
|
137 { |
5592
|
138 if (map.numel() > 0) |
|
139 { |
|
140 Cell t = dotref (idx.front ()); |
3933
|
141 |
5592
|
142 retval(0) = (t.length () == 1) ? t(0) : octave_value (t, true); |
|
143 } |
3933
|
144 } |
|
145 break; |
|
146 |
|
147 case '{': |
|
148 gripe_invalid_index_type (type_name (), type[0]); |
|
149 break; |
|
150 |
|
151 default: |
|
152 panic_impossible (); |
|
153 } |
|
154 |
5775
|
155 // FIXME -- perhaps there should be an |
4994
|
156 // octave_value_list::next_subsref member function? See also |
|
157 // octave_user_function::subsref. |
|
158 |
|
159 if (idx.size () > 1) |
5028
|
160 retval = retval(0).next_subsref (nargout, type, idx, skip); |
3933
|
161 |
|
162 return retval; |
|
163 } |
|
164 |
|
165 octave_value |
4513
|
166 octave_struct::numeric_conv (const Cell& val, |
3933
|
167 const std::string& type) |
|
168 { |
|
169 octave_value retval; |
|
170 |
|
171 if (val.length () == 1) |
|
172 { |
|
173 retval = val(0); |
|
174 |
|
175 if (type.length () > 0 && type[0] == '.' && ! retval.is_map ()) |
|
176 retval = Octave_map (); |
|
177 } |
|
178 else |
|
179 gripe_invalid_index_for_assignment (); |
|
180 |
|
181 return retval; |
|
182 } |
|
183 |
|
184 octave_value |
4247
|
185 octave_struct::subsasgn (const std::string& type, |
4219
|
186 const std::list<octave_value_list>& idx, |
3933
|
187 const octave_value& rhs) |
2376
|
188 { |
3933
|
189 octave_value retval; |
|
190 |
|
191 int n = type.length (); |
|
192 |
|
193 octave_value t_rhs = rhs; |
|
194 |
|
195 if (n > 1 && ! (type.length () == 2 && type[0] == '(' && type[1] == '.')) |
|
196 { |
|
197 switch (type[0]) |
|
198 { |
|
199 case '(': |
|
200 { |
|
201 if (type.length () > 1 && type[1] == '.') |
|
202 { |
4219
|
203 std::list<octave_value_list>::const_iterator p = idx.begin (); |
|
204 octave_value_list t_idx = *p; |
3933
|
205 |
4513
|
206 octave_value_list key_idx = *++p; |
|
207 |
|
208 assert (key_idx.length () == 1); |
3933
|
209 |
4513
|
210 std::string key = key_idx(0).string_value (); |
3933
|
211 |
4513
|
212 octave_value u; |
3933
|
213 |
4513
|
214 if (! map.contains (key)) |
|
215 u = octave_value::empty_conv (type.substr (2), rhs); |
|
216 else |
|
217 { |
4675
|
218 Cell map_val = map.contents (key); |
3933
|
219 |
4513
|
220 Cell map_elt = map_val.index (idx.front (), true); |
3933
|
221 |
4513
|
222 u = numeric_conv (map_elt, type.substr (2)); |
|
223 } |
3933
|
224 |
4513
|
225 if (! error_state) |
|
226 { |
|
227 std::list<octave_value_list> next_idx (idx); |
3933
|
228 |
4513
|
229 // We handled two index elements, so subsasgn to |
|
230 // needs to skip both of them. |
3933
|
231 |
4513
|
232 next_idx.erase (next_idx.begin ()); |
|
233 next_idx.erase (next_idx.begin ()); |
4059
|
234 |
4513
|
235 u.make_unique (); |
|
236 |
|
237 t_rhs = u.subsasgn (type.substr (2), next_idx, rhs); |
3933
|
238 } |
|
239 } |
|
240 else |
|
241 gripe_invalid_index_for_assignment (); |
|
242 } |
|
243 break; |
|
244 |
|
245 case '.': |
|
246 { |
|
247 octave_value_list key_idx = idx.front (); |
|
248 |
|
249 assert (key_idx.length () == 1); |
|
250 |
|
251 std::string key = key_idx(0).string_value (); |
|
252 |
|
253 octave_value u; |
|
254 |
|
255 if (! map.contains (key)) |
|
256 u = octave_value::empty_conv (type.substr (1), rhs); |
|
257 else |
|
258 { |
4675
|
259 Cell map_val = map.contents (key); |
3933
|
260 |
|
261 u = numeric_conv (map_val, type.substr (1)); |
|
262 } |
|
263 |
|
264 if (! error_state) |
|
265 { |
4219
|
266 std::list<octave_value_list> next_idx (idx); |
3933
|
267 |
4219
|
268 next_idx.erase (next_idx.begin ()); |
3933
|
269 |
4059
|
270 u.make_unique (); |
|
271 |
3933
|
272 t_rhs = u.subsasgn (type.substr (1), next_idx, rhs); |
|
273 } |
|
274 } |
|
275 break; |
|
276 |
|
277 case '{': |
|
278 gripe_invalid_index_type (type_name (), type[0]); |
|
279 break; |
|
280 |
|
281 default: |
|
282 panic_impossible (); |
|
283 } |
|
284 } |
|
285 |
|
286 if (! error_state) |
|
287 { |
|
288 switch (type[0]) |
|
289 { |
|
290 case '(': |
|
291 { |
|
292 if (n > 1 && type[1] == '.') |
|
293 { |
4219
|
294 std::list<octave_value_list>::const_iterator p = idx.begin (); |
|
295 octave_value_list key_idx = *++p; |
3933
|
296 |
|
297 assert (key_idx.length () == 1); |
|
298 |
|
299 std::string key = key_idx(0).string_value (); |
|
300 |
|
301 if (! error_state) |
|
302 { |
4513
|
303 map.assign (idx.front (), key, t_rhs); |
3933
|
304 |
4513
|
305 if (! error_state) |
5759
|
306 { |
|
307 count++; |
|
308 retval = octave_value (this); |
|
309 } |
3933
|
310 else |
4513
|
311 gripe_failed_assignment (); |
3933
|
312 } |
|
313 else |
|
314 gripe_failed_assignment (); |
|
315 } |
|
316 else |
4197
|
317 { |
5592
|
318 if (t_rhs.is_map()) |
4197
|
319 { |
5592
|
320 Octave_map rhs_map = t_rhs.map_value (); |
4197
|
321 |
|
322 if (! error_state) |
5592
|
323 { |
|
324 map.assign (idx.front (), rhs_map); |
|
325 |
|
326 if (! error_state) |
5759
|
327 { |
|
328 count++; |
|
329 retval = octave_value (this); |
|
330 } |
5592
|
331 else |
|
332 gripe_failed_assignment (); |
|
333 } |
4197
|
334 else |
5592
|
335 error ("invalid structure assignment"); |
4197
|
336 } |
4513
|
337 else |
5592
|
338 { |
|
339 if (t_rhs.is_empty()) |
|
340 { |
|
341 map.maybe_delete_elements (idx.front()); |
|
342 |
|
343 if (! error_state) |
5759
|
344 { |
|
345 count++; |
|
346 retval = octave_value (this); |
|
347 } |
5592
|
348 else |
|
349 gripe_failed_assignment (); |
|
350 } |
|
351 else |
|
352 error ("invalid structure assignment"); |
|
353 } |
4197
|
354 } |
3933
|
355 } |
|
356 break; |
|
357 |
|
358 case '.': |
|
359 { |
|
360 octave_value_list key_idx = idx.front (); |
|
361 |
|
362 assert (key_idx.length () == 1); |
|
363 |
|
364 std::string key = key_idx(0).string_value (); |
|
365 |
6833
|
366 if (t_rhs.is_cs_list ()) |
|
367 { |
|
368 Cell tmp_cell = Cell (t_rhs.list_value ()); |
|
369 |
7040
|
370 // The shape of the RHS is irrelevant, we just want |
|
371 // the number of elements to agree and to preserve the |
|
372 // shape of the left hand side of the assignment. |
|
373 |
|
374 if (numel () == tmp_cell.numel ()) |
|
375 tmp_cell = tmp_cell.reshape (dims ()); |
6833
|
376 |
|
377 map.assign (key, tmp_cell); |
|
378 } |
|
379 else |
|
380 map.assign (key, t_rhs); |
3933
|
381 |
|
382 if (! error_state) |
5759
|
383 { |
|
384 count++; |
|
385 retval = octave_value (this); |
|
386 } |
3933
|
387 else |
|
388 gripe_failed_assignment (); |
|
389 } |
|
390 break; |
|
391 |
|
392 case '{': |
|
393 gripe_invalid_index_type (type_name (), type[0]); |
|
394 break; |
|
395 |
|
396 default: |
|
397 panic_impossible (); |
|
398 } |
|
399 } |
|
400 else |
|
401 gripe_failed_assignment (); |
|
402 |
|
403 return retval; |
2376
|
404 } |
|
405 |
7046
|
406 octave_value |
|
407 octave_struct::do_index_op (const octave_value_list& idx, bool resize_ok) |
|
408 { |
|
409 octave_value retval; |
|
410 |
|
411 octave_idx_type n_idx = idx.length (); |
|
412 |
|
413 int nd = map.ndims (); |
|
414 |
|
415 switch (n_idx) |
|
416 { |
|
417 case 0: |
|
418 retval = map; |
|
419 break; |
|
420 |
|
421 case 1: |
|
422 { |
|
423 idx_vector i = idx (0).index_vector (); |
|
424 |
|
425 if (! error_state) |
|
426 retval = map.index (i, resize_ok, Cell::resize_fill_value ()); |
|
427 } |
|
428 break; |
|
429 |
|
430 default: |
|
431 { |
|
432 if (n_idx == 2 && nd == 2) |
|
433 { |
|
434 idx_vector i = idx (0).index_vector (); |
|
435 |
|
436 if (! error_state) |
|
437 { |
|
438 idx_vector j = idx (1).index_vector (); |
|
439 |
|
440 if (! error_state) |
|
441 retval = map.index (i, j, resize_ok, |
|
442 Cell::resize_fill_value ()); |
|
443 } |
|
444 } |
|
445 else |
|
446 { |
|
447 Array<idx_vector> idx_vec (n_idx); |
|
448 |
|
449 for (octave_idx_type i = 0; i < n_idx; i++) |
|
450 { |
|
451 idx_vec(i) = idx(i).index_vector (); |
|
452 |
|
453 if (error_state) |
|
454 break; |
|
455 } |
|
456 |
|
457 if (! error_state) |
|
458 retval = map.index (idx_vec, resize_ok, |
|
459 Cell::resize_fill_value ()); |
|
460 } |
|
461 } |
|
462 break; |
|
463 } |
|
464 |
|
465 return retval; |
|
466 } |
|
467 |
4791
|
468 size_t |
|
469 octave_struct::byte_size (void) const |
|
470 { |
|
471 // Neglect the size of the fieldnames. |
|
472 |
|
473 size_t retval = 0; |
|
474 |
|
475 for (Octave_map::const_iterator p = map.begin (); p != map.end (); p++) |
|
476 { |
|
477 std::string key = map.key (p); |
|
478 |
|
479 octave_value val = octave_value (map.contents (p)); |
|
480 |
|
481 retval += val.byte_size (); |
|
482 } |
|
483 |
|
484 return retval; |
|
485 } |
|
486 |
2376
|
487 void |
3523
|
488 octave_struct::print (std::ostream& os, bool) const |
2901
|
489 { |
|
490 print_raw (os); |
|
491 } |
|
492 |
|
493 void |
3523
|
494 octave_struct::print_raw (std::ostream& os, bool) const |
2376
|
495 { |
2985
|
496 unwind_protect::begin_frame ("octave_struct_print"); |
2376
|
497 |
|
498 unwind_protect_int (Vstruct_levels_to_print); |
|
499 |
3961
|
500 if (Vstruct_levels_to_print >= 0) |
2376
|
501 { |
5598
|
502 bool print_keys_only = (Vstruct_levels_to_print == 0 |
|
503 || map.numel () == 0); |
3961
|
504 |
|
505 Vstruct_levels_to_print--; |
|
506 |
2901
|
507 indent (os); |
|
508 os << "{"; |
|
509 newline (os); |
2376
|
510 |
2901
|
511 increment_indent_level (); |
2376
|
512 |
5598
|
513 octave_idx_type n = map.numel (); |
3932
|
514 |
5598
|
515 if (n == 0 || (n > 1 && print_keys_only)) |
4604
|
516 { |
|
517 indent (os); |
|
518 dim_vector dv = dims (); |
|
519 os << dv.str () << " struct array containing the fields:"; |
|
520 newline (os); |
|
521 newline (os); |
|
522 |
|
523 increment_indent_level (); |
|
524 } |
|
525 |
5880
|
526 string_vector key_list = map.keys (); |
|
527 |
|
528 for (octave_idx_type i = 0; i < key_list.length (); i++) |
2376
|
529 { |
5880
|
530 std::string key = key_list[i]; |
|
531 |
|
532 Cell val = map.contents (key); |
2376
|
533 |
4499
|
534 octave_value tmp = (n == 1) ? val(0) : octave_value (val, true); |
3961
|
535 |
|
536 if (print_keys_only) |
3932
|
537 { |
3961
|
538 indent (os); |
4604
|
539 os << key; |
|
540 if (n == 1) |
|
541 { |
|
542 dim_vector dv = tmp.dims (); |
|
543 os << ": " << dv.str () << " " << tmp.type_name (); |
|
544 } |
3961
|
545 newline (os); |
3932
|
546 } |
3961
|
547 else |
4121
|
548 tmp.print_with_name (os, key); |
2376
|
549 } |
|
550 |
5598
|
551 if (n == 0 || (n > 1 && print_keys_only)) |
4604
|
552 decrement_indent_level (); |
|
553 |
2901
|
554 decrement_indent_level (); |
2376
|
555 |
2901
|
556 indent (os); |
|
557 os << "}"; |
|
558 newline (os); |
2376
|
559 } |
|
560 else |
2901
|
561 { |
3961
|
562 indent (os); |
|
563 os << "<structure>"; |
2901
|
564 newline (os); |
|
565 } |
2376
|
566 |
2985
|
567 unwind_protect::run_frame ("octave_struct_print"); |
2376
|
568 } |
|
569 |
2901
|
570 bool |
3523
|
571 octave_struct::print_name_tag (std::ostream& os, const std::string& name) const |
2901
|
572 { |
3961
|
573 bool retval = false; |
|
574 |
2901
|
575 indent (os); |
3961
|
576 |
|
577 if (Vstruct_levels_to_print < 0) |
|
578 os << name << " = "; |
|
579 else |
|
580 { |
|
581 os << name << " ="; |
|
582 newline (os); |
|
583 retval = true; |
|
584 } |
|
585 |
|
586 return retval; |
2901
|
587 } |
|
588 |
4744
|
589 static bool |
|
590 scalar (const dim_vector& dims) |
|
591 { |
|
592 return dims.length () == 2 && dims (0) == 1 && dims (1) == 1; |
|
593 } |
|
594 |
|
595 /* |
|
596 %!shared x |
|
597 %! x(1).a=1; x(2).a=2; x(1).b=3; x(2).b=3; |
|
598 %!assert(struct('a',1,'b',3),x(1)) |
5592
|
599 %!assert(isempty(x([]))) |
|
600 %!assert(isempty(struct('a',{},'b',{}))) |
4744
|
601 %!assert(struct('a',{1,2},'b',{3,3}),x) |
|
602 %!assert(struct('a',{1,2},'b',3),x) |
|
603 %!assert(struct('a',{1,2},'b',{3}),x) |
|
604 %!assert(struct('b',3,'a',{1,2}),x) |
|
605 %!assert(struct('b',{3},'a',{1,2}),x) |
|
606 %!test x=struct([]); |
|
607 %!assert(size(x),[0,0]); |
|
608 %!assert(isstruct(x)); |
|
609 %!assert(isempty(fieldnames(x))); |
|
610 %!fail("struct('a',{1,2},'b',{1,2,3})","dimensions of parameter 2 do not match those of parameter 4") |
5582
|
611 %!fail("struct(1,2,3,4)","struct expects alternating \"field\", VALUE pairs"); |
|
612 %!fail("struct('1',2,'3')","struct expects alternating \"field\", VALUE pairs"); |
4744
|
613 */ |
|
614 |
|
615 DEFUN (struct, args, , |
|
616 "-*- texinfo -*-\n\ |
|
617 @deftypefn {Built-in Function} {} struct (\"field\", @var{value}, \"field\", @var{value}, @dots{})\n\ |
|
618 \n\ |
|
619 Create a structure and initialize its value.\n\ |
|
620 \n\ |
|
621 If the values are cell arrays, create a structure array and initialize\n\ |
|
622 its values. The dimensions of each cell array of values must match.\n\ |
|
623 Singleton cells and non-cell values are repeated so that they fill\n\ |
|
624 the entire array. If the cells are empty, create an empty structure\n\ |
4911
|
625 array with the specified field names.\n\ |
|
626 @end deftypefn") |
4744
|
627 { |
6946
|
628 octave_value retval; |
4744
|
629 |
|
630 int nargin = args.length (); |
|
631 |
5444
|
632 // struct ([]) returns an empty struct. |
|
633 |
|
634 // struct (empty_matrix) returns an empty struct with the same |
|
635 // dimensions as the empty matrix. |
|
636 |
|
637 // Note that struct () creates a 1x1 struct with no fields for |
|
638 // compatibility with Matlab. |
4744
|
639 |
6946
|
640 if ((nargin == 1 || nargin == 2) |
|
641 && args(0).is_empty () && args(0).is_real_matrix ()) |
|
642 { |
|
643 Cell fields; |
|
644 |
|
645 if (nargin == 2) |
|
646 { |
|
647 if (args(1).is_cellstr ()) |
|
648 retval = Octave_map (args(0).dims (), args(1).cell_value ()); |
|
649 else |
|
650 error ("struct: expecting cell array of field names as second argument"); |
|
651 } |
|
652 else |
|
653 retval = Octave_map (args(0).dims ()); |
|
654 |
|
655 return retval; |
|
656 } |
4744
|
657 |
|
658 // Check for "field", VALUE pairs. |
|
659 |
|
660 for (int i = 0; i < nargin; i += 2) |
|
661 { |
|
662 if (! args(i).is_string () || i + 1 >= nargin) |
|
663 { |
|
664 error ("struct expects alternating \"field\", VALUE pairs"); |
|
665 return retval; |
|
666 } |
|
667 } |
|
668 |
|
669 // Check that the dimensions of the values correspond. |
|
670 |
|
671 dim_vector dims (1, 1); |
|
672 |
|
673 int first_dimensioned_value = 0; |
|
674 |
|
675 for (int i = 1; i < nargin; i += 2) |
|
676 { |
|
677 if (args(i).is_cell ()) |
|
678 { |
|
679 dim_vector argdims (args(i).dims ()); |
|
680 |
|
681 if (! scalar (argdims)) |
|
682 { |
|
683 if (! first_dimensioned_value) |
|
684 { |
|
685 dims = argdims; |
|
686 first_dimensioned_value = i + 1; |
|
687 } |
|
688 else if (dims != argdims) |
|
689 { |
|
690 error ("struct: dimensions of parameter %d do not match those of parameter %d", |
|
691 first_dimensioned_value, i+1); |
|
692 return retval; |
|
693 } |
|
694 } |
|
695 } |
|
696 } |
|
697 |
|
698 // Create the return value. |
|
699 |
|
700 Octave_map map (dims); |
|
701 |
|
702 for (int i = 0; i < nargin; i+= 2) |
|
703 { |
|
704 // Get key. |
|
705 |
|
706 std::string key (args(i).string_value ()); |
|
707 |
|
708 if (error_state) |
|
709 return retval; |
|
710 |
6811
|
711 if (! valid_identifier (key)) |
|
712 { |
|
713 error ("struct: invalid structure field name `%s'", key.c_str ()); |
|
714 return retval; |
|
715 } |
|
716 |
4744
|
717 // Value may be v, { v }, or { v1, v2, ... } |
|
718 // In the first two cases, we need to create a cell array of |
|
719 // the appropriate dimensions filled with v. In the last case, |
|
720 // the cell array has already been determined to be of the |
|
721 // correct dimensions. |
|
722 |
|
723 if (args(i+1).is_cell ()) |
|
724 { |
|
725 const Cell c (args(i+1).cell_value ()); |
|
726 |
|
727 if (error_state) |
|
728 return retval; |
|
729 |
|
730 if (scalar (c.dims ())) |
|
731 map.assign (key, Cell (dims, c(0))); |
|
732 else |
|
733 map.assign (key, c); |
|
734 } |
|
735 else |
|
736 map.assign (key, Cell (dims, args(i+1))); |
|
737 |
|
738 if (error_state) |
|
739 return retval; |
|
740 } |
6946
|
741 |
4744
|
742 return octave_value (map); |
|
743 } |
|
744 |
4358
|
745 DEFUN (isstruct, args, , |
|
746 "-*- texinfo -*-\n\ |
|
747 @deftypefn {Built-in Function} {} isstruct (@var{expr})\n\ |
|
748 Return 1 if the value of the expression @var{expr} is a structure.\n\ |
|
749 @end deftypefn") |
|
750 { |
|
751 octave_value retval; |
|
752 |
|
753 if (args.length () == 1) |
|
754 retval = args(0).is_map (); |
|
755 else |
5823
|
756 print_usage (); |
4358
|
757 |
|
758 return retval; |
|
759 } |
|
760 |
|
761 DEFUN (fieldnames, args, , |
|
762 "-*- texinfo -*-\n\ |
|
763 @deftypefn {Built-in Function} {} fieldnames (@var{struct})\n\ |
|
764 Return a cell array of strings naming the elements of the structure\n\ |
|
765 @var{struct}. It is an error to call @code{fieldnames} with an\n\ |
|
766 argument that is not a structure.\n\ |
|
767 @end deftypefn") |
|
768 { |
|
769 octave_value retval; |
|
770 |
|
771 int nargin = args.length (); |
|
772 |
|
773 if (nargin == 1) |
|
774 { |
7336
|
775 octave_value arg = args(0); |
|
776 |
|
777 if (arg.is_map () || arg.is_object ()) |
4358
|
778 { |
7336
|
779 Octave_map m = arg.map_value (); |
|
780 |
4744
|
781 string_vector keys = m.keys (); |
7336
|
782 |
4744
|
783 if (keys.length () == 0) |
|
784 retval = Cell (0, 1); |
|
785 else |
|
786 retval = Cell (m.keys ()); |
4358
|
787 } |
|
788 else |
|
789 gripe_wrong_type_arg ("fieldnames", args(0)); |
|
790 } |
|
791 else |
5823
|
792 print_usage (); |
4358
|
793 |
|
794 return retval; |
|
795 } |
|
796 |
|
797 DEFUN (isfield, args, , |
|
798 "-*- texinfo -*-\n\ |
|
799 @deftypefn {Built-in Function} {} isfield (@var{expr}, @var{name})\n\ |
|
800 Return true if the expression @var{expr} is a structure and it includes an\n\ |
|
801 element named @var{name}. The first argument must be a structure and\n\ |
|
802 the second must be a string.\n\ |
|
803 @end deftypefn") |
|
804 { |
|
805 octave_value retval; |
|
806 |
|
807 int nargin = args.length (); |
|
808 |
|
809 if (nargin == 2) |
|
810 { |
|
811 retval = false; |
|
812 |
5775
|
813 // FIXME -- should this work for all types that can do |
4358
|
814 // structure reference operations? |
|
815 |
|
816 if (args(0).is_map () && args(1).is_string ()) |
|
817 { |
|
818 std::string key = args(1).string_value (); |
|
819 |
|
820 Octave_map m = args(0).map_value (); |
|
821 |
|
822 retval = m.contains (key) != 0; |
|
823 } |
|
824 } |
|
825 else |
5823
|
826 print_usage (); |
4358
|
827 |
|
828 return retval; |
|
829 } |
|
830 |
4750
|
831 // Check that the dimensions of the input arguments are correct. |
|
832 |
|
833 static bool |
|
834 cell2struct_check_args (const dim_vector& c_dv, const dim_vector& f_dv, |
|
835 bool is_cell, int dim) |
|
836 { |
4751
|
837 bool retval = true; |
4750
|
838 |
|
839 if (dim >= 0 && dim < c_dv.length ()) |
|
840 { |
|
841 if (is_cell) |
|
842 { |
4752
|
843 if (f_dv.numel () != c_dv(dim)) |
4750
|
844 { |
4751
|
845 error ("cell2struct: numel (FIELD) != size (CELL, DIM)"); |
4750
|
846 |
|
847 retval = false; |
|
848 } |
|
849 } |
|
850 else |
|
851 { |
|
852 if (f_dv.length () > 2) |
|
853 { |
4751
|
854 error ("cell2struct: field array must be a 2-d matrix"); |
4750
|
855 |
|
856 retval = false; |
|
857 } |
|
858 else if (f_dv(0) != c_dv(dim)) |
|
859 { |
4751
|
860 error ("cell2struct: size (FIELD, 1) != length (C, DIM)"); |
4750
|
861 |
|
862 retval = false; |
|
863 } |
|
864 } |
|
865 } |
|
866 else |
|
867 { |
|
868 error ("cell2struct: DIM out of range"); |
|
869 |
|
870 retval = false; |
|
871 } |
|
872 |
|
873 return retval; |
|
874 } |
|
875 |
|
876 static void |
5275
|
877 cell2struct_construct_idx (Array<octave_idx_type>& ra_idx1, |
|
878 const Array<octave_idx_type>& ra_idx2, |
|
879 octave_idx_type dim, octave_idx_type fill_value) |
4750
|
880 { |
5275
|
881 octave_idx_type iidx = 0; |
4750
|
882 |
5275
|
883 for (octave_idx_type idx = 0; idx < ra_idx1.length (); idx++) |
4750
|
884 { |
|
885 if (idx == dim) |
|
886 ra_idx1.elem (idx) = fill_value; |
|
887 else |
|
888 ra_idx1.elem (idx) = ra_idx2(iidx++); |
|
889 } |
|
890 } |
|
891 |
|
892 DEFUN (cell2struct, args, , |
|
893 "-*- texinfo -*-\n\ |
4817
|
894 @deftypefn {Built-in Function} {} cell2struct (@var{cell}, @var{fields}, @var{dim})\n\ |
|
895 Convert @var{cell} to a structure. The number of fields in @var{fields}\n\ |
|
896 must match the number of elements in @var{cell} along dimension @var{dim},\n\ |
|
897 that is @code{numel (@var{fields}) == size (@var{cell}, @var{dim})}.\n\ |
4750
|
898 \n\ |
|
899 @example\n\ |
|
900 @group\n\ |
7031
|
901 A = cell2struct (@{'Peter', 'Hannah', 'Robert';\n\ |
|
902 185, 170, 168@},\n\ |
6519
|
903 @{'Name','Height'@}, 1);\n\ |
4750
|
904 A(1)\n\ |
|
905 @result{} ans =\n\ |
4780
|
906 @{\n\ |
|
907 Height = 185\n\ |
|
908 Name = Peter\n\ |
|
909 @}\n\ |
4750
|
910 \n\ |
|
911 @end group\n\ |
|
912 @end example\n\ |
|
913 @end deftypefn") |
|
914 { |
|
915 octave_value retval; |
|
916 |
4751
|
917 if (args.length () == 3) |
4750
|
918 { |
4751
|
919 Cell c = args(0).cell_value (); |
4750
|
920 |
4751
|
921 if (! error_state) |
4750
|
922 { |
4751
|
923 octave_value field = args(1); |
4750
|
924 |
4751
|
925 // Field is either cell or character matrix. |
4750
|
926 |
5775
|
927 // FIXME -- this could be simplified if we had |
4752
|
928 // cellstr and iscellstr functions available. |
|
929 |
4751
|
930 bool field_is_cell = field.is_cell (); |
4750
|
931 |
4751
|
932 Cell field_cell; |
|
933 charMatrix field_char; |
4750
|
934 |
|
935 if (field_is_cell) |
4751
|
936 field_cell = field.cell_value (); |
|
937 else |
|
938 field_char = field.char_matrix_value (); |
|
939 |
|
940 if (! error_state) |
4750
|
941 { |
4751
|
942 // Retrieve the dimension value. |
|
943 |
5775
|
944 // FIXME -- int_value () should print out the |
4751
|
945 // conversions it does to be Matlab compatible. |
|
946 |
5275
|
947 octave_idx_type dim = args(2).int_value () - 1; |
4751
|
948 |
|
949 if (! error_state) |
|
950 { |
|
951 dim_vector c_dv = c.dims (); |
|
952 dim_vector field_dv = field.dims (); |
|
953 |
|
954 if (cell2struct_check_args (c_dv, field_dv, field_is_cell, |
|
955 dim)) |
|
956 { |
5275
|
957 octave_idx_type c_dv_length = c_dv.length (); |
4751
|
958 |
|
959 // Dimension vector for the Cell arrays to be |
|
960 // put into the structure. |
|
961 |
|
962 dim_vector value_dv; |
|
963 |
|
964 // Initialize c_value_dv. |
4750
|
965 |
4751
|
966 if (c_dv_length == 2) |
|
967 value_dv = dim_vector (1, 1); |
|
968 else |
|
969 value_dv.resize (c_dv_length - 1); |
|
970 |
5275
|
971 octave_idx_type idx_tmp = 0; |
4751
|
972 |
5275
|
973 for (octave_idx_type i = 0; i < c_dv_length; i++) |
4751
|
974 { |
|
975 if (i != dim) |
|
976 value_dv.elem (idx_tmp++) = c_dv.elem (i); |
|
977 } |
|
978 |
|
979 // All initializing is done, we can start moving |
|
980 // values. |
|
981 |
|
982 Octave_map map; |
|
983 |
|
984 // If field is a cell array then we use all |
|
985 // elements in array, on the other hand when |
|
986 // field is a character array the number of |
|
987 // elements is equals the number of rows. |
|
988 |
5275
|
989 octave_idx_type field_numel |
4751
|
990 = field_is_cell ? field_dv.numel (): field_dv(0); |
|
991 |
|
992 // For matlab compatibility. |
|
993 |
|
994 if (field_numel == 0) |
|
995 map.reshape (dim_vector (0, 1)); |
4750
|
996 |
5275
|
997 for (octave_idx_type i = 0; i < field_numel; i++) |
4751
|
998 { |
|
999 // Construct cell array which goes into the |
|
1000 // structure together with the appropriate |
|
1001 // field name. |
|
1002 |
|
1003 Cell c_value (value_dv); |
|
1004 |
5275
|
1005 Array<octave_idx_type> value_idx (value_dv.length (), 0); |
|
1006 Array<octave_idx_type> c_idx (c_dv_length, 0); |
4751
|
1007 |
5275
|
1008 for (octave_idx_type j = 0; j < value_dv.numel (); j++) |
4751
|
1009 { |
|
1010 // Need to do this to construct the |
|
1011 // appropriate idx for getting elements |
|
1012 // from the original cell array. |
|
1013 |
|
1014 cell2struct_construct_idx (c_idx, value_idx, |
|
1015 dim, i); |
|
1016 |
|
1017 c_value.elem (value_idx) = c.elem (c_idx); |
|
1018 |
|
1019 increment_index (value_idx, value_dv); |
|
1020 } |
|
1021 |
|
1022 std::string field_str; |
4750
|
1023 |
4751
|
1024 if (field_is_cell) |
|
1025 { |
|
1026 // Matlab retrieves the field values |
|
1027 // column by column. |
|
1028 |
|
1029 octave_value field_tmp = field_cell.elem (i); |
|
1030 |
|
1031 field_str = field_tmp.string_value (); |
|
1032 |
|
1033 if (error_state) |
|
1034 { |
|
1035 error ("cell2struct: fields have to be of type string"); |
|
1036 break; |
|
1037 } |
|
1038 } |
|
1039 else |
|
1040 { |
|
1041 field_str = field_char.row_as_string (i); |
|
1042 |
|
1043 if (error_state) |
|
1044 return retval; |
|
1045 } |
|
1046 |
6811
|
1047 if (! valid_identifier (field_str)) |
|
1048 { |
|
1049 error ("cell2struct: invalid field name `%s'", |
|
1050 field_str.c_str ()); |
|
1051 break; |
|
1052 } |
|
1053 |
4751
|
1054 map.reshape (value_dv); |
|
1055 |
|
1056 map.assign (field_str, c_value); |
|
1057 } |
|
1058 |
|
1059 if (! error_state) |
|
1060 retval = map; |
|
1061 } |
4750
|
1062 } |
4751
|
1063 else |
|
1064 error ("cell2struct: expecting third argument to be an integer"); |
4750
|
1065 } |
|
1066 else |
4751
|
1067 error ("cell2struct: expecting second argument to be a cell or character array"); |
4750
|
1068 } |
4751
|
1069 else |
|
1070 error ("cell2struct: expecting first argument to be a cell array"); |
4750
|
1071 } |
4751
|
1072 else |
5823
|
1073 print_usage (); |
4750
|
1074 |
|
1075 return retval; |
|
1076 } |
|
1077 |
4817
|
1078 // So we can call Fcellstr directly. |
|
1079 extern octave_value_list Fcellstr (const octave_value_list& args, int); |
|
1080 |
|
1081 DEFUN (rmfield, args, , |
|
1082 "-*- texinfo -*-\n\ |
|
1083 @deftypefn {Built-in Function} {} rmfield (@var{s}, @var{f})\n\ |
|
1084 Remove field @var{f} from the structure @var{s}. If @var{f} is a\n\ |
|
1085 cell array of character strings or a character array, remove the\n\ |
|
1086 named fields.\n\ |
5642
|
1087 @seealso{cellstr, iscellstr, setfield}\n\ |
|
1088 @end deftypefn") |
4817
|
1089 { |
|
1090 octave_value retval; |
|
1091 |
|
1092 int nargin = args.length (); |
|
1093 |
|
1094 if (nargin == 2) |
|
1095 { |
|
1096 Octave_map m = args(0).map_value (); |
|
1097 |
|
1098 octave_value_list fval = Fcellstr (args(1), 1); |
|
1099 |
|
1100 if (! error_state) |
|
1101 { |
|
1102 Cell fcell = fval(0).cell_value (); |
|
1103 |
|
1104 for (int i = 0; i < fcell.numel (); i++) |
|
1105 { |
|
1106 std::string key = fcell(i).string_value (); |
|
1107 |
|
1108 if (m.contains (key)) |
|
1109 m.del (key); |
|
1110 else |
|
1111 { |
|
1112 error ("rmfield: structure does not contain field %s", |
|
1113 key.c_str ()); |
|
1114 |
|
1115 break; |
|
1116 } |
|
1117 } |
|
1118 |
|
1119 if (! error_state) |
|
1120 retval = m; |
|
1121 } |
|
1122 } |
|
1123 else |
5823
|
1124 print_usage (); |
4817
|
1125 |
|
1126 return retval; |
|
1127 } |
|
1128 |
|
1129 bool |
6974
|
1130 octave_struct::save_ascii (std::ostream& os) |
4817
|
1131 { |
|
1132 Octave_map m = map_value (); |
6639
|
1133 os << "# length: " << m.nfields () << "\n"; |
4817
|
1134 |
|
1135 Octave_map::iterator i = m.begin (); |
|
1136 while (i != m.end ()) |
|
1137 { |
5341
|
1138 octave_value val = map.contents (i); |
4817
|
1139 |
6974
|
1140 bool b = save_ascii_data (os, val, m.key (i), false, 0); |
4817
|
1141 |
|
1142 if (! b) |
|
1143 return os; |
|
1144 |
|
1145 i++; |
|
1146 } |
|
1147 |
|
1148 return true; |
|
1149 } |
|
1150 |
|
1151 bool |
|
1152 octave_struct::load_ascii (std::istream& is) |
|
1153 { |
5275
|
1154 octave_idx_type len = 0; |
4817
|
1155 bool success = true; |
|
1156 |
|
1157 if (extract_keyword (is, "length", len) && len >= 0) |
|
1158 { |
|
1159 if (len > 0) |
|
1160 { |
|
1161 Octave_map m (map); |
|
1162 |
5275
|
1163 for (octave_idx_type j = 0; j < len; j++) |
4817
|
1164 { |
|
1165 octave_value t2; |
|
1166 bool dummy; |
|
1167 |
|
1168 // recurse to read cell elements |
|
1169 std::string nm |
5756
|
1170 = read_ascii_data (is, std::string (), dummy, t2, j); |
4817
|
1171 |
|
1172 if (!is) |
|
1173 break; |
|
1174 |
6293
|
1175 Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2); |
5433
|
1176 |
6293
|
1177 if (error_state) |
|
1178 { |
|
1179 error ("load: internal error loading struct elements"); |
|
1180 return false; |
|
1181 } |
5433
|
1182 |
6293
|
1183 m.assign (nm, tcell); |
4817
|
1184 } |
|
1185 |
|
1186 if (is) |
|
1187 map = m; |
|
1188 else |
|
1189 { |
|
1190 error ("load: failed to load structure"); |
|
1191 success = false; |
|
1192 } |
|
1193 } |
|
1194 else if (len == 0 ) |
6292
|
1195 map = Octave_map (dim_vector (1, 1)); |
4817
|
1196 else |
|
1197 panic_impossible (); |
|
1198 } |
|
1199 else { |
|
1200 error ("load: failed to extract number of elements in structure"); |
|
1201 success = false; |
|
1202 } |
|
1203 |
|
1204 return success; |
|
1205 } |
|
1206 |
|
1207 bool |
|
1208 octave_struct::save_binary (std::ostream& os, bool& save_as_floats) |
|
1209 { |
|
1210 Octave_map m = map_value (); |
|
1211 |
6639
|
1212 int32_t len = m.nfields (); |
5760
|
1213 os.write (reinterpret_cast<char *> (&len), 4); |
4817
|
1214 |
|
1215 Octave_map::iterator i = m.begin (); |
|
1216 while (i != m.end ()) |
|
1217 { |
5341
|
1218 octave_value val = map.contents (i); |
4817
|
1219 |
5341
|
1220 bool b = save_binary_data (os, val, m.key (i), "", 0, save_as_floats); |
4817
|
1221 |
|
1222 if (! b) |
|
1223 return os; |
|
1224 |
|
1225 i++; |
|
1226 } |
|
1227 |
|
1228 return true; |
|
1229 } |
|
1230 |
|
1231 bool |
|
1232 octave_struct::load_binary (std::istream& is, bool swap, |
5760
|
1233 oct_mach_info::float_format fmt) |
4817
|
1234 { |
|
1235 bool success = true; |
5828
|
1236 int32_t len; |
5760
|
1237 if (! is.read (reinterpret_cast<char *> (&len), 4)) |
4817
|
1238 return false; |
|
1239 if (swap) |
4944
|
1240 swap_bytes<4> (&len); |
4817
|
1241 |
|
1242 if (len > 0) |
|
1243 { |
|
1244 Octave_map m (map); |
|
1245 |
5275
|
1246 for (octave_idx_type j = 0; j < len; j++) |
4817
|
1247 { |
|
1248 octave_value t2; |
|
1249 bool dummy; |
|
1250 std::string doc; |
|
1251 |
|
1252 // recurse to read cell elements |
|
1253 std::string nm = read_binary_data (is, swap, fmt, std::string (), |
|
1254 dummy, t2, doc); |
|
1255 |
|
1256 if (!is) |
|
1257 break; |
|
1258 |
6293
|
1259 Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2); |
5433
|
1260 |
6293
|
1261 if (error_state) |
|
1262 { |
|
1263 error ("load: internal error loading struct elements"); |
|
1264 return false; |
|
1265 } |
5433
|
1266 |
6293
|
1267 m.assign (nm, tcell); |
4817
|
1268 } |
|
1269 |
|
1270 if (is) |
|
1271 map = m; |
|
1272 else |
|
1273 { |
|
1274 error ("load: failed to load structure"); |
|
1275 success = false; |
|
1276 } |
|
1277 } |
|
1278 else if (len == 0 ) |
6292
|
1279 map = Octave_map (dim_vector (1, 1)); |
4817
|
1280 else |
|
1281 panic_impossible (); |
|
1282 |
|
1283 return success; |
|
1284 } |
|
1285 |
|
1286 #if defined (HAVE_HDF5) |
|
1287 |
|
1288 bool |
|
1289 octave_struct::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) |
|
1290 { |
|
1291 hid_t data_hid = -1; |
|
1292 |
|
1293 data_hid = H5Gcreate (loc_id, name, 0); |
|
1294 if (data_hid < 0) return false; |
|
1295 |
|
1296 // recursively add each element of the structure to this group |
|
1297 Octave_map m = map_value (); |
|
1298 Octave_map::iterator i = m.begin (); |
|
1299 while (i != m.end ()) |
|
1300 { |
5341
|
1301 octave_value val = map.contents (i); |
4817
|
1302 |
5341
|
1303 bool retval2 = add_hdf5_data (data_hid, val, m.key (i), "", false, |
4817
|
1304 save_as_floats); |
|
1305 |
|
1306 if (! retval2) |
|
1307 break; |
|
1308 |
|
1309 i++; |
|
1310 } |
|
1311 |
|
1312 H5Gclose (data_hid); |
4837
|
1313 |
4817
|
1314 return true; |
|
1315 } |
|
1316 |
|
1317 bool |
|
1318 octave_struct::load_hdf5 (hid_t loc_id, const char *name, |
|
1319 bool have_h5giterate_bug) |
|
1320 { |
|
1321 bool retval = false; |
|
1322 |
|
1323 hdf5_callback_data dsub; |
|
1324 |
|
1325 herr_t retval2 = 0; |
6292
|
1326 Octave_map m (dim_vector (1, 1)); |
4817
|
1327 int current_item = 0; |
|
1328 #ifdef HAVE_H5GGET_NUM_OBJS |
|
1329 hsize_t num_obj = 0; |
5060
|
1330 hid_t group_id = H5Gopen (loc_id, name); |
|
1331 H5Gget_num_objs (group_id, &num_obj); |
|
1332 H5Gclose (group_id); |
4817
|
1333 |
|
1334 while (current_item < static_cast<int> (num_obj) |
|
1335 && (retval2 = H5Giterate (loc_id, name, ¤t_item, |
|
1336 hdf5_read_next_data, &dsub)) > 0) |
|
1337 #else |
|
1338 while ((retval2 = H5Giterate (loc_id, name, ¤t_item, |
|
1339 hdf5_read_next_data, &dsub)) > 0) |
|
1340 #endif |
|
1341 { |
5342
|
1342 octave_value t2 = dsub.tc; |
|
1343 |
6293
|
1344 Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2); |
5433
|
1345 |
6293
|
1346 if (error_state) |
|
1347 { |
|
1348 error ("load: internal error loading struct elements"); |
|
1349 return false; |
|
1350 } |
5433
|
1351 |
6293
|
1352 m.assign (dsub.name, tcell); |
5336
|
1353 |
4817
|
1354 if (have_h5giterate_bug) |
|
1355 current_item++; // H5Giterate returned the last index processed |
|
1356 } |
|
1357 |
|
1358 if (retval2 >= 0) |
|
1359 { |
|
1360 map = m; |
|
1361 retval = true; |
|
1362 } |
|
1363 |
|
1364 return retval; |
|
1365 } |
|
1366 |
4687
|
1367 #endif |
|
1368 |
5900
|
1369 mxArray * |
|
1370 octave_struct::as_mxArray (void) const |
|
1371 { |
|
1372 int nf = nfields (); |
|
1373 string_vector kv = map_keys (); |
6065
|
1374 |
|
1375 OCTAVE_LOCAL_BUFFER (const char *, f, nf); |
|
1376 |
5900
|
1377 for (int i = 0; i < nf; i++) |
6065
|
1378 f[i] = kv[i].c_str (); |
5900
|
1379 |
|
1380 mxArray *retval = new mxArray (dims (), nf, f); |
|
1381 |
|
1382 mxArray **elts = static_cast<mxArray **> (retval->get_data ()); |
|
1383 |
6686
|
1384 mwSize nel = numel (); |
5900
|
1385 |
6686
|
1386 mwSize ntot = nf * nel; |
5900
|
1387 |
|
1388 for (int i = 0; i < nf; i++) |
|
1389 { |
|
1390 Cell c = map.contents (kv[i]); |
|
1391 |
|
1392 const octave_value *p = c.data (); |
|
1393 |
6686
|
1394 mwIndex k = 0; |
|
1395 for (mwIndex j = i; j < ntot; j += nf) |
5900
|
1396 elts[j] = new mxArray (p[k++]); |
|
1397 } |
|
1398 |
|
1399 return retval; |
|
1400 } |
|
1401 |
2376
|
1402 /* |
|
1403 ;;; Local Variables: *** |
|
1404 ;;; mode: C++ *** |
|
1405 ;;; End: *** |
|
1406 */ |