Mercurial > jwe > octave
annotate src/ov-cell.cc @ 8626:1dce30ab0e72
don't convert NaN to logical in bool expressions
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 29 Jan 2009 12:50:25 -0500 |
parents | 35656d6ad061 |
children | 280fae940bb0 |
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 | |
8626
1dce30ab0e72
don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents:
8587
diff
changeset
|
363 bool |
1dce30ab0e72
don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents:
8587
diff
changeset
|
364 octave_cell::is_true (void) const |
1dce30ab0e72
don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents:
8587
diff
changeset
|
365 { |
1dce30ab0e72
don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents:
8587
diff
changeset
|
366 error ("invalid conversion from cell array to logical value"); |
1dce30ab0e72
don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents:
8587
diff
changeset
|
367 return false; |
1dce30ab0e72
don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents:
8587
diff
changeset
|
368 } |
1dce30ab0e72
don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents:
8587
diff
changeset
|
369 |
3933 | 370 octave_value_list |
371 octave_cell::list_value (void) const | |
372 { | |
8580
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
373 return octave_value_list (matrix); |
3933 | 374 } |
375 | |
4243 | 376 string_vector |
5715 | 377 octave_cell::all_strings (bool pad) const |
4243 | 378 { |
4358 | 379 string_vector retval; |
380 | |
7285 | 381 octave_idx_type nel = numel (); |
4243 | 382 |
4358 | 383 int n_elts = 0; |
384 | |
5275 | 385 octave_idx_type max_len = 0; |
4358 | 386 |
7285 | 387 for (octave_idx_type i = 0; i < nel; i++) |
4358 | 388 { |
7285 | 389 string_vector s = matrix(i).all_strings (); |
390 | |
391 if (error_state) | |
392 return retval; | |
4358 | 393 |
7285 | 394 octave_idx_type s_len = s.length (); |
4358 | 395 |
7285 | 396 n_elts += s_len ? s_len : 1; |
4358 | 397 |
7285 | 398 octave_idx_type s_max_len = s.max_length (); |
4358 | 399 |
7285 | 400 if (s_max_len > max_len) |
401 max_len = s_max_len; | |
4358 | 402 } |
403 | |
404 retval.resize (n_elts); | |
4243 | 405 |
5275 | 406 octave_idx_type k = 0; |
4243 | 407 |
7285 | 408 for (octave_idx_type i = 0; i < nel; i++) |
4243 | 409 { |
7285 | 410 string_vector s = matrix(i).all_strings (); |
411 | |
412 octave_idx_type s_len = s.length (); | |
4358 | 413 |
7285 | 414 if (s_len) |
415 { | |
416 for (octave_idx_type j = 0; j < s_len; j++) | |
5715 | 417 { |
7285 | 418 std::string t = s[j]; |
5715 | 419 int t_len = t.length (); |
420 | |
421 if (pad && max_len > t_len) | |
422 t += std::string (max_len - t_len, ' '); | |
423 | |
424 retval[k++] = t; | |
425 } | |
4243 | 426 } |
7285 | 427 else if (pad) |
428 retval[k++] = std::string (max_len, ' '); | |
429 else | |
430 retval[k++] = std::string (); | |
4243 | 431 } |
432 | |
433 return retval; | |
434 } | |
435 | |
4604 | 436 bool |
437 octave_cell::print_as_scalar (void) const | |
438 { | |
439 return (ndims () > 2 || numel () == 0); | |
440 } | |
441 | |
3933 | 442 void |
443 octave_cell::print (std::ostream& os, bool) const | |
444 { | |
445 print_raw (os); | |
446 } | |
447 | |
448 void | |
449 octave_cell::print_raw (std::ostream& os, bool) const | |
450 { | |
4587 | 451 int nd = matrix.ndims (); |
4513 | 452 |
4587 | 453 if (nd == 2) |
4513 | 454 { |
5275 | 455 octave_idx_type nr = rows (); |
456 octave_idx_type nc = columns (); | |
4513 | 457 |
458 if (nr > 0 && nc > 0) | |
459 { | |
460 indent (os); | |
461 os << "{"; | |
462 newline (os); | |
463 | |
464 increment_indent_level (); | |
465 | |
5275 | 466 for (octave_idx_type j = 0; j < nc; j++) |
4513 | 467 { |
5275 | 468 for (octave_idx_type i = 0; i < nr; i++) |
4513 | 469 { |
470 OCTAVE_QUIT; | |
471 | |
5765 | 472 std::ostringstream buf; |
473 buf << "[" << i+1 << "," << j+1 << "]"; | |
3933 | 474 |
4513 | 475 octave_value val = matrix(i,j); |
476 | |
5765 | 477 val.print_with_name (os, buf.str ()); |
4513 | 478 } |
479 } | |
480 | |
481 decrement_indent_level (); | |
482 | |
483 indent (os); | |
484 os << "}"; | |
485 newline (os); | |
486 } | |
487 else | |
488 { | |
489 os << "{}"; | |
5360 | 490 if (Vprint_empty_dimensions) |
4513 | 491 os << "(" << nr << "x" << nc << ")"; |
492 os << "\n"; | |
493 } | |
494 } | |
495 else | |
3933 | 496 { |
497 indent (os); | |
4513 | 498 dim_vector dv = matrix.dims (); |
4587 | 499 os << "{" << dv.str () << " Cell Array}"; |
3933 | 500 newline (os); |
501 } | |
502 } | |
503 | |
4687 | 504 #define CELL_ELT_TAG "<cell-element>" |
505 | |
506 bool | |
6974 | 507 octave_cell::save_ascii (std::ostream& os) |
4687 | 508 { |
509 dim_vector d = dims (); | |
510 if (d.length () > 2) | |
511 { | |
512 os << "# ndims: " << d.length () << "\n"; | |
513 | |
5275 | 514 for (int i = 0; i < d.length (); i++) |
4687 | 515 os << " " << d (i); |
516 os << "\n"; | |
517 | |
518 Cell tmp = cell_value (); | |
519 | |
5275 | 520 for (octave_idx_type i = 0; i < d.numel (); i++) |
4687 | 521 { |
522 octave_value o_val = tmp.elem (i); | |
523 | |
524 // Recurse to print sub-value. | |
6974 | 525 bool b = save_ascii_data (os, o_val, CELL_ELT_TAG, false, 0); |
4687 | 526 |
527 if (! b) | |
528 return os; | |
529 } | |
530 } | |
531 else | |
532 { | |
533 // Keep this case, rather than use generic code above for backward | |
534 // compatiability. Makes load_ascii much more complex!! | |
535 os << "# rows: " << rows () << "\n" | |
536 << "# columns: " << columns () << "\n"; | |
537 | |
538 Cell tmp = cell_value (); | |
539 | |
5275 | 540 for (octave_idx_type j = 0; j < tmp.cols (); j++) |
4687 | 541 { |
5275 | 542 for (octave_idx_type i = 0; i < tmp.rows (); i++) |
4687 | 543 { |
544 octave_value o_val = tmp.elem (i, j); | |
545 | |
546 // Recurse to print sub-value. | |
6974 | 547 bool b = save_ascii_data (os, o_val, CELL_ELT_TAG, false, 0); |
4687 | 548 |
549 if (! b) | |
550 return os; | |
551 } | |
552 | |
553 os << "\n"; | |
554 } | |
555 } | |
556 | |
557 return true; | |
558 } | |
559 | |
560 bool | |
561 octave_cell::load_ascii (std::istream& is) | |
562 { | |
563 bool success = true; | |
5099 | 564 |
565 string_vector keywords(2); | |
4687 | 566 |
5099 | 567 keywords[0] = "ndims"; |
568 keywords[1] = "rows"; | |
569 | |
570 std::string kw; | |
5275 | 571 octave_idx_type val = 0; |
5099 | 572 |
573 if (extract_keyword (is, keywords, kw, val, true)) | |
4687 | 574 { |
5099 | 575 if (kw == "ndims") |
4687 | 576 { |
5275 | 577 int mdims = static_cast<int> (val); |
4687 | 578 |
5099 | 579 if (mdims >= 0) |
580 { | |
581 dim_vector dv; | |
582 dv.resize (mdims); | |
583 | |
584 for (int i = 0; i < mdims; i++) | |
585 is >> dv(i); | |
4687 | 586 |
5099 | 587 Cell tmp(dv); |
4687 | 588 |
5275 | 589 for (octave_idx_type i = 0; i < dv.numel (); i++) |
5099 | 590 { |
591 octave_value t2; | |
592 bool dummy; | |
593 | |
594 // recurse to read cell elements | |
595 std::string nm = read_ascii_data (is, std::string (), | |
5759 | 596 dummy, t2, i); |
4687 | 597 |
5099 | 598 if (nm == CELL_ELT_TAG) |
599 { | |
600 if (is) | |
601 tmp.elem (i) = t2; | |
602 } | |
603 else | |
604 { | |
605 error ("load: cell array element had unexpected name"); | |
606 success = false; | |
607 break; | |
608 } | |
609 } | |
4687 | 610 |
5099 | 611 if (is) |
612 matrix = tmp; | |
4687 | 613 else |
614 { | |
5099 | 615 error ("load: failed to load matrix constant"); |
4687 | 616 success = false; |
617 } | |
618 } | |
619 else | |
620 { | |
5099 | 621 error ("load: failed to extract number of rows and columns"); |
622 success = false; | |
623 } | |
624 } | |
625 else if (kw == "rows") | |
626 { | |
5275 | 627 octave_idx_type nr = val; |
628 octave_idx_type nc = 0; | |
5099 | 629 |
630 if (nr >= 0 && extract_keyword (is, "columns", nc) && nc >= 0) | |
631 { | |
632 if (nr > 0 && nc > 0) | |
633 { | |
634 Cell tmp (nr, nc); | |
635 | |
5275 | 636 for (octave_idx_type j = 0; j < nc; j++) |
5099 | 637 { |
5275 | 638 for (octave_idx_type i = 0; i < nr; i++) |
5099 | 639 { |
640 octave_value t2; | |
641 bool dummy; | |
642 | |
643 // recurse to read cell elements | |
644 std::string nm = read_ascii_data (is, std::string (), | |
5759 | 645 dummy, t2, i); |
5099 | 646 |
647 if (nm == CELL_ELT_TAG) | |
648 { | |
649 if (is) | |
650 tmp.elem (i, j) = t2; | |
651 } | |
652 else | |
653 { | |
654 error ("load: cell array element had unexpected name"); | |
655 success = false; | |
656 goto cell_read_error; | |
657 } | |
658 } | |
659 } | |
660 | |
661 cell_read_error: | |
662 | |
663 if (is) | |
664 matrix = tmp; | |
665 else | |
666 { | |
667 error ("load: failed to load cell element"); | |
668 success = false; | |
669 } | |
670 } | |
671 else if (nr == 0 || nc == 0) | |
672 matrix = Cell (nr, nc); | |
673 else | |
674 panic_impossible (); | |
675 } | |
676 else | |
677 { | |
678 error ("load: failed to extract number of rows and columns for cell array"); | |
4687 | 679 success = false; |
680 } | |
681 } | |
682 else | |
5099 | 683 panic_impossible (); |
4687 | 684 } |
685 else | |
686 { | |
5099 | 687 error ("load: failed to extract number of rows and columns"); |
688 success = false; | |
4687 | 689 } |
690 | |
691 return success; | |
692 } | |
693 | |
694 bool | |
695 octave_cell::save_binary (std::ostream& os, bool& save_as_floats) | |
696 { | |
697 dim_vector d = dims (); | |
698 if (d.length () < 1) | |
699 return false; | |
700 | |
701 // Use negative value for ndims | |
5828 | 702 int32_t di = - d.length(); |
5760 | 703 os.write (reinterpret_cast<char *> (&di), 4); |
5275 | 704 for (int i = 0; i < d.length (); i++) |
4687 | 705 { |
706 di = d(i); | |
5760 | 707 os.write (reinterpret_cast<char *> (&di), 4); |
4687 | 708 } |
709 | |
710 Cell tmp = cell_value (); | |
711 | |
5275 | 712 for (octave_idx_type i = 0; i < d.numel (); i++) |
4687 | 713 { |
714 octave_value o_val = tmp.elem (i); | |
715 | |
716 // Recurse to print sub-value. | |
717 bool b = save_binary_data (os, o_val, CELL_ELT_TAG, "", 0, | |
718 save_as_floats); | |
719 | |
720 if (! b) | |
721 return false; | |
722 } | |
723 | |
724 return true; | |
725 } | |
726 | |
727 bool | |
728 octave_cell::load_binary (std::istream& is, bool swap, | |
729 oct_mach_info::float_format fmt) | |
730 { | |
731 bool success = true; | |
5828 | 732 int32_t mdims; |
5760 | 733 if (! is.read (reinterpret_cast<char *> (&mdims), 4)) |
4687 | 734 return false; |
735 if (swap) | |
4944 | 736 swap_bytes<4> (&mdims); |
4687 | 737 if (mdims >= 0) |
738 return false; | |
739 | |
740 mdims = -mdims; | |
5828 | 741 int32_t di; |
4687 | 742 dim_vector dv; |
743 dv.resize (mdims); | |
744 | |
745 for (int i = 0; i < mdims; i++) | |
746 { | |
5760 | 747 if (! is.read (reinterpret_cast<char *> (&di), 4)) |
4687 | 748 return false; |
749 if (swap) | |
4944 | 750 swap_bytes<4> (&di); |
4687 | 751 dv(i) = di; |
752 } | |
753 | |
5157 | 754 // Convert an array with a single dimension to be a row vector. |
755 // Octave should never write files like this, other software | |
756 // might. | |
757 | |
758 if (mdims == 1) | |
759 { | |
760 mdims = 2; | |
761 dv.resize (mdims); | |
762 dv(1) = dv(0); | |
763 dv(0) = 1; | |
764 } | |
765 | |
5275 | 766 octave_idx_type nel = dv.numel (); |
4687 | 767 Cell tmp(dv); |
768 | |
5275 | 769 for (octave_idx_type i = 0; i < nel; i++) |
4687 | 770 { |
771 octave_value t2; | |
772 bool dummy; | |
773 std::string doc; | |
774 | |
775 // recurse to read cell elements | |
776 std::string nm = read_binary_data (is, swap, fmt, std::string (), | |
777 dummy, t2, doc); | |
778 | |
779 if (nm == CELL_ELT_TAG) | |
780 { | |
781 if (is) | |
782 tmp.elem (i) = t2; | |
783 } | |
784 else | |
785 { | |
786 error ("load: cell array element had unexpected name"); | |
787 success = false; | |
788 break; | |
789 } | |
790 } | |
791 | |
792 if (is) | |
793 matrix = tmp; | |
794 else | |
795 { | |
796 error ("load: failed to load matrix constant"); | |
797 success = false; | |
798 } | |
799 | |
800 return success; | |
801 } | |
802 | |
803 #if defined (HAVE_HDF5) | |
4815 | 804 |
4687 | 805 bool |
806 octave_cell::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) | |
807 { | |
4814 | 808 dim_vector dv = dims (); |
4837 | 809 int empty = save_hdf5_empty (loc_id, name, dv); |
810 if (empty) | |
811 return (empty > 0); | |
812 | |
4815 | 813 hsize_t rank = dv.length (); |
4687 | 814 hid_t space_hid = -1, data_hid = -1, size_hid = -1; |
815 | |
816 data_hid = H5Gcreate (loc_id, name, 0); | |
4815 | 817 |
818 if (data_hid < 0) | |
819 return false; | |
4687 | 820 |
4814 | 821 // Have to save cell array shape, since can't have a |
822 // dataset of groups.... | |
4815 | 823 |
824 space_hid = H5Screate_simple (1, &rank, 0); | |
825 | |
4687 | 826 if (space_hid < 0) |
827 { | |
828 H5Gclose (data_hid); | |
829 return false; | |
830 } | |
831 | |
5351 | 832 OCTAVE_LOCAL_BUFFER (octave_idx_type, hdims, rank); |
4814 | 833 |
834 // Octave uses column-major, while HDF5 uses row-major ordering | |
4933 | 835 for (hsize_t i = 0; i < rank; i++) |
4815 | 836 hdims[i] = dv(rank-i-1); |
4814 | 837 |
5351 | 838 size_hid = H5Dcreate (data_hid, "dims", H5T_NATIVE_IDX, space_hid, |
4687 | 839 H5P_DEFAULT); |
840 if (size_hid < 0) | |
841 { | |
842 H5Sclose (space_hid); | |
843 H5Gclose (data_hid); | |
844 return false; | |
845 } | |
846 | |
6276 | 847 if (H5Dwrite (size_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, |
848 H5P_DEFAULT, hdims) < 0) | |
4687 | 849 { |
850 H5Dclose (size_hid); | |
851 H5Sclose (space_hid); | |
852 H5Gclose (data_hid); | |
853 return false; | |
854 } | |
4815 | 855 |
4687 | 856 H5Dclose (size_hid); |
857 H5Sclose (space_hid); | |
858 | |
4815 | 859 // Recursively add each element of the cell to this group. |
860 | |
4687 | 861 Cell tmp = cell_value (); |
5850 | 862 |
863 octave_idx_type nel = dv.numel (); | |
864 | |
865 for (octave_idx_type i = 0; i < nel; i++) | |
4687 | 866 { |
5765 | 867 std::ostringstream buf; |
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7285
diff
changeset
|
868 int digits = static_cast<int> (::floor (::log10 (static_cast<double> (nel)) + 1.0)); |
5850 | 869 buf << "_" << std::setw (digits) << std::setfill ('0') << i; |
5765 | 870 std::string s = buf.str (); |
4687 | 871 |
5850 | 872 if (! add_hdf5_data (data_hid, tmp.elem (i), s.c_str (), "", false, |
873 save_as_floats)) | |
4814 | 874 { |
875 H5Gclose (data_hid); | |
876 return false; | |
4687 | 877 } |
878 } | |
879 | |
880 H5Gclose (data_hid); | |
4815 | 881 |
4687 | 882 return true; |
883 } | |
884 | |
885 bool | |
886 octave_cell::load_hdf5 (hid_t loc_id, const char *name, | |
887 bool have_h5giterate_bug) | |
888 { | |
889 bool retval = false; | |
4837 | 890 |
891 dim_vector dv; | |
892 int empty = load_hdf5_empty (loc_id, name, dv); | |
893 if (empty > 0) | |
894 matrix.resize(dv); | |
895 if (empty) | |
896 return (empty > 0); | |
897 | |
4687 | 898 hid_t group_id = H5Gopen (loc_id, name); |
899 | |
900 if (group_id < 0) | |
901 return false; | |
902 | |
4814 | 903 hid_t data_hid = H5Dopen (group_id, "dims"); |
4687 | 904 hid_t space_hid = H5Dget_space (data_hid); |
905 hsize_t rank = H5Sget_simple_extent_ndims (space_hid); | |
4814 | 906 if (rank != 1) |
4687 | 907 { |
4837 | 908 H5Dclose (data_hid); |
909 H5Gclose (group_id); | |
4687 | 910 return false; |
911 } | |
912 | |
4814 | 913 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank); |
914 OCTAVE_LOCAL_BUFFER (hsize_t, maxdims, rank); | |
4815 | 915 |
4814 | 916 H5Sget_simple_extent_dims (space_hid, hdims, maxdims); |
4687 | 917 |
4815 | 918 // Octave uses column-major, while HDF5 uses row-major ordering. |
919 | |
4814 | 920 dv.resize (hdims[0]); |
4815 | 921 |
5351 | 922 OCTAVE_LOCAL_BUFFER (octave_idx_type, tmp, hdims[0]); |
4814 | 923 |
5351 | 924 if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, |
4815 | 925 H5P_DEFAULT, tmp) < 0) |
4687 | 926 { |
4837 | 927 H5Dclose (data_hid); |
928 H5Gclose (group_id); | |
4687 | 929 return false; |
930 } | |
4815 | 931 |
4687 | 932 H5Dclose (data_hid); |
933 H5Gclose (group_id); | |
934 | |
4815 | 935 for (hsize_t i = 0, j = hdims[0] - 1; i < hdims[0]; i++, j--) |
4814 | 936 dv(j) = tmp[i]; |
937 | |
4687 | 938 hdf5_callback_data dsub; |
939 | |
940 herr_t retval2 = -1; | |
4815 | 941 |
4814 | 942 Cell m (dv); |
4815 | 943 |
4687 | 944 int current_item = 0; |
4815 | 945 |
4687 | 946 if (have_h5giterate_bug) |
4815 | 947 current_item = 1; // Skip dims items in group. |
4687 | 948 |
4696 | 949 #ifdef HAVE_H5GGET_NUM_OBJS |
950 hsize_t num_obj = 0; | |
5060 | 951 group_id = H5Gopen (loc_id, name); |
952 H5Gget_num_objs (group_id, &num_obj); | |
953 H5Gclose (group_id); | |
4696 | 954 #endif |
955 | |
5275 | 956 for (octave_idx_type i = 0; i < dv.numel (); i++) |
4687 | 957 { |
4696 | 958 |
959 #ifdef HAVE_H5GGET_NUM_OBJS | |
4814 | 960 if (current_item >= static_cast<int> (num_obj)) |
961 retval2 = -1; | |
962 else | |
4696 | 963 #endif |
4814 | 964 retval2 = H5Giterate (loc_id, name, ¤t_item, |
965 hdf5_read_next_data, &dsub); | |
966 | |
4687 | 967 if (retval2 <= 0) |
968 break; | |
4814 | 969 |
970 octave_value ov = dsub.tc; | |
971 m.elem (i) = ov; | |
972 | |
973 if (have_h5giterate_bug) | |
4815 | 974 current_item++; // H5Giterate returned the last index processed. |
4814 | 975 |
4687 | 976 } |
977 | |
978 if (retval2 >= 0) | |
979 { | |
980 matrix = m; | |
981 retval = true; | |
982 } | |
983 | |
984 return retval; | |
985 } | |
4815 | 986 |
4687 | 987 #endif |
988 | |
3354 | 989 DEFUN (iscell, args, , |
3448 | 990 "-*- texinfo -*-\n\ |
991 @deftypefn {Built-in Function} {} iscell (@var{x})\n\ | |
992 Return true if @var{x} is a cell array object. Otherwise, return\n\ | |
993 false.\n\ | |
994 @end deftypefn") | |
3354 | 995 { |
996 octave_value retval; | |
997 | |
998 if (args.length () == 1) | |
999 retval = args(0).is_cell (); | |
1000 else | |
5823 | 1001 print_usage (); |
3354 | 1002 |
1003 return retval; | |
1004 } | |
1005 | |
1006 DEFUN (cell, args, , | |
3448 | 1007 "-*- texinfo -*-\n\ |
1008 @deftypefn {Built-in Function} {} cell (@var{x})\n\ | |
1009 @deftypefnx {Built-in Function} {} cell (@var{n}, @var{m})\n\ | |
1010 Create a new cell array object. If invoked with a single scalar\n\ | |
1011 argument, @code{cell} returns a square cell array with the dimension\n\ | |
1012 specified. If you supply two scalar arguments, @code{cell} takes\n\ | |
1013 them to be the number of rows and columns. If given a vector with two\n\ | |
1014 elements, @code{cell} uses the values of the elements as the number of\n\ | |
1015 rows and columns, respectively.\n\ | |
1016 @end deftypefn") | |
3354 | 1017 { |
1018 octave_value retval; | |
1019 | |
1020 int nargin = args.length (); | |
1021 | |
4563 | 1022 dim_vector dims; |
1023 | |
3354 | 1024 switch (nargin) |
1025 { | |
4563 | 1026 case 0: |
1027 dims = dim_vector (0, 0); | |
3354 | 1028 break; |
1029 | |
4563 | 1030 case 1: |
1031 get_dimensions (args(0), "cell", dims); | |
3354 | 1032 break; |
1033 | |
1034 default: | |
4563 | 1035 { |
1036 dims.resize (nargin); | |
1037 | |
1038 for (int i = 0; i < nargin; i++) | |
1039 { | |
1040 dims(i) = args(i).is_empty () ? 0 : args(i).nint_value (); | |
1041 | |
1042 if (error_state) | |
1043 { | |
1044 error ("cell: expecting scalar arguments"); | |
1045 break; | |
1046 } | |
1047 } | |
1048 } | |
3354 | 1049 break; |
1050 } | |
1051 | |
4563 | 1052 if (! error_state) |
1053 { | |
8290
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1054 dims.chop_trailing_singletons (); |
4563 | 1055 |
1056 check_dimensions (dims, "cell"); | |
1057 | |
1058 if (! error_state) | |
8290
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1059 retval = Cell (dims, Matrix ()); |
4563 | 1060 } |
1061 | |
3354 | 1062 return retval; |
1063 } | |
1064 | |
4610 | 1065 DEFUN (iscellstr, args, , |
1066 "-*- texinfo -*-\n\ | |
1067 @deftypefn {Built-in Function} {} iscellstr (@var{cell})\n\ | |
1068 Return true if every element of the cell array @var{cell} is a\n\ | |
1069 character string\n\ | |
1070 @end deftypefn") | |
1071 { | |
4699 | 1072 octave_value retval; |
4610 | 1073 |
1074 if (args.length () == 1) | |
6116 | 1075 retval = args(0).is_cellstr (); |
4610 | 1076 else |
5823 | 1077 print_usage (); |
4610 | 1078 |
1079 return retval; | |
1080 } | |
1081 | |
4817 | 1082 // Note that since Fcellstr calls Fiscellstr, we need to have |
1083 // Fiscellstr defined first (to provide a declaration) and also we | |
1084 // should keep it in the same file (so we don't have to provide a | |
1085 // declaration) and so we don't have to use feval to call it. | |
1086 | |
1087 DEFUN (cellstr, args, , | |
1088 "-*- texinfo -*-\n\ | |
1089 @deftypefn {Built-in Function} {} cellstr (@var{string})\n\ | |
1090 Create a new cell array object from the elements of the string\n\ | |
1091 array @var{string}.\n\ | |
1092 @end deftypefn") | |
1093 { | |
1094 octave_value retval; | |
1095 | |
1096 if (args.length () == 1) | |
1097 { | |
1098 octave_value_list tmp = Fiscellstr (args, 1); | |
1099 | |
1100 if (tmp(0).is_true ()) | |
1101 retval = args(0); | |
1102 else | |
1103 { | |
1104 string_vector s = args(0).all_strings (); | |
1105 | |
1106 if (! error_state) | |
7813 | 1107 retval = (s.is_empty () |
1108 ? Cell (octave_value (std::string ())) | |
1109 : Cell (s, true)); | |
4817 | 1110 else |
1111 error ("cellstr: expecting argument to be a 2-d character array"); | |
1112 } | |
1113 } | |
1114 else | |
5823 | 1115 print_usage (); |
4817 | 1116 |
1117 return retval; | |
1118 } | |
1119 | |
4762 | 1120 DEFUN (struct2cell, args, , |
1121 "-*- texinfo -*-\n\ | |
1122 @deftypefn {Built-in Function} {} struct2cell (@var{S})\n\ | |
1123 Create a new cell array from the objects stored in the struct object.\n\ | |
4764 | 1124 If @var{f} is the number of fields in the structure, the resulting\n\ |
1125 cell array will have a dimension vector corresponding to\n\ | |
1126 @code{[@var{F} size(@var{S})]}.\n\ | |
5642 | 1127 @seealso{cell2struct, fieldnames}\n\ |
1128 @end deftypefn") | |
4762 | 1129 { |
1130 octave_value retval; | |
4764 | 1131 |
4762 | 1132 int nargin = args.length (); |
4764 | 1133 |
4762 | 1134 if (nargin == 1) |
1135 { | |
4764 | 1136 Octave_map m = args(0).map_value (); |
1137 | |
4762 | 1138 if (! error_state) |
1139 { | |
1140 dim_vector m_dv = m.dims (); | |
4764 | 1141 |
4762 | 1142 string_vector keys = m.keys (); |
4764 | 1143 |
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1144 octave_idx_type num_fields = keys.length (); |
4764 | 1145 |
4762 | 1146 // The resulting dim_vector should have dimensions: |
1147 // [numel(fields) size(struct)] | |
4764 | 1148 |
4762 | 1149 dim_vector result_dv; |
4764 | 1150 result_dv.resize (m_dv.length () + 1); // Add 1 for the fields. |
1151 | |
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1152 result_dv(0) = num_fields; |
4762 | 1153 |
1154 for (int i = 1; i < result_dv.length (); i++) | |
1155 result_dv(i) = m_dv(i-1); | |
4764 | 1156 |
4762 | 1157 Cell c (result_dv); |
4764 | 1158 |
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1159 octave_idx_type n_elts = m.numel (); |
4764 | 1160 |
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1161 for (octave_idx_type j = 0; j < num_fields; j++) |
4762 | 1162 { |
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1163 octave_idx_type k = j; |
4764 | 1164 |
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1165 const Cell vals = m.contents (keys(j)); |
4764 | 1166 |
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1167 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
|
1168 { |
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1169 c(k) = vals(i); |
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1170 k += num_fields; |
4762 | 1171 } |
1172 } | |
1173 | |
1174 retval = c; | |
1175 } | |
1176 else | |
1177 error ("struct2cell: expecting argument to be a cell array"); | |
1178 } | |
1179 else | |
5823 | 1180 print_usage (); |
4764 | 1181 |
4762 | 1182 return retval; |
1183 } | |
1184 | |
5900 | 1185 mxArray * |
1186 octave_cell::as_mxArray (void) const | |
1187 { | |
1188 mxArray *retval = new mxArray (dims ()); | |
1189 | |
1190 mxArray **elts = static_cast<mxArray **> (retval->get_data ()); | |
1191 | |
6686 | 1192 mwSize nel = numel (); |
5900 | 1193 |
1194 const octave_value *p = matrix.data (); | |
1195 | |
6686 | 1196 for (mwIndex i = 0; i < nel; i++) |
5900 | 1197 elts[i] = new mxArray (p[i]); |
1198 | |
1199 return retval; | |
1200 } | |
1201 | |
3353 | 1202 /* |
1203 ;;; Local Variables: *** | |
1204 ;;; mode: C++ *** | |
1205 ;;; End: *** | |
1206 */ |