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