Mercurial > hg > octave-nkf
annotate src/ov-struct.cc @ 10122:9d1a14e12431
Update docs and add tests for container functions
| author | Thorsten Meyer <thorsten.meyier@gmx.de> |
|---|---|
| date | Sun, 17 Jan 2010 13:31:42 +0100 |
| parents | 2cd940306a06 |
| children | cd96d29c5efa |
| rev | line source |
|---|---|
| 2376 | 1 /* |
| 2 | |
| 7017 | 3 Copyright (C) 1996, 1997, 1998, 2000, 2002, 2003, 2004, 2005, 2006, |
| 8920 | 4 2007, 2008, 2009 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" |
|
8377
25bc2d31e1bf
improve OCTAVE_LOCAL_BUFFER
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
42 #include "oct-locbuf.h" |
| 4750 | 43 |
| 4687 | 44 #include "byte-swap.h" |
| 45 #include "ls-oct-ascii.h" | |
| 46 #include "ls-oct-binary.h" | |
| 47 #include "ls-hdf5.h" | |
| 48 #include "ls-utils.h" | |
| 5759 | 49 #include "pr-output.h" |
| 4687 | 50 |
| 3219 | 51 DEFINE_OCTAVE_ALLOCATOR(octave_struct); |
| 2376 | 52 |
| 4612 | 53 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(octave_struct, "struct", "struct"); |
| 2376 | 54 |
| 4513 | 55 Cell |
|
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
56 octave_struct::dotref (const octave_value_list& idx, bool auto_add) |
| 2962 | 57 { |
| 4513 | 58 Cell retval; |
| 3933 | 59 |
| 60 assert (idx.length () == 1); | |
| 2962 | 61 |
| 3933 | 62 std::string nm = idx(0).string_value (); |
| 63 | |
| 4219 | 64 Octave_map::const_iterator p = map.seek (nm); |
| 2376 | 65 |
| 4219 | 66 if (p != map.end ()) |
| 3933 | 67 retval = map.contents (p); |
|
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
68 else if (auto_add) |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
69 retval = (numel () == 0) ? Cell (dim_vector (1)) : Cell (dims ()); |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
70 else |
| 2376 | 71 error ("structure has no member `%s'", nm.c_str ()); |
| 72 | |
| 73 return retval; | |
| 74 } | |
| 75 | |
| 4513 | 76 #if 0 |
| 3933 | 77 static void |
| 78 gripe_invalid_index (void) | |
| 79 { | |
| 80 error ("invalid index for structure array"); | |
| 81 } | |
| 4513 | 82 #endif |
| 3933 | 83 |
| 84 static void | |
| 85 gripe_invalid_index_for_assignment (void) | |
| 86 { | |
| 87 error ("invalid index for structure array assignment"); | |
| 88 } | |
| 89 | |
| 90 static void | |
| 91 gripe_invalid_index_type (const std::string& nm, char t) | |
| 92 { | |
| 93 error ("%s cannot be indexed with %c", nm.c_str (), t); | |
| 94 } | |
| 95 | |
|
9529
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
96 static void |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
97 gripe_failed_assignment (void) |
| 3933 | 98 { |
| 99 error ("assignment to structure element failed"); | |
| 100 } | |
| 101 | |
|
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7622
diff
changeset
|
102 octave_value_list |
| 4247 | 103 octave_struct::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
|
104 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
|
105 int nargout) |
| 3933 | 106 { |
|
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7622
diff
changeset
|
107 octave_value_list retval; |
| 3933 | 108 |
| 109 int skip = 1; | |
| 110 | |
| 111 switch (type[0]) | |
| 112 { | |
| 113 case '(': | |
| 114 { | |
| 115 if (type.length () > 1 && type[1] == '.') | |
| 116 { | |
| 4219 | 117 std::list<octave_value_list>::const_iterator p = idx.begin (); |
| 118 octave_value_list key_idx = *++p; | |
| 3933 | 119 |
|
8580
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
120 const Cell tmp = dotref (key_idx); |
| 3933 | 121 |
| 122 if (! error_state) | |
| 123 { | |
|
8580
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
124 const Cell t = tmp.index (idx.front ()); |
| 3933 | 125 |
|
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7622
diff
changeset
|
126 retval(0) = (t.length () == 1) ? t(0) : octave_value (t, true); |
| 3933 | 127 |
| 4513 | 128 // We handled two index elements, so tell |
| 129 // next_subsref to skip both of them. | |
| 3933 | 130 |
| 4513 | 131 skip++; |
| 3933 | 132 } |
| 133 } | |
| 134 else | |
|
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
135 retval(0) = map.index (idx.front ()); |
| 3933 | 136 } |
| 137 break; | |
| 138 | |
| 139 case '.': | |
| 140 { | |
| 5592 | 141 if (map.numel() > 0) |
| 142 { | |
|
8580
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
143 const Cell t = dotref (idx.front ()); |
| 3933 | 144 |
|
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7622
diff
changeset
|
145 retval(0) = (t.length () == 1) ? t(0) : octave_value (t, true); |
| 5592 | 146 } |
| 3933 | 147 } |
| 148 break; | |
| 149 | |
| 150 case '{': | |
| 151 gripe_invalid_index_type (type_name (), type[0]); | |
| 152 break; | |
| 153 | |
| 154 default: | |
| 155 panic_impossible (); | |
| 156 } | |
| 157 | |
| 5775 | 158 // FIXME -- perhaps there should be an |
| 4994 | 159 // octave_value_list::next_subsref member function? See also |
| 160 // octave_user_function::subsref. | |
| 161 | |
| 162 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
|
163 retval = retval(0).next_subsref (nargout, type, idx, skip); |
| 3933 | 164 |
| 165 return retval; | |
| 166 } | |
| 167 | |
|
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
168 octave_value |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
169 octave_struct::subsref (const std::string& type, |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
170 const std::list<octave_value_list>& idx, |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
171 bool 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 octave_value retval; |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
174 |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
175 int skip = 1; |
|
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 switch (type[0]) |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
178 { |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
179 case '(': |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
180 { |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
181 if (type.length () > 1 && type[1] == '.') |
|
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 std::list<octave_value_list>::const_iterator p = idx.begin (); |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
184 octave_value_list key_idx = *++p; |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
185 |
|
8580
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
186 const Cell tmp = dotref (key_idx, auto_add); |
|
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
187 |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
188 if (! error_state) |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
189 { |
|
8580
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
190 const Cell t = tmp.index (idx.front (), auto_add); |
|
8551
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 retval = (t.length () == 1) ? t(0) : octave_value (t, true); |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
193 |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
194 // We handled two index elements, so tell |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
195 // next_subsref to skip both of them. |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
196 |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
197 skip++; |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
198 } |
|
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 else |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
201 retval = map.index (idx.front (), auto_add); |
|
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 break; |
|
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 case '.': |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
206 { |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
207 if (map.numel() > 0) |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
208 { |
|
8580
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
209 const Cell t = dotref (idx.front (), auto_add); |
|
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
210 |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
211 retval = (t.length () == 1) ? t(0) : octave_value (t, true); |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
212 } |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
213 } |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
214 break; |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
215 |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
216 case '{': |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
217 gripe_invalid_index_type (type_name (), type[0]); |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
218 break; |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
219 |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
220 default: |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
221 panic_impossible (); |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
222 } |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
223 |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
224 // FIXME -- perhaps there should be an |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
225 // 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
|
226 // octave_user_function::subsref. |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
227 |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
228 if (idx.size () > 1) |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
229 retval = retval.next_subsref (auto_add, type, idx, skip); |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
230 |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
231 return retval; |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
232 } |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
233 |
|
8031
d9987dbdf91b
octave_struct::subsref: don't resize for simple x(idx) case
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
234 /* |
|
d9987dbdf91b
octave_struct::subsref: don't resize for simple x(idx) case
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
235 %!test |
|
d9987dbdf91b
octave_struct::subsref: don't resize for simple x(idx) case
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
236 %! x(1).a.a = 1; x(2).a.a = 2; |
|
d9987dbdf91b
octave_struct::subsref: don't resize for simple x(idx) case
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
237 %! assert (size (x), [1, 2]); |
|
d9987dbdf91b
octave_struct::subsref: don't resize for simple x(idx) case
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
238 %! assert (x(1).a.a, 1); |
|
d9987dbdf91b
octave_struct::subsref: don't resize for simple x(idx) case
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
239 %! assert (x(2).a.a, 2); |
|
d9987dbdf91b
octave_struct::subsref: don't resize for simple x(idx) case
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
240 */ |
|
d9987dbdf91b
octave_struct::subsref: don't resize for simple x(idx) case
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
241 |
| 3933 | 242 octave_value |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
243 octave_struct::numeric_conv (const octave_value& val, |
| 3933 | 244 const std::string& type) |
| 245 { | |
| 246 octave_value retval; | |
| 247 | |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
248 if (type.length () > 0 && type[0] == '.' && ! val.is_map ()) |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
249 retval = Octave_map (); |
| 3933 | 250 else |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
251 retval = val; |
| 3933 | 252 |
| 253 return retval; | |
| 254 } | |
| 255 | |
| 256 octave_value | |
| 4247 | 257 octave_struct::subsasgn (const std::string& type, |
| 4219 | 258 const std::list<octave_value_list>& idx, |
| 3933 | 259 const octave_value& rhs) |
| 2376 | 260 { |
| 3933 | 261 octave_value retval; |
| 262 | |
| 263 int n = type.length (); | |
| 264 | |
| 265 octave_value t_rhs = rhs; | |
| 266 | |
|
9286
c2248cc4821a
don't crash on assignments like a() = 1
Jaroslav Hajek <highegg@gmail.com>
parents:
9190
diff
changeset
|
267 if (idx.front ().empty ()) |
|
c2248cc4821a
don't crash on assignments like a() = 1
Jaroslav Hajek <highegg@gmail.com>
parents:
9190
diff
changeset
|
268 { |
|
c2248cc4821a
don't crash on assignments like a() = 1
Jaroslav Hajek <highegg@gmail.com>
parents:
9190
diff
changeset
|
269 error ("missing index in indexed assignment"); |
|
c2248cc4821a
don't crash on assignments like a() = 1
Jaroslav Hajek <highegg@gmail.com>
parents:
9190
diff
changeset
|
270 return retval; |
|
c2248cc4821a
don't crash on assignments like a() = 1
Jaroslav Hajek <highegg@gmail.com>
parents:
9190
diff
changeset
|
271 } |
|
c2248cc4821a
don't crash on assignments like a() = 1
Jaroslav Hajek <highegg@gmail.com>
parents:
9190
diff
changeset
|
272 |
| 3933 | 273 if (n > 1 && ! (type.length () == 2 && type[0] == '(' && type[1] == '.')) |
| 274 { | |
| 275 switch (type[0]) | |
| 276 { | |
| 277 case '(': | |
| 278 { | |
| 279 if (type.length () > 1 && type[1] == '.') | |
| 280 { | |
| 4219 | 281 std::list<octave_value_list>::const_iterator p = idx.begin (); |
| 282 octave_value_list t_idx = *p; | |
| 3933 | 283 |
| 4513 | 284 octave_value_list key_idx = *++p; |
| 285 | |
| 286 assert (key_idx.length () == 1); | |
| 3933 | 287 |
| 4513 | 288 std::string key = key_idx(0).string_value (); |
| 3933 | 289 |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
290 std::list<octave_value_list> next_idx (idx); |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
291 |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
292 // We handled two index elements, so subsasgn to |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
293 // needs to skip both of them. |
| 3933 | 294 |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
295 next_idx.erase (next_idx.begin ()); |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
296 next_idx.erase (next_idx.begin ()); |
|
8456
c1709a45b45b
optimize structure components access
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
297 |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
298 std::string next_type = type.substr (2); |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
299 |
|
9087
961410931a4f
fix nested struct assignments
Jaroslav Hajek <highegg@gmail.com>
parents:
9036
diff
changeset
|
300 Cell tmpc (1, 1); |
|
961410931a4f
fix nested struct assignments
Jaroslav Hajek <highegg@gmail.com>
parents:
9036
diff
changeset
|
301 Octave_map::iterator pkey = map.seek (key); |
|
961410931a4f
fix nested struct assignments
Jaroslav Hajek <highegg@gmail.com>
parents:
9036
diff
changeset
|
302 if (pkey != map.end ()) |
|
961410931a4f
fix nested struct assignments
Jaroslav Hajek <highegg@gmail.com>
parents:
9036
diff
changeset
|
303 { |
|
961410931a4f
fix nested struct assignments
Jaroslav Hajek <highegg@gmail.com>
parents:
9036
diff
changeset
|
304 pkey->second.make_unique (); |
|
961410931a4f
fix nested struct assignments
Jaroslav Hajek <highegg@gmail.com>
parents:
9036
diff
changeset
|
305 tmpc = pkey->second.index (idx.front (), true); |
|
961410931a4f
fix nested struct assignments
Jaroslav Hajek <highegg@gmail.com>
parents:
9036
diff
changeset
|
306 } |
| 3933 | 307 |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
308 // FIXME: better code reuse? cf. octave_cell::subsasgn and the case below. |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
309 if (! error_state) |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
310 { |
|
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8564
diff
changeset
|
311 if (tmpc.numel () == 1) |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
312 { |
|
9087
961410931a4f
fix nested struct assignments
Jaroslav Hajek <highegg@gmail.com>
parents:
9036
diff
changeset
|
313 octave_value& tmp = tmpc(0); |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
314 |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
315 if (! tmp.is_defined () || tmp.is_zero_by_zero ()) |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
316 { |
| 8564 | 317 tmp = octave_value::empty_conv (next_type, rhs); |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
318 tmp.make_unique (); // probably a no-op. |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
319 } |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
320 else |
|
8580
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
321 // optimization: ignore the copy still stored inside our map. |
|
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
322 tmp.make_unique (1); |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
323 |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
324 if (! error_state) |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
325 t_rhs = tmp.subsasgn (next_type, next_idx, rhs); |
|
8456
c1709a45b45b
optimize structure components access
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
326 } |
|
c1709a45b45b
optimize structure components access
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
327 else |
|
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8564
diff
changeset
|
328 gripe_indexed_cs_list (); |
| 3933 | 329 } |
| 330 } | |
| 331 else | |
| 332 gripe_invalid_index_for_assignment (); | |
| 333 } | |
| 334 break; | |
| 335 | |
| 336 case '.': | |
| 337 { | |
| 338 octave_value_list key_idx = idx.front (); | |
| 339 | |
| 340 assert (key_idx.length () == 1); | |
| 341 | |
| 342 std::string key = key_idx(0).string_value (); | |
| 343 | |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
344 std::list<octave_value_list> next_idx (idx); |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
345 |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
346 next_idx.erase (next_idx.begin ()); |
| 3933 | 347 |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
348 std::string next_type = type.substr (1); |
|
8456
c1709a45b45b
optimize structure components access
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
349 |
|
8580
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
350 Cell tmpc (1, 1); |
|
9087
961410931a4f
fix nested struct assignments
Jaroslav Hajek <highegg@gmail.com>
parents:
9036
diff
changeset
|
351 Octave_map::iterator pkey = map.seek (key); |
|
961410931a4f
fix nested struct assignments
Jaroslav Hajek <highegg@gmail.com>
parents:
9036
diff
changeset
|
352 if (pkey != map.end ()) |
|
961410931a4f
fix nested struct assignments
Jaroslav Hajek <highegg@gmail.com>
parents:
9036
diff
changeset
|
353 { |
|
961410931a4f
fix nested struct assignments
Jaroslav Hajek <highegg@gmail.com>
parents:
9036
diff
changeset
|
354 pkey->second.make_unique (); |
|
961410931a4f
fix nested struct assignments
Jaroslav Hajek <highegg@gmail.com>
parents:
9036
diff
changeset
|
355 tmpc = pkey->second; |
|
961410931a4f
fix nested struct assignments
Jaroslav Hajek <highegg@gmail.com>
parents:
9036
diff
changeset
|
356 } |
| 3933 | 357 |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
358 // FIXME: better code reuse? |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
359 if (! error_state) |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
360 { |
|
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8564
diff
changeset
|
361 if (tmpc.numel () == 1) |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
362 { |
|
9087
961410931a4f
fix nested struct assignments
Jaroslav Hajek <highegg@gmail.com>
parents:
9036
diff
changeset
|
363 octave_value& tmp = tmpc(0); |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
364 |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
365 if (! tmp.is_defined () || tmp.is_zero_by_zero ()) |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
366 { |
|
8580
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
367 tmp = octave_value::empty_conv (next_type, rhs); |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
368 tmp.make_unique (); // probably a no-op. |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
369 } |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
370 else |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
371 // optimization: ignore the copy still stored inside our map. |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
372 tmp.make_unique (1); |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
373 |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
374 if (! error_state) |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
375 t_rhs = tmp.subsasgn (next_type, next_idx, rhs); |
|
8456
c1709a45b45b
optimize structure components access
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
376 } |
|
c1709a45b45b
optimize structure components access
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
377 else |
|
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8564
diff
changeset
|
378 gripe_indexed_cs_list (); |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
379 } |
| 3933 | 380 } |
| 381 break; | |
| 382 | |
| 383 case '{': | |
| 384 gripe_invalid_index_type (type_name (), type[0]); | |
| 385 break; | |
| 386 | |
| 387 default: | |
| 388 panic_impossible (); | |
| 389 } | |
| 390 } | |
| 391 | |
| 392 if (! error_state) | |
| 393 { | |
| 394 switch (type[0]) | |
| 395 { | |
| 396 case '(': | |
| 397 { | |
| 398 if (n > 1 && type[1] == '.') | |
| 399 { | |
| 4219 | 400 std::list<octave_value_list>::const_iterator p = idx.begin (); |
| 401 octave_value_list key_idx = *++p; | |
|
8587
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
402 octave_value_list idxf = idx.front (); |
| 3933 | 403 |
| 404 assert (key_idx.length () == 1); | |
| 405 | |
| 406 std::string key = key_idx(0).string_value (); | |
| 407 | |
| 408 if (! error_state) | |
| 409 { | |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
410 if (t_rhs.is_cs_list ()) |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
411 { |
|
8587
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
412 Cell tmp_cell = Cell (t_rhs.list_value ()); |
|
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
413 |
|
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
414 // 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
|
415 |
|
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
416 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
|
417 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
|
418 if (! idxf(k).is_magic_colon ()) didx(k) = idxf(k).numel (); |
|
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
419 |
|
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
420 if (didx.numel () == tmp_cell.numel ()) |
|
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
421 tmp_cell = tmp_cell.reshape (didx); |
|
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
422 |
|
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
423 |
|
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
424 map.assign (idxf, key, tmp_cell); |
| 3933 | 425 |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
426 if (! error_state) |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
427 { |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
428 count++; |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
429 retval = octave_value (this); |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
430 } |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
431 else |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
432 gripe_failed_assignment (); |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
433 } |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
434 else |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
435 { |
|
9087
961410931a4f
fix nested struct assignments
Jaroslav Hajek <highegg@gmail.com>
parents:
9036
diff
changeset
|
436 const Octave_map& cmap = const_cast<const Octave_map &> (map); |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
437 // cast map to const reference to avoid forced key insertion. |
|
8587
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
438 if (idxf.all_scalars () |
|
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
439 || cmap.contents (key).index (idxf, true).numel () == 1) |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
440 { |
|
8587
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
441 map.assign (idxf, key, t_rhs.storable_value ()); |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
442 if (! error_state) |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
443 { |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
444 count++; |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
445 retval = octave_value (this); |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
446 } |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
447 else |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
448 gripe_failed_assignment (); |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
449 } |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
450 else if (! error_state) |
|
10030
83bb2a78c07d
improve simple assignments error checks and messages
Jaroslav Hajek <highegg@gmail.com>
parents:
9892
diff
changeset
|
451 gripe_nonbraced_cs_list_assignment (); |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
452 } |
| 3933 | 453 } |
| 454 else | |
| 455 gripe_failed_assignment (); | |
| 456 } | |
| 457 else | |
| 4197 | 458 { |
|
9529
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
459 if (t_rhs.is_map()) |
| 4197 | 460 { |
| 5592 | 461 Octave_map rhs_map = t_rhs.map_value (); |
| 4197 | 462 |
| 463 if (! error_state) | |
| 5592 | 464 { |
| 465 map.assign (idx.front (), rhs_map); | |
| 466 | |
| 467 if (! error_state) | |
| 5759 | 468 { |
| 469 count++; | |
| 470 retval = octave_value (this); | |
| 471 } | |
| 5592 | 472 else |
| 473 gripe_failed_assignment (); | |
| 474 } | |
| 4197 | 475 else |
| 5592 | 476 error ("invalid structure assignment"); |
| 4197 | 477 } |
| 4513 | 478 else |
| 5592 | 479 { |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8031
diff
changeset
|
480 if (t_rhs.is_null_value()) |
| 5592 | 481 { |
| 482 map.maybe_delete_elements (idx.front()); | |
| 483 | |
| 484 if (! error_state) | |
| 5759 | 485 { |
| 486 count++; | |
| 487 retval = octave_value (this); | |
| 488 } | |
| 5592 | 489 else |
| 490 gripe_failed_assignment (); | |
| 491 } | |
| 492 else | |
| 493 error ("invalid structure assignment"); | |
| 494 } | |
| 4197 | 495 } |
| 3933 | 496 } |
| 497 break; | |
| 498 | |
| 499 case '.': | |
| 500 { | |
|
9529
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
501 octave_value_list key_idx = idx.front (); |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
502 |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
503 assert (key_idx.length () == 1); |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
504 |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
505 std::string key = key_idx(0).string_value (); |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
506 |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
507 if (t_rhs.is_cs_list ()) |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
508 { |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
509 Cell tmp_cell = Cell (t_rhs.list_value ()); |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
510 |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
511 // The shape of the RHS is irrelevant, we just want |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
512 // the number of elements to agree and to preserve the |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
513 // shape of the left hand side of the assignment. |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
514 |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
515 if (numel () == tmp_cell.numel ()) |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
516 tmp_cell = tmp_cell.reshape (dims ()); |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
517 |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
518 map.assign (key, tmp_cell); |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
519 } |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
520 else |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
521 // Regularize a null matrix if stored into a struct component. |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
522 map.assign (key, t_rhs.storable_value ()); |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
523 |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
524 if (! error_state) |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
525 { |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
526 count++; |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
527 retval = octave_value (this); |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
528 } |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
529 else |
|
8e5009334661
partially revert e79470be3ecb
Jaroslav Hajek <highegg@gmail.com>
parents:
9522
diff
changeset
|
530 gripe_failed_assignment (); |
| 3933 | 531 } |
| 532 break; | |
| 533 | |
| 534 case '{': | |
| 535 gripe_invalid_index_type (type_name (), type[0]); | |
| 536 break; | |
| 537 | |
| 538 default: | |
| 539 panic_impossible (); | |
| 540 } | |
| 541 } | |
| 542 else | |
| 543 gripe_failed_assignment (); | |
| 544 | |
| 545 return retval; | |
| 2376 | 546 } |
| 547 | |
| 7046 | 548 octave_value |
| 549 octave_struct::do_index_op (const octave_value_list& idx, bool resize_ok) | |
| 550 { | |
|
8679
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8587
diff
changeset
|
551 // Octave_map handles indexing itself. |
|
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8587
diff
changeset
|
552 return map.index (idx, resize_ok); |
| 7046 | 553 } |
| 554 | |
| 4791 | 555 size_t |
| 556 octave_struct::byte_size (void) const | |
| 557 { | |
| 558 // Neglect the size of the fieldnames. | |
| 559 | |
| 560 size_t retval = 0; | |
| 561 | |
| 562 for (Octave_map::const_iterator p = map.begin (); p != map.end (); p++) | |
| 563 { | |
| 564 std::string key = map.key (p); | |
| 565 | |
| 566 octave_value val = octave_value (map.contents (p)); | |
| 567 | |
| 568 retval += val.byte_size (); | |
| 569 } | |
| 570 | |
| 571 return retval; | |
| 572 } | |
| 573 | |
| 2376 | 574 void |
| 3523 | 575 octave_struct::print (std::ostream& os, bool) const |
| 2901 | 576 { |
| 577 print_raw (os); | |
| 578 } | |
| 579 | |
| 580 void | |
| 3523 | 581 octave_struct::print_raw (std::ostream& os, bool) const |
| 2376 | 582 { |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
10030
diff
changeset
|
583 unwind_protect frame; |
| 2376 | 584 |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
10030
diff
changeset
|
585 frame.protect_var (Vstruct_levels_to_print); |
| 2376 | 586 |
| 3961 | 587 if (Vstruct_levels_to_print >= 0) |
| 2376 | 588 { |
|
7571
c01ff6818f4c
simplify struct array printing
John W. Eaton <jwe@octave.org>
parents:
7460
diff
changeset
|
589 bool print_keys_only = Vstruct_levels_to_print-- == 0; |
| 3961 | 590 |
| 2901 | 591 indent (os); |
| 592 os << "{"; | |
| 593 newline (os); | |
| 2376 | 594 |
| 2901 | 595 increment_indent_level (); |
| 2376 | 596 |
| 5598 | 597 octave_idx_type n = map.numel (); |
| 3932 | 598 |
|
7571
c01ff6818f4c
simplify struct array printing
John W. Eaton <jwe@octave.org>
parents:
7460
diff
changeset
|
599 if (n != 1 || print_keys_only) |
| 4604 | 600 { |
| 601 indent (os); | |
| 602 dim_vector dv = dims (); | |
| 603 os << dv.str () << " struct array containing the fields:"; | |
| 604 newline (os); | |
| 605 newline (os); | |
| 606 | |
| 607 increment_indent_level (); | |
| 608 } | |
| 609 | |
| 5880 | 610 string_vector key_list = map.keys (); |
| 611 | |
| 612 for (octave_idx_type i = 0; i < key_list.length (); i++) | |
| 2376 | 613 { |
| 5880 | 614 std::string key = key_list[i]; |
| 615 | |
| 616 Cell val = map.contents (key); | |
| 2376 | 617 |
| 4499 | 618 octave_value tmp = (n == 1) ? val(0) : octave_value (val, true); |
| 3961 | 619 |
|
7571
c01ff6818f4c
simplify struct array printing
John W. Eaton <jwe@octave.org>
parents:
7460
diff
changeset
|
620 if (n != 1 || print_keys_only) |
| 3932 | 621 { |
| 3961 | 622 indent (os); |
| 4604 | 623 os << key; |
| 624 if (n == 1) | |
| 625 { | |
| 626 dim_vector dv = tmp.dims (); | |
| 627 os << ": " << dv.str () << " " << tmp.type_name (); | |
| 628 } | |
| 3961 | 629 newline (os); |
| 3932 | 630 } |
| 3961 | 631 else |
| 4121 | 632 tmp.print_with_name (os, key); |
| 2376 | 633 } |
| 634 | |
|
7571
c01ff6818f4c
simplify struct array printing
John W. Eaton <jwe@octave.org>
parents:
7460
diff
changeset
|
635 if (n != 1 || print_keys_only) |
| 4604 | 636 decrement_indent_level (); |
| 637 | |
| 2901 | 638 decrement_indent_level (); |
| 2376 | 639 |
| 2901 | 640 indent (os); |
| 641 os << "}"; | |
| 642 newline (os); | |
| 2376 | 643 } |
| 644 else | |
| 2901 | 645 { |
| 3961 | 646 indent (os); |
| 647 os << "<structure>"; | |
| 2901 | 648 newline (os); |
| 649 } | |
| 2376 | 650 } |
| 651 | |
| 2901 | 652 bool |
| 3523 | 653 octave_struct::print_name_tag (std::ostream& os, const std::string& name) const |
| 2901 | 654 { |
| 3961 | 655 bool retval = false; |
| 656 | |
| 2901 | 657 indent (os); |
| 3961 | 658 |
| 659 if (Vstruct_levels_to_print < 0) | |
| 660 os << name << " = "; | |
| 661 else | |
| 662 { | |
| 663 os << name << " ="; | |
| 664 newline (os); | |
| 665 retval = true; | |
| 666 } | |
| 667 | |
| 668 return retval; | |
| 2901 | 669 } |
| 670 | |
| 4744 | 671 static bool |
| 672 scalar (const dim_vector& dims) | |
| 673 { | |
| 674 return dims.length () == 2 && dims (0) == 1 && dims (1) == 1; | |
| 675 } | |
| 676 | |
| 677 /* | |
| 678 %!shared x | |
| 679 %! x(1).a=1; x(2).a=2; x(1).b=3; x(2).b=3; | |
| 680 %!assert(struct('a',1,'b',3),x(1)) | |
| 5592 | 681 %!assert(isempty(x([]))) |
| 682 %!assert(isempty(struct('a',{},'b',{}))) | |
| 4744 | 683 %!assert(struct('a',{1,2},'b',{3,3}),x) |
| 684 %!assert(struct('a',{1,2},'b',3),x) | |
| 685 %!assert(struct('a',{1,2},'b',{3}),x) | |
| 686 %!assert(struct('b',3,'a',{1,2}),x) | |
| 687 %!assert(struct('b',{3},'a',{1,2}),x) | |
| 688 %!test x=struct([]); | |
| 689 %!assert(size(x),[0,0]); | |
| 690 %!assert(isstruct(x)); | |
| 691 %!assert(isempty(fieldnames(x))); | |
| 692 %!fail("struct('a',{1,2},'b',{1,2,3})","dimensions of parameter 2 do not match those of parameter 4") | |
| 5582 | 693 %!fail("struct(1,2,3,4)","struct expects alternating \"field\", VALUE pairs"); |
| 694 %!fail("struct('1',2,'3')","struct expects alternating \"field\", VALUE pairs"); | |
| 4744 | 695 */ |
| 696 | |
| 697 DEFUN (struct, args, , | |
| 698 "-*- texinfo -*-\n\ | |
| 699 @deftypefn {Built-in Function} {} struct (\"field\", @var{value}, \"field\", @var{value}, @dots{})\n\ | |
| 700 \n\ | |
| 701 Create a structure and initialize its value.\n\ | |
| 702 \n\ | |
| 703 If the values are cell arrays, create a structure array and initialize\n\ | |
| 704 its values. The dimensions of each cell array of values must match.\n\ | |
| 705 Singleton cells and non-cell values are repeated so that they fill\n\ | |
| 706 the entire array. If the cells are empty, create an empty structure\n\ | |
| 4911 | 707 array with the specified field names.\n\ |
| 9190 | 708 \n\ |
| 709 If the argument is an object, return the underlying struct.\n\ | |
| 4911 | 710 @end deftypefn") |
| 4744 | 711 { |
| 6946 | 712 octave_value retval; |
| 4744 | 713 |
| 714 int nargin = args.length (); | |
| 715 | |
| 5444 | 716 // struct ([]) returns an empty struct. |
| 717 | |
| 718 // struct (empty_matrix) returns an empty struct with the same | |
| 719 // dimensions as the empty matrix. | |
| 720 | |
| 721 // Note that struct () creates a 1x1 struct with no fields for | |
| 722 // compatibility with Matlab. | |
| 4744 | 723 |
| 9190 | 724 if (nargin == 1 && args(0).is_object ()) |
| 725 { | |
| 726 Octave_map m = args(0).map_value (); | |
| 727 retval = octave_value (new octave_struct (m)); | |
| 728 | |
| 729 return retval; | |
| 730 } | |
| 731 | |
| 6946 | 732 if ((nargin == 1 || nargin == 2) |
| 733 && args(0).is_empty () && args(0).is_real_matrix ()) | |
| 734 { | |
| 735 Cell fields; | |
| 736 | |
| 737 if (nargin == 2) | |
| 738 { | |
| 739 if (args(1).is_cellstr ()) | |
| 740 retval = Octave_map (args(0).dims (), args(1).cell_value ()); | |
| 741 else | |
| 742 error ("struct: expecting cell array of field names as second argument"); | |
| 743 } | |
| 744 else | |
| 745 retval = Octave_map (args(0).dims ()); | |
| 746 | |
| 747 return retval; | |
| 748 } | |
| 4744 | 749 |
| 750 // Check for "field", VALUE pairs. | |
| 751 | |
| 752 for (int i = 0; i < nargin; i += 2) | |
| 753 { | |
| 754 if (! args(i).is_string () || i + 1 >= nargin) | |
| 755 { | |
| 756 error ("struct expects alternating \"field\", VALUE pairs"); | |
| 757 return retval; | |
| 758 } | |
| 759 } | |
| 760 | |
| 761 // Check that the dimensions of the values correspond. | |
| 762 | |
| 763 dim_vector dims (1, 1); | |
| 764 | |
| 765 int first_dimensioned_value = 0; | |
| 766 | |
| 767 for (int i = 1; i < nargin; i += 2) | |
| 768 { | |
| 769 if (args(i).is_cell ()) | |
| 770 { | |
| 771 dim_vector argdims (args(i).dims ()); | |
| 772 | |
| 773 if (! scalar (argdims)) | |
| 774 { | |
| 775 if (! first_dimensioned_value) | |
| 776 { | |
| 777 dims = argdims; | |
| 778 first_dimensioned_value = i + 1; | |
| 779 } | |
| 780 else if (dims != argdims) | |
| 781 { | |
| 782 error ("struct: dimensions of parameter %d do not match those of parameter %d", | |
| 783 first_dimensioned_value, i+1); | |
| 784 return retval; | |
| 785 } | |
| 786 } | |
| 787 } | |
| 788 } | |
| 789 | |
| 790 // Create the return value. | |
| 791 | |
| 792 Octave_map map (dims); | |
| 793 | |
| 794 for (int i = 0; i < nargin; i+= 2) | |
| 795 { | |
| 796 // Get key. | |
| 797 | |
| 798 std::string key (args(i).string_value ()); | |
| 799 | |
| 800 if (error_state) | |
| 801 return retval; | |
| 802 | |
| 6811 | 803 if (! valid_identifier (key)) |
| 804 { | |
| 805 error ("struct: invalid structure field name `%s'", key.c_str ()); | |
| 806 return retval; | |
| 807 } | |
| 808 | |
| 4744 | 809 // Value may be v, { v }, or { v1, v2, ... } |
| 810 // In the first two cases, we need to create a cell array of | |
| 811 // the appropriate dimensions filled with v. In the last case, | |
| 812 // the cell array has already been determined to be of the | |
| 813 // correct dimensions. | |
| 814 | |
| 815 if (args(i+1).is_cell ()) | |
| 816 { | |
| 817 const Cell c (args(i+1).cell_value ()); | |
| 818 | |
| 819 if (error_state) | |
| 820 return retval; | |
| 821 | |
| 822 if (scalar (c.dims ())) | |
| 823 map.assign (key, Cell (dims, c(0))); | |
| 824 else | |
| 825 map.assign (key, c); | |
| 826 } | |
| 827 else | |
| 828 map.assign (key, Cell (dims, args(i+1))); | |
| 829 | |
| 830 if (error_state) | |
| 831 return retval; | |
| 832 } | |
| 6946 | 833 |
| 4744 | 834 return octave_value (map); |
| 835 } | |
| 836 | |
| 4358 | 837 DEFUN (isstruct, args, , |
| 838 "-*- texinfo -*-\n\ | |
| 839 @deftypefn {Built-in Function} {} isstruct (@var{expr})\n\ | |
|
10122
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
840 Return 1 if the value of the expression @var{expr} is a structure\n\ |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
841 (or a structure array).\n\ |
| 4358 | 842 @end deftypefn") |
| 843 { | |
| 844 octave_value retval; | |
| 845 | |
| 846 if (args.length () == 1) | |
| 847 retval = args(0).is_map (); | |
| 848 else | |
| 5823 | 849 print_usage (); |
| 4358 | 850 |
| 851 return retval; | |
| 852 } | |
| 853 | |
| 854 DEFUN (fieldnames, args, , | |
| 855 "-*- texinfo -*-\n\ | |
| 856 @deftypefn {Built-in Function} {} fieldnames (@var{struct})\n\ | |
| 857 Return a cell array of strings naming the elements of the structure\n\ | |
| 858 @var{struct}. It is an error to call @code{fieldnames} with an\n\ | |
| 859 argument that is not a structure.\n\ | |
| 860 @end deftypefn") | |
| 861 { | |
| 862 octave_value retval; | |
| 863 | |
| 864 int nargin = args.length (); | |
| 865 | |
| 866 if (nargin == 1) | |
| 867 { | |
| 7336 | 868 octave_value arg = args(0); |
| 869 | |
| 870 if (arg.is_map () || arg.is_object ()) | |
| 4358 | 871 { |
| 7336 | 872 Octave_map m = arg.map_value (); |
| 873 | |
| 4744 | 874 string_vector keys = m.keys (); |
| 7336 | 875 |
| 4744 | 876 if (keys.length () == 0) |
| 877 retval = Cell (0, 1); | |
| 878 else | |
| 879 retval = Cell (m.keys ()); | |
| 4358 | 880 } |
| 881 else | |
| 882 gripe_wrong_type_arg ("fieldnames", args(0)); | |
| 883 } | |
| 884 else | |
| 5823 | 885 print_usage (); |
| 4358 | 886 |
| 887 return retval; | |
| 888 } | |
| 889 | |
|
10122
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
890 /* |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
891 %!# test preservation of fieldname order |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
892 %!test |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
893 %! x(3).d=1; x(2).a=2; x(1).b=3; x(2).c=3; |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
894 %! assert(fieldnames(x), {"d"; "a"; "b"; "c"}); |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
895 */ |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
896 |
| 4358 | 897 DEFUN (isfield, args, , |
| 898 "-*- texinfo -*-\n\ | |
| 899 @deftypefn {Built-in Function} {} isfield (@var{expr}, @var{name})\n\ | |
| 900 Return true if the expression @var{expr} is a structure and it includes an\n\ | |
| 901 element named @var{name}. The first argument must be a structure and\n\ | |
| 902 the second must be a string.\n\ | |
| 903 @end deftypefn") | |
| 904 { | |
| 905 octave_value retval; | |
| 906 | |
| 907 int nargin = args.length (); | |
| 908 | |
| 909 if (nargin == 2) | |
| 910 { | |
| 911 retval = false; | |
| 912 | |
| 5775 | 913 // FIXME -- should this work for all types that can do |
| 4358 | 914 // structure reference operations? |
| 915 | |
| 916 if (args(0).is_map () && args(1).is_string ()) | |
| 917 { | |
| 918 std::string key = args(1).string_value (); | |
| 919 | |
| 920 Octave_map m = args(0).map_value (); | |
| 921 | |
| 922 retval = m.contains (key) != 0; | |
| 923 } | |
| 924 } | |
| 925 else | |
| 5823 | 926 print_usage (); |
| 4358 | 927 |
| 928 return retval; | |
| 929 } | |
| 930 | |
| 9784 | 931 DEFUN (nfields, args, , |
| 932 "-*- texinfo -*-\n\ | |
| 933 @deftypefn {Built-in Function} {} nfields (@var{s})\n\ | |
| 934 Return the number of fields of the structure @var{s}.\n\ | |
| 935 @end deftypefn") | |
| 936 { | |
| 937 octave_value retval; | |
| 938 | |
| 939 int nargin = args.length (); | |
| 940 | |
| 941 if (nargin == 1 && args(0).is_map ()) | |
| 942 { | |
| 943 retval = static_cast<double> (args(0).nfields ()); | |
| 944 } | |
| 945 else | |
| 946 print_usage (); | |
| 947 | |
| 948 return retval; | |
| 949 } | |
| 950 | |
|
10122
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
951 /* |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
952 %!# test isfield |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
953 %!test |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
954 %! x(3).d=1; x(2).a=2; x(1).b=3; x(2).c=3; |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
955 %! assert (isfield (x, "b")); |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
956 %!assert( isfield( struct("a", "1"), "a")); |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
957 %!assert( isfield( {1}, "c"), logical (0)); |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
958 %!assert( isfield( struct("a", "1"), 10), logical (0)); |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
959 %!assert( isfield( struct("a", "b"), "a "), logical (0)); |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
960 |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
961 */ |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
962 |
| 4750 | 963 // Check that the dimensions of the input arguments are correct. |
| 964 | |
| 965 static bool | |
| 966 cell2struct_check_args (const dim_vector& c_dv, const dim_vector& f_dv, | |
| 967 bool is_cell, int dim) | |
| 968 { | |
| 4751 | 969 bool retval = true; |
| 4750 | 970 |
| 971 if (dim >= 0 && dim < c_dv.length ()) | |
| 972 { | |
| 973 if (is_cell) | |
| 974 { | |
| 4752 | 975 if (f_dv.numel () != c_dv(dim)) |
| 4750 | 976 { |
| 4751 | 977 error ("cell2struct: numel (FIELD) != size (CELL, DIM)"); |
| 4750 | 978 |
| 979 retval = false; | |
| 980 } | |
| 981 } | |
| 982 else | |
| 983 { | |
| 984 if (f_dv.length () > 2) | |
| 985 { | |
| 4751 | 986 error ("cell2struct: field array must be a 2-d matrix"); |
| 4750 | 987 |
| 988 retval = false; | |
| 989 } | |
| 990 else if (f_dv(0) != c_dv(dim)) | |
| 991 { | |
| 4751 | 992 error ("cell2struct: size (FIELD, 1) != length (C, DIM)"); |
| 4750 | 993 |
| 994 retval = false; | |
| 995 } | |
| 996 } | |
| 997 } | |
| 998 else | |
| 999 { | |
| 1000 error ("cell2struct: DIM out of range"); | |
| 1001 | |
| 1002 retval = false; | |
| 1003 } | |
| 1004 | |
| 1005 return retval; | |
| 1006 } | |
| 1007 | |
| 1008 static void | |
| 5275 | 1009 cell2struct_construct_idx (Array<octave_idx_type>& ra_idx1, |
| 1010 const Array<octave_idx_type>& ra_idx2, | |
| 1011 octave_idx_type dim, octave_idx_type fill_value) | |
| 4750 | 1012 { |
| 5275 | 1013 octave_idx_type iidx = 0; |
| 4750 | 1014 |
| 5275 | 1015 for (octave_idx_type idx = 0; idx < ra_idx1.length (); idx++) |
| 4750 | 1016 { |
| 1017 if (idx == dim) | |
| 1018 ra_idx1.elem (idx) = fill_value; | |
| 1019 else | |
| 1020 ra_idx1.elem (idx) = ra_idx2(iidx++); | |
| 1021 } | |
| 1022 } | |
| 1023 | |
| 1024 DEFUN (cell2struct, args, , | |
| 1025 "-*- texinfo -*-\n\ | |
| 4817 | 1026 @deftypefn {Built-in Function} {} cell2struct (@var{cell}, @var{fields}, @var{dim})\n\ |
|
9036
58604c45ca74
Cleanup of data types related documentation
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
1027 Convert @var{cell} to a structure. The number of fields in @var{fields}\n\ |
| 4817 | 1028 must match the number of elements in @var{cell} along dimension @var{dim},\n\ |
| 1029 that is @code{numel (@var{fields}) == size (@var{cell}, @var{dim})}.\n\ | |
| 4750 | 1030 \n\ |
| 1031 @example\n\ | |
| 1032 @group\n\ | |
| 7031 | 1033 A = cell2struct (@{'Peter', 'Hannah', 'Robert';\n\ |
| 1034 185, 170, 168@},\n\ | |
| 6519 | 1035 @{'Name','Height'@}, 1);\n\ |
| 4750 | 1036 A(1)\n\ |
|
10122
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1037 @result{} ans =\n\ |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1038 @{\n\ |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1039 Name = Peter\n\ |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1040 Height = 185\n\ |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1041 @}\n\ |
| 4750 | 1042 \n\ |
| 1043 @end group\n\ | |
| 1044 @end example\n\ | |
| 1045 @end deftypefn") | |
| 1046 { | |
| 1047 octave_value retval; | |
| 1048 | |
| 4751 | 1049 if (args.length () == 3) |
| 4750 | 1050 { |
| 4751 | 1051 Cell c = args(0).cell_value (); |
| 4750 | 1052 |
| 4751 | 1053 if (! error_state) |
| 4750 | 1054 { |
| 4751 | 1055 octave_value field = args(1); |
| 4750 | 1056 |
| 4751 | 1057 // Field is either cell or character matrix. |
| 4750 | 1058 |
| 5775 | 1059 // FIXME -- this could be simplified if we had |
| 4752 | 1060 // cellstr and iscellstr functions available. |
| 1061 | |
| 4751 | 1062 bool field_is_cell = field.is_cell (); |
| 4750 | 1063 |
| 4751 | 1064 Cell field_cell; |
| 1065 charMatrix field_char; | |
| 4750 | 1066 |
| 1067 if (field_is_cell) | |
| 4751 | 1068 field_cell = field.cell_value (); |
| 1069 else | |
| 1070 field_char = field.char_matrix_value (); | |
| 1071 | |
| 1072 if (! error_state) | |
| 4750 | 1073 { |
| 4751 | 1074 // Retrieve the dimension value. |
| 1075 | |
| 5775 | 1076 // FIXME -- int_value () should print out the |
| 4751 | 1077 // conversions it does to be Matlab compatible. |
| 1078 | |
| 5275 | 1079 octave_idx_type dim = args(2).int_value () - 1; |
| 4751 | 1080 |
| 1081 if (! error_state) | |
| 1082 { | |
| 1083 dim_vector c_dv = c.dims (); | |
| 1084 dim_vector field_dv = field.dims (); | |
| 1085 | |
| 1086 if (cell2struct_check_args (c_dv, field_dv, field_is_cell, | |
| 1087 dim)) | |
| 1088 { | |
| 5275 | 1089 octave_idx_type c_dv_length = c_dv.length (); |
| 4751 | 1090 |
| 1091 // Dimension vector for the Cell arrays to be | |
| 1092 // put into the structure. | |
| 1093 | |
| 1094 dim_vector value_dv; | |
| 1095 | |
| 1096 // Initialize c_value_dv. | |
| 4750 | 1097 |
| 4751 | 1098 if (c_dv_length == 2) |
| 1099 value_dv = dim_vector (1, 1); | |
| 1100 else | |
| 1101 value_dv.resize (c_dv_length - 1); | |
| 1102 | |
| 5275 | 1103 octave_idx_type idx_tmp = 0; |
| 4751 | 1104 |
| 5275 | 1105 for (octave_idx_type i = 0; i < c_dv_length; i++) |
| 4751 | 1106 { |
| 1107 if (i != dim) | |
| 1108 value_dv.elem (idx_tmp++) = c_dv.elem (i); | |
| 1109 } | |
| 1110 | |
| 1111 // All initializing is done, we can start moving | |
| 1112 // values. | |
| 1113 | |
| 1114 Octave_map map; | |
| 1115 | |
| 1116 // If field is a cell array then we use all | |
| 1117 // elements in array, on the other hand when | |
| 1118 // field is a character array the number of | |
| 1119 // elements is equals the number of rows. | |
| 1120 | |
| 5275 | 1121 octave_idx_type field_numel |
| 4751 | 1122 = field_is_cell ? field_dv.numel (): field_dv(0); |
| 1123 | |
| 1124 // For matlab compatibility. | |
| 1125 | |
| 1126 if (field_numel == 0) | |
| 1127 map.reshape (dim_vector (0, 1)); | |
| 4750 | 1128 |
| 5275 | 1129 for (octave_idx_type i = 0; i < field_numel; i++) |
| 4751 | 1130 { |
| 1131 // Construct cell array which goes into the | |
| 1132 // structure together with the appropriate | |
| 1133 // field name. | |
| 1134 | |
| 1135 Cell c_value (value_dv); | |
| 1136 | |
| 5275 | 1137 Array<octave_idx_type> value_idx (value_dv.length (), 0); |
| 1138 Array<octave_idx_type> c_idx (c_dv_length, 0); | |
| 4751 | 1139 |
| 5275 | 1140 for (octave_idx_type j = 0; j < value_dv.numel (); j++) |
| 4751 | 1141 { |
| 1142 // Need to do this to construct the | |
| 1143 // appropriate idx for getting elements | |
| 1144 // from the original cell array. | |
| 1145 | |
| 1146 cell2struct_construct_idx (c_idx, value_idx, | |
| 1147 dim, i); | |
| 1148 | |
| 1149 c_value.elem (value_idx) = c.elem (c_idx); | |
| 1150 | |
| 1151 increment_index (value_idx, value_dv); | |
| 1152 } | |
| 1153 | |
| 1154 std::string field_str; | |
| 4750 | 1155 |
| 4751 | 1156 if (field_is_cell) |
| 1157 { | |
| 1158 // Matlab retrieves the field values | |
| 1159 // column by column. | |
| 1160 | |
| 1161 octave_value field_tmp = field_cell.elem (i); | |
| 1162 | |
| 1163 field_str = field_tmp.string_value (); | |
| 1164 | |
| 1165 if (error_state) | |
| 1166 { | |
| 1167 error ("cell2struct: fields have to be of type string"); | |
| 1168 break; | |
| 1169 } | |
| 1170 } | |
| 1171 else | |
| 1172 { | |
| 1173 field_str = field_char.row_as_string (i); | |
| 1174 | |
| 1175 if (error_state) | |
| 1176 return retval; | |
| 1177 } | |
| 1178 | |
| 6811 | 1179 if (! valid_identifier (field_str)) |
| 1180 { | |
| 1181 error ("cell2struct: invalid field name `%s'", | |
| 1182 field_str.c_str ()); | |
| 1183 break; | |
| 1184 } | |
| 1185 | |
| 4751 | 1186 map.reshape (value_dv); |
| 1187 | |
| 1188 map.assign (field_str, c_value); | |
| 1189 } | |
| 1190 | |
| 1191 if (! error_state) | |
| 1192 retval = map; | |
| 1193 } | |
| 4750 | 1194 } |
| 4751 | 1195 else |
| 1196 error ("cell2struct: expecting third argument to be an integer"); | |
| 4750 | 1197 } |
| 1198 else | |
| 4751 | 1199 error ("cell2struct: expecting second argument to be a cell or character array"); |
| 4750 | 1200 } |
| 4751 | 1201 else |
| 1202 error ("cell2struct: expecting first argument to be a cell array"); | |
| 4750 | 1203 } |
| 4751 | 1204 else |
| 5823 | 1205 print_usage (); |
| 4750 | 1206 |
| 1207 return retval; | |
| 1208 } | |
| 1209 | |
|
10122
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1210 /* |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1211 %!# test cell2struct versus struct2cell |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1212 %!test |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1213 %! keys = cellstr (char (floor (rand (100,10)*24+65)))'; |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1214 %! vals = mat2cell(rand (100,1), ones (100,1), 1)'; |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1215 %! s = struct ([keys; vals]{:}); |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1216 %! t = cell2struct (vals, keys, 2); |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1217 %! assert (s, t); |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1218 %! assert (struct2cell (s), vals'); |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1219 %! assert (fieldnames (s), keys'); |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1220 */ |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1221 |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1222 |
| 4817 | 1223 // So we can call Fcellstr directly. |
| 1224 extern octave_value_list Fcellstr (const octave_value_list& args, int); | |
| 1225 | |
| 1226 DEFUN (rmfield, args, , | |
| 1227 "-*- texinfo -*-\n\ | |
| 1228 @deftypefn {Built-in Function} {} rmfield (@var{s}, @var{f})\n\ | |
|
10122
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1229 Return a copy of the structure (array) @var{s} with the field @var{f} removed.\n\ |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1230 If @var{f} is a cell array of strings or a character array, remove the\n\ |
| 4817 | 1231 named fields.\n\ |
| 5642 | 1232 @seealso{cellstr, iscellstr, setfield}\n\ |
| 1233 @end deftypefn") | |
| 4817 | 1234 { |
| 1235 octave_value retval; | |
| 1236 | |
| 1237 int nargin = args.length (); | |
| 1238 | |
| 1239 if (nargin == 2) | |
| 1240 { | |
| 1241 Octave_map m = args(0).map_value (); | |
| 1242 | |
| 1243 octave_value_list fval = Fcellstr (args(1), 1); | |
| 1244 | |
| 1245 if (! error_state) | |
| 1246 { | |
| 1247 Cell fcell = fval(0).cell_value (); | |
| 1248 | |
| 1249 for (int i = 0; i < fcell.numel (); i++) | |
| 1250 { | |
| 1251 std::string key = fcell(i).string_value (); | |
| 1252 | |
| 1253 if (m.contains (key)) | |
| 1254 m.del (key); | |
| 1255 else | |
| 1256 { | |
| 1257 error ("rmfield: structure does not contain field %s", | |
| 1258 key.c_str ()); | |
| 1259 | |
| 1260 break; | |
| 1261 } | |
| 1262 } | |
| 1263 | |
| 1264 if (! error_state) | |
| 1265 retval = m; | |
| 1266 } | |
| 1267 } | |
| 1268 else | |
| 5823 | 1269 print_usage (); |
| 4817 | 1270 |
| 1271 return retval; | |
| 1272 } | |
| 1273 | |
|
10122
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1274 /* |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1275 %!# test rmfield |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1276 %!test |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1277 %! x(3).d=1; x(2).a=2; x(1).b=3; x(2).c=3; x(6).f="abc123"; |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1278 %! y = rmfield (x, {"a", "f"}); |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1279 %! assert (fieldnames (y), {"d"; "b"; "c"}); |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1280 %! assert (size (y), [1, 6]); |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1281 */ |
|
9d1a14e12431
Update docs and add tests for container functions
Thorsten Meyer <thorsten.meyier@gmx.de>
parents:
10066
diff
changeset
|
1282 |
| 4817 | 1283 bool |
| 6974 | 1284 octave_struct::save_ascii (std::ostream& os) |
| 4817 | 1285 { |
| 1286 Octave_map m = map_value (); | |
|
8907
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1287 |
|
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1288 octave_idx_type nf = m.nfields (); |
|
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1289 |
|
9851
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1290 const dim_vector dv = dims (); |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1291 |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1292 os << "# ndims: " << dv.length () << "\n"; |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1293 |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1294 for (int i = 0; i < dv.length (); i++) |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1295 os << " " << dv (i); |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1296 os << "\n"; |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1297 |
|
8907
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1298 os << "# length: " << nf << "\n"; |
| 4817 | 1299 |
|
8907
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1300 // Iterating over the list of keys will preserve the order of the |
|
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1301 // fields. |
|
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1302 string_vector keys = m.keys (); |
|
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1303 |
|
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1304 for (octave_idx_type i = 0; i < nf; i++) |
| 4817 | 1305 { |
|
8907
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1306 std::string key = keys(i); |
| 4817 | 1307 |
|
8907
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1308 octave_value val = map.contents (key); |
|
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1309 |
|
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1310 bool b = save_ascii_data (os, val, key, false, 0); |
| 4817 | 1311 |
| 1312 if (! b) | |
| 1313 return os; | |
| 1314 } | |
| 1315 | |
| 1316 return true; | |
| 1317 } | |
| 1318 | |
| 1319 bool | |
| 1320 octave_struct::load_ascii (std::istream& is) | |
| 1321 { | |
| 5275 | 1322 octave_idx_type len = 0; |
|
9851
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1323 dim_vector dv (1, 1); |
| 4817 | 1324 bool success = true; |
| 1325 | |
|
9851
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1326 // KLUGE: earlier Octave versions did not save extra dimensions with struct, |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1327 // and as a result did not preserve dimensions for empty structs. |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1328 // The default dimensions were 1x1, which we want to preserve. |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1329 string_vector keywords(2); |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1330 |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1331 keywords[0] = "ndims"; |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1332 keywords[1] = "length"; |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1333 |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1334 std::string kw; |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1335 |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1336 if (extract_keyword (is, keywords, kw, len, true)) |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1337 { |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1338 if (kw == keywords[0]) |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1339 { |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1340 int mdims = std::max (len, 2); |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1341 dv.resize (mdims); |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1342 for (int i = 0; i < mdims; i++) |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1343 is >> dv(i); |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1344 |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1345 success = extract_keyword (is, keywords[1], len); |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1346 } |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1347 } |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1348 else |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1349 success = false; |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1350 |
|
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1351 if (success && len >= 0) |
| 4817 | 1352 { |
| 1353 if (len > 0) | |
| 1354 { | |
|
9851
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1355 Octave_map m (dv); |
| 4817 | 1356 |
| 5275 | 1357 for (octave_idx_type j = 0; j < len; j++) |
| 4817 | 1358 { |
| 1359 octave_value t2; | |
| 1360 bool dummy; | |
| 1361 | |
| 1362 // recurse to read cell elements | |
| 1363 std::string nm | |
| 5756 | 1364 = read_ascii_data (is, std::string (), dummy, t2, j); |
| 4817 | 1365 |
| 1366 if (!is) | |
| 1367 break; | |
| 1368 | |
| 6293 | 1369 Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2); |
| 5433 | 1370 |
| 6293 | 1371 if (error_state) |
| 1372 { | |
| 1373 error ("load: internal error loading struct elements"); | |
| 1374 return false; | |
| 1375 } | |
| 5433 | 1376 |
| 6293 | 1377 m.assign (nm, tcell); |
| 4817 | 1378 } |
| 1379 | |
| 1380 if (is) | |
| 1381 map = m; | |
| 1382 else | |
| 1383 { | |
| 1384 error ("load: failed to load structure"); | |
| 1385 success = false; | |
| 1386 } | |
| 1387 } | |
| 1388 else if (len == 0 ) | |
|
9851
1fac51c5f83f
save dims for empty structs
Jaroslav Hajek <highegg@gmail.com>
parents:
9784
diff
changeset
|
1389 map = Octave_map (dv); |
| 4817 | 1390 else |
| 1391 panic_impossible (); | |
| 1392 } | |
| 1393 else { | |
| 1394 error ("load: failed to extract number of elements in structure"); | |
| 1395 success = false; | |
| 1396 } | |
| 1397 | |
| 1398 return success; | |
| 1399 } | |
| 1400 | |
| 1401 bool | |
| 1402 octave_struct::save_binary (std::ostream& os, bool& save_as_floats) | |
| 1403 { | |
| 1404 Octave_map m = map_value (); | |
| 1405 | |
|
8907
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1406 octave_idx_type nf = m.nfields (); |
|
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1407 |
|
9857
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1408 dim_vector d = dims (); |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1409 if (d.length () < 1) |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1410 return false; |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1411 |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1412 // Use negative value for ndims |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1413 int32_t di = - d.length(); |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1414 os.write (reinterpret_cast<char *> (&di), 4); |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1415 for (int i = 0; i < d.length (); i++) |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1416 { |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1417 di = d(i); |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1418 os.write (reinterpret_cast<char *> (&di), 4); |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1419 } |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1420 |
|
8907
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1421 int32_t len = nf; |
| 5760 | 1422 os.write (reinterpret_cast<char *> (&len), 4); |
|
8907
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1423 |
|
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1424 // Iterating over the list of keys will preserve the order of the |
|
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1425 // fields. |
|
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1426 string_vector keys = m.keys (); |
|
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1427 |
|
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1428 for (octave_idx_type i = 0; i < nf; i++) |
| 4817 | 1429 { |
|
8907
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1430 std::string key = keys(i); |
| 4817 | 1431 |
|
8907
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1432 octave_value val = map.contents (key); |
|
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1433 |
|
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1434 bool b = save_binary_data (os, val, key, "", 0, save_as_floats); |
| 4817 | 1435 |
| 1436 if (! b) | |
| 1437 return os; | |
| 1438 } | |
| 1439 | |
| 1440 return true; | |
| 1441 } | |
| 1442 | |
| 1443 bool | |
| 1444 octave_struct::load_binary (std::istream& is, bool swap, | |
| 5760 | 1445 oct_mach_info::float_format fmt) |
| 4817 | 1446 { |
| 1447 bool success = true; | |
| 5828 | 1448 int32_t len; |
| 5760 | 1449 if (! is.read (reinterpret_cast<char *> (&len), 4)) |
| 4817 | 1450 return false; |
| 1451 if (swap) | |
| 4944 | 1452 swap_bytes<4> (&len); |
| 4817 | 1453 |
|
9857
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1454 dim_vector dv (1, 1); |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1455 |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1456 if (len < 0) |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1457 { |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1458 // We have explicit dimensions. |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1459 int mdims = -len; |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1460 |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1461 int32_t di; |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1462 dv.resize (mdims); |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1463 |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1464 for (int i = 0; i < mdims; i++) |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1465 { |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1466 if (! is.read (reinterpret_cast<char *> (&di), 4)) |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1467 return false; |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1468 if (swap) |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1469 swap_bytes<4> (&di); |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1470 dv(i) = di; |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1471 } |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1472 |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1473 if (! is.read (reinterpret_cast<char *> (&len), 4)) |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1474 return false; |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1475 if (swap) |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1476 swap_bytes<4> (&len); |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1477 } |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1478 |
| 4817 | 1479 if (len > 0) |
| 1480 { | |
|
9857
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1481 Octave_map m (dv); |
| 4817 | 1482 |
| 5275 | 1483 for (octave_idx_type j = 0; j < len; j++) |
| 4817 | 1484 { |
| 1485 octave_value t2; | |
| 1486 bool dummy; | |
| 1487 std::string doc; | |
| 1488 | |
| 1489 // recurse to read cell elements | |
| 1490 std::string nm = read_binary_data (is, swap, fmt, std::string (), | |
| 1491 dummy, t2, doc); | |
| 1492 | |
| 1493 if (!is) | |
| 1494 break; | |
| 1495 | |
| 6293 | 1496 Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2); |
| 5433 | 1497 |
| 6293 | 1498 if (error_state) |
| 1499 { | |
| 1500 error ("load: internal error loading struct elements"); | |
| 1501 return false; | |
| 1502 } | |
| 5433 | 1503 |
| 6293 | 1504 m.assign (nm, tcell); |
| 4817 | 1505 } |
| 1506 | |
| 1507 if (is) | |
| 1508 map = m; | |
| 1509 else | |
| 1510 { | |
| 1511 error ("load: failed to load structure"); | |
| 1512 success = false; | |
| 1513 } | |
| 1514 } | |
|
9857
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1515 else if (len == 0) |
|
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1516 map = Octave_map (dv); |
| 4817 | 1517 else |
|
9857
43a7adf62534
save dims for empty structs (binary fmt)
Jaroslav Hajek <highegg@gmail.com>
parents:
9851
diff
changeset
|
1518 success = false; |
| 4817 | 1519 |
| 1520 return success; | |
| 1521 } | |
| 1522 | |
| 1523 #if defined (HAVE_HDF5) | |
| 1524 | |
| 1525 bool | |
| 1526 octave_struct::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) | |
| 1527 { | |
| 1528 hid_t data_hid = -1; | |
| 1529 | |
|
9892
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
1530 #if HAVE_HDF5_18 |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
1531 data_hid = H5Gcreate (loc_id, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
1532 #else |
| 4817 | 1533 data_hid = H5Gcreate (loc_id, name, 0); |
|
9892
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
1534 #endif |
| 4817 | 1535 if (data_hid < 0) return false; |
| 1536 | |
| 1537 // recursively add each element of the structure to this group | |
| 1538 Octave_map m = map_value (); | |
|
8907
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1539 |
|
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1540 octave_idx_type nf = m.nfields (); |
|
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1541 |
|
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1542 // Iterating over the list of keys will preserve the order of the |
|
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1543 // fields. |
|
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1544 string_vector keys = m.keys (); |
|
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1545 |
|
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1546 for (octave_idx_type i = 0; i < nf; i++) |
| 4817 | 1547 { |
|
8907
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1548 std::string key = keys(i); |
| 4817 | 1549 |
|
8907
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1550 octave_value val = map.contents (key); |
|
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1551 |
|
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1552 bool retval2 = add_hdf5_data (data_hid, val, key, "", false, |
| 4817 | 1553 save_as_floats); |
| 1554 | |
| 1555 if (! retval2) | |
| 1556 break; | |
| 1557 } | |
| 1558 | |
| 1559 H5Gclose (data_hid); | |
| 4837 | 1560 |
| 4817 | 1561 return true; |
| 1562 } | |
| 1563 | |
| 1564 bool | |
|
9881
b3089dba88bf
Remove HDF5 cruft for older versions of HDF5
Kacper Kowalik
parents:
9857
diff
changeset
|
1565 octave_struct::load_hdf5 (hid_t loc_id, const char *name) |
| 4817 | 1566 { |
| 1567 bool retval = false; | |
| 1568 | |
| 1569 hdf5_callback_data dsub; | |
| 1570 | |
| 1571 herr_t retval2 = 0; | |
| 6292 | 1572 Octave_map m (dim_vector (1, 1)); |
| 4817 | 1573 int current_item = 0; |
| 1574 hsize_t num_obj = 0; | |
|
9892
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
1575 #if HAVE_HDF5_18 |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
1576 hid_t group_id = H5Gopen (loc_id, name, H5P_DEFAULT); |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
1577 #else |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
1578 hid_t group_id = H5Gopen (loc_id, name); |
|
ac69e6f4b33d
Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions
Kacper Kowalik <xarthisius.kk@gmail.com>
parents:
9881
diff
changeset
|
1579 #endif |
| 5060 | 1580 H5Gget_num_objs (group_id, &num_obj); |
| 1581 H5Gclose (group_id); | |
| 4817 | 1582 |
|
8907
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1583 // FIXME -- fields appear to be sorted alphabetically on loading. |
|
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1584 // Why is that happening? |
|
5a956c026b6c
preserve field order when saving structs
John W. Eaton <jwe@octave.org>
parents:
8679
diff
changeset
|
1585 |
| 4817 | 1586 while (current_item < static_cast<int> (num_obj) |
| 1587 && (retval2 = H5Giterate (loc_id, name, ¤t_item, | |
| 1588 hdf5_read_next_data, &dsub)) > 0) | |
| 1589 { | |
| 5342 | 1590 octave_value t2 = dsub.tc; |
| 1591 | |
| 6293 | 1592 Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2); |
| 5433 | 1593 |
| 6293 | 1594 if (error_state) |
| 1595 { | |
| 1596 error ("load: internal error loading struct elements"); | |
| 1597 return false; | |
| 1598 } | |
| 5433 | 1599 |
| 6293 | 1600 m.assign (dsub.name, tcell); |
| 5336 | 1601 |
| 4817 | 1602 } |
| 1603 | |
| 1604 if (retval2 >= 0) | |
| 1605 { | |
| 1606 map = m; | |
| 1607 retval = true; | |
| 1608 } | |
| 1609 | |
| 1610 return retval; | |
| 1611 } | |
| 1612 | |
| 4687 | 1613 #endif |
| 1614 | |
| 5900 | 1615 mxArray * |
| 1616 octave_struct::as_mxArray (void) const | |
| 1617 { | |
| 1618 int nf = nfields (); | |
| 1619 string_vector kv = map_keys (); | |
| 6065 | 1620 |
| 1621 OCTAVE_LOCAL_BUFFER (const char *, f, nf); | |
| 1622 | |
| 5900 | 1623 for (int i = 0; i < nf; i++) |
| 6065 | 1624 f[i] = kv[i].c_str (); |
| 5900 | 1625 |
| 1626 mxArray *retval = new mxArray (dims (), nf, f); | |
| 1627 | |
| 1628 mxArray **elts = static_cast<mxArray **> (retval->get_data ()); | |
| 1629 | |
| 6686 | 1630 mwSize nel = numel (); |
| 5900 | 1631 |
| 6686 | 1632 mwSize ntot = nf * nel; |
| 5900 | 1633 |
| 1634 for (int i = 0; i < nf; i++) | |
| 1635 { | |
| 1636 Cell c = map.contents (kv[i]); | |
| 1637 | |
| 1638 const octave_value *p = c.data (); | |
| 1639 | |
| 6686 | 1640 mwIndex k = 0; |
| 1641 for (mwIndex j = i; j < ntot; j += nf) | |
| 5900 | 1642 elts[j] = new mxArray (p[k++]); |
| 1643 } | |
| 1644 | |
| 1645 return retval; | |
| 1646 } | |
| 1647 | |
| 2376 | 1648 /* |
| 1649 ;;; Local Variables: *** | |
| 1650 ;;; mode: C++ *** | |
| 1651 ;;; End: *** | |
| 1652 */ |