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