Mercurial > octave
annotate src/ov-cell.cc @ 8815:af907aeedbf4
cache cellstr_value in ov-cell
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Thu, 19 Feb 2009 16:37:17 +0100 |
| parents | 3ef774603887 |
| children | 3efa512a0957 |
| 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 | |
|
8815
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
217 clear_cellstr_cache (); |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
218 |
| 3933 | 219 if (n > 1) |
| 220 { | |
| 221 switch (type[0]) | |
| 222 { | |
| 223 case '(': | |
| 224 { | |
| 6767 | 225 if (is_empty () && type[1] == '.') |
| 226 { | |
| 227 // Allow conversion of empty cell array to some other | |
| 228 // type in cases like | |
| 229 // | |
| 230 // x = []; x(i).f = rhs | |
| 3933 | 231 |
| 6767 | 232 octave_value tmp = octave_value::empty_conv (type, rhs); |
| 3933 | 233 |
| 6767 | 234 return tmp.subsasgn (type, idx, rhs); |
| 235 } | |
| 236 else | |
| 3933 | 237 { |
| 6767 | 238 octave_value tmp = do_index_op (idx.front (), true); |
| 3933 | 239 |
| 6767 | 240 if (! tmp.is_defined ()) |
| 241 tmp = octave_value::empty_conv (type.substr (1), rhs); | |
| 3933 | 242 |
| 6767 | 243 if (! error_state) |
| 244 { | |
| 245 std::list<octave_value_list> next_idx (idx); | |
| 4362 | 246 |
| 6767 | 247 next_idx.erase (next_idx.begin ()); |
| 248 | |
| 249 tmp.make_unique (); | |
| 250 | |
| 251 t_rhs = tmp.subsasgn (type.substr (1), next_idx, rhs); | |
| 252 } | |
| 3933 | 253 } |
| 254 } | |
| 255 break; | |
| 256 | |
| 257 case '{': | |
| 258 { | |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
259 Cell tmpc = matrix.index (idx.front (), true); |
| 3933 | 260 |
| 4362 | 261 if (! error_state) |
| 262 { | |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
263 std::list<octave_value_list> next_idx (idx); |
|
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 next_idx.erase (next_idx.begin ()); |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
266 |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
267 std::string next_type = type.substr (1); |
| 3933 | 268 |
|
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8551
diff
changeset
|
269 if (tmpc.numel () == 1) |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
270 { |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
271 octave_value tmp = tmpc(0); |
|
8580
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
272 tmpc = Cell (); |
| 3933 | 273 |
| 5927 | 274 if (! tmp.is_defined () || tmp.is_zero_by_zero ()) |
|
8580
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
275 { |
|
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
276 tmp = octave_value::empty_conv (type.substr (1), rhs); |
|
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
277 tmp.make_unique (); // probably a no-op. |
|
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
278 } |
|
8452
d6a349c7bd39
fix {} assigment if error occurs on subsequent assignment component
Jaroslav Hajek <highegg@gmail.com>
parents:
8446
diff
changeset
|
279 else |
|
8580
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
280 // optimization: ignore the copy still stored inside our array. |
|
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
281 tmp.make_unique (1); |
| 4519 | 282 |
| 283 if (! error_state) | |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
284 t_rhs = tmp.subsasgn (next_type, next_idx, rhs); |
| 4362 | 285 } |
|
8446
7b25349b32e6
avoid redundant copying in {} assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
286 else |
|
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8551
diff
changeset
|
287 gripe_indexed_cs_list (); |
| 3933 | 288 } |
| 289 } | |
| 290 break; | |
| 291 | |
| 292 case '.': | |
| 293 { | |
| 294 std::string nm = type_name (); | |
| 295 error ("%s cannot be indexed with %c", nm.c_str (), type[0]); | |
| 296 } | |
| 297 break; | |
| 298 | |
| 299 default: | |
| 300 panic_impossible (); | |
| 301 } | |
| 302 } | |
| 303 | |
| 3940 | 304 if (! error_state) |
| 3933 | 305 { |
| 3940 | 306 switch (type[0]) |
| 307 { | |
| 308 case '(': | |
| 309 { | |
| 310 octave_value_list i = idx.front (); | |
| 3933 | 311 |
| 3940 | 312 if (t_rhs.is_cell ()) |
| 313 octave_base_matrix<Cell>::assign (i, t_rhs.cell_value ()); | |
| 314 else | |
|
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7813
diff
changeset
|
315 if (t_rhs.is_null_value ()) |
|
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
7813
diff
changeset
|
316 octave_base_matrix<Cell>::delete_elements (i); |
| 4941 | 317 else |
| 318 octave_base_matrix<Cell>::assign (i, Cell (t_rhs)); | |
| 3933 | 319 |
| 6833 | 320 if (! error_state) |
| 321 { | |
| 322 count++; | |
| 323 retval = octave_value (this); | |
| 324 } | |
| 325 else | |
| 326 gripe_failed_assignment (); | |
| 3940 | 327 } |
| 328 break; | |
| 3933 | 329 |
| 3940 | 330 case '{': |
| 331 { | |
|
8587
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
332 octave_value_list idxf = idx.front (); |
| 3933 | 333 |
| 5846 | 334 if (t_rhs.is_cs_list ()) |
| 335 { | |
| 336 Cell tmp_cell = Cell (t_rhs.list_value ()); | |
| 337 | |
|
8587
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
338 // 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
|
339 |
|
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
340 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
|
341 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
|
342 if (! idxf(k).is_magic_colon ()) didx(k) = idxf(k).numel (); |
| 7040 | 343 |
|
8587
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
344 if (didx.numel () == tmp_cell.numel ()) |
|
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
345 tmp_cell = tmp_cell.reshape (didx); |
|
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
346 |
| 5846 | 347 |
|
8587
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
348 octave_base_matrix<Cell>::assign (idxf, tmp_cell); |
| 5846 | 349 } |
|
8587
35656d6ad061
properly reshape cs-lists assigned to struct & cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8580
diff
changeset
|
350 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
|
351 // 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
|
352 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
|
353 else if (! error_state) |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
354 error ("invalid assignment to cs-list outside multiple assignment."); |
| 3933 | 355 |
| 6833 | 356 if (! error_state) |
| 357 { | |
| 358 count++; | |
| 359 retval = octave_value (this); | |
| 360 } | |
| 361 else | |
| 362 gripe_failed_assignment (); | |
| 3940 | 363 } |
| 364 break; | |
| 3933 | 365 |
| 3940 | 366 case '.': |
| 367 { | |
| 368 std::string nm = type_name (); | |
| 369 error ("%s cannot be indexed with %c", nm.c_str (), type[0]); | |
| 370 } | |
| 371 break; | |
| 3933 | 372 |
| 3940 | 373 default: |
| 374 panic_impossible (); | |
| 375 } | |
| 3933 | 376 } |
| 377 | |
| 378 return retval; | |
| 379 } | |
| 380 | |
|
8815
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
381 void |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
382 octave_cell::clear_cellstr_cache (void) const |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
383 { |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
384 cellstr_cache = Array<std::string> (); |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
385 } |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
386 |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
387 void |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
388 octave_cell::make_cellstr_cache (void) const |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
389 { |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
390 cellstr_cache = Array<std::string> (matrix.dims ()); |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
391 |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
392 octave_idx_type n = numel (); |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
393 |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
394 std::string *dst = cellstr_cache.fortran_vec (); |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
395 const octave_value *src = matrix.data (); |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
396 |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
397 for (octave_idx_type i = 0; i < n; i++) |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
398 dst[i] = src[i].string_value (); |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
399 } |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
400 |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
401 bool |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
402 octave_cell::is_cellstr (void) const |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
403 { |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
404 bool retval; |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
405 if (! cellstr_cache.is_empty ()) |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
406 retval = true; |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
407 else |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
408 { |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
409 retval = matrix.is_cellstr (); |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
410 // force cache to be created here |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
411 if (retval) |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
412 make_cellstr_cache (); |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
413 } |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
414 |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
415 return retval; |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
416 } |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
417 |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
418 void |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
419 octave_cell::assign (const octave_value_list& idx, const Cell& rhs) |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
420 { |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
421 clear_cellstr_cache (); |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
422 octave_base_matrix<Cell>::assign (idx, rhs); |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
423 } |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
424 |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
425 void |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
426 octave_cell::assign (const octave_value_list& idx, const octave_value& rhs) |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
427 { |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
428 clear_cellstr_cache (); |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
429 octave_base_matrix<Cell>::assign (idx, rhs); |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
430 } |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
431 |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
432 |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
433 void |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
434 octave_cell::delete_elements (const octave_value_list& idx) |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
435 { |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
436 clear_cellstr_cache (); |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
437 octave_base_matrix<Cell>::delete_elements (idx); |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
438 } |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
439 |
| 4791 | 440 size_t |
| 441 octave_cell::byte_size (void) const | |
| 442 { | |
| 443 size_t retval = 0; | |
| 444 | |
| 5275 | 445 for (octave_idx_type i = 0; i < numel (); i++) |
| 4791 | 446 retval += matrix(i).byte_size (); |
| 447 | |
| 448 return retval; | |
| 449 } | |
| 450 | |
| 8732 | 451 octave_value |
| 452 octave_cell::sort (octave_idx_type dim, sortmode mode) const | |
| 453 { | |
| 454 octave_value retval; | |
| 455 | |
| 456 if (is_cellstr ()) | |
| 457 { | |
| 458 Array<std::string> tmp = cellstr_value (); | |
| 459 | |
| 460 retval = Cell (tmp.sort (dim, mode)); | |
| 461 } | |
| 462 else | |
| 463 error ("sort: only cell arrays of character strings may be sorted"); | |
| 464 | |
| 465 return retval; | |
| 466 } | |
| 467 | |
| 468 octave_value | |
| 469 octave_cell::sort (Array<octave_idx_type> &sidx, octave_idx_type dim, | |
| 470 sortmode mode) const | |
| 471 { | |
| 472 octave_value retval; | |
| 473 | |
| 474 if (is_cellstr ()) | |
| 475 { | |
| 476 Array<std::string> tmp = cellstr_value (); | |
| 477 | |
| 478 retval = Cell (tmp.sort (sidx, dim, mode)); | |
| 479 } | |
| 480 else | |
| 481 error ("sort: only cell arrays of character strings may be sorted"); | |
| 482 | |
| 483 return retval; | |
| 484 } | |
| 485 | |
| 486 Array<octave_idx_type> | |
|
8733
3ef774603887
rename all uses of sortrows_idx to sort_rows_idx
John W. Eaton <jwe@octave.org>
parents:
8732
diff
changeset
|
487 octave_cell::sort_rows_idx (sortmode mode) const |
| 8732 | 488 { |
| 489 Array<octave_idx_type> retval; | |
| 490 | |
| 491 if (is_cellstr ()) | |
| 492 { | |
| 493 Array<std::string> tmp = cellstr_value (); | |
| 494 | |
| 495 retval = tmp.sort_rows_idx (mode); | |
| 496 } | |
| 497 else | |
| 498 error ("sortrows: only cell arrays of character strings may be sorted"); | |
| 499 | |
| 500 return retval; | |
| 501 } | |
| 502 | |
|
8626
1dce30ab0e72
don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents:
8587
diff
changeset
|
503 bool |
|
1dce30ab0e72
don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents:
8587
diff
changeset
|
504 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
|
505 { |
|
1dce30ab0e72
don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents:
8587
diff
changeset
|
506 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
|
507 return false; |
|
1dce30ab0e72
don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents:
8587
diff
changeset
|
508 } |
|
1dce30ab0e72
don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents:
8587
diff
changeset
|
509 |
| 3933 | 510 octave_value_list |
| 511 octave_cell::list_value (void) const | |
| 512 { | |
|
8580
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
513 return octave_value_list (matrix); |
| 3933 | 514 } |
| 515 | |
| 4243 | 516 string_vector |
| 5715 | 517 octave_cell::all_strings (bool pad) const |
| 4243 | 518 { |
| 4358 | 519 string_vector retval; |
| 520 | |
| 7285 | 521 octave_idx_type nel = numel (); |
| 4243 | 522 |
| 4358 | 523 int n_elts = 0; |
| 524 | |
| 5275 | 525 octave_idx_type max_len = 0; |
| 4358 | 526 |
| 7285 | 527 for (octave_idx_type i = 0; i < nel; i++) |
| 4358 | 528 { |
| 7285 | 529 string_vector s = matrix(i).all_strings (); |
| 530 | |
| 531 if (error_state) | |
| 532 return retval; | |
| 4358 | 533 |
| 7285 | 534 octave_idx_type s_len = s.length (); |
| 4358 | 535 |
| 7285 | 536 n_elts += s_len ? s_len : 1; |
| 4358 | 537 |
| 7285 | 538 octave_idx_type s_max_len = s.max_length (); |
| 4358 | 539 |
| 7285 | 540 if (s_max_len > max_len) |
| 541 max_len = s_max_len; | |
| 4358 | 542 } |
| 543 | |
| 544 retval.resize (n_elts); | |
| 4243 | 545 |
| 5275 | 546 octave_idx_type k = 0; |
| 4243 | 547 |
| 7285 | 548 for (octave_idx_type i = 0; i < nel; i++) |
| 4243 | 549 { |
| 7285 | 550 string_vector s = matrix(i).all_strings (); |
| 551 | |
| 552 octave_idx_type s_len = s.length (); | |
| 4358 | 553 |
| 7285 | 554 if (s_len) |
| 555 { | |
| 556 for (octave_idx_type j = 0; j < s_len; j++) | |
| 5715 | 557 { |
| 7285 | 558 std::string t = s[j]; |
| 5715 | 559 int t_len = t.length (); |
| 560 | |
| 561 if (pad && max_len > t_len) | |
| 562 t += std::string (max_len - t_len, ' '); | |
| 563 | |
| 564 retval[k++] = t; | |
| 565 } | |
| 4243 | 566 } |
| 7285 | 567 else if (pad) |
| 568 retval[k++] = std::string (max_len, ' '); | |
| 569 else | |
| 570 retval[k++] = std::string (); | |
| 4243 | 571 } |
| 572 | |
| 573 return retval; | |
| 574 } | |
| 575 | |
| 8732 | 576 Array<std::string> |
| 577 octave_cell::cellstr_value (void) const | |
| 578 { | |
|
8815
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
579 Array<std::string> retval; |
| 8732 | 580 |
| 581 if (is_cellstr ()) | |
| 582 { | |
|
8815
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
583 retval = cellstr_cache; |
| 8732 | 584 } |
| 585 else | |
|
8815
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
586 error ("invalid conversion from cell array to array of strings"); |
| 8732 | 587 |
| 588 return retval; | |
| 589 } | |
| 590 | |
| 4604 | 591 bool |
| 592 octave_cell::print_as_scalar (void) const | |
| 593 { | |
| 594 return (ndims () > 2 || numel () == 0); | |
| 595 } | |
| 596 | |
| 3933 | 597 void |
| 598 octave_cell::print (std::ostream& os, bool) const | |
| 599 { | |
| 600 print_raw (os); | |
| 601 } | |
| 602 | |
| 603 void | |
| 604 octave_cell::print_raw (std::ostream& os, bool) const | |
| 605 { | |
| 4587 | 606 int nd = matrix.ndims (); |
| 4513 | 607 |
| 4587 | 608 if (nd == 2) |
| 4513 | 609 { |
| 5275 | 610 octave_idx_type nr = rows (); |
| 611 octave_idx_type nc = columns (); | |
| 4513 | 612 |
| 613 if (nr > 0 && nc > 0) | |
| 614 { | |
| 615 indent (os); | |
| 616 os << "{"; | |
| 617 newline (os); | |
| 618 | |
| 619 increment_indent_level (); | |
| 620 | |
| 5275 | 621 for (octave_idx_type j = 0; j < nc; j++) |
| 4513 | 622 { |
| 5275 | 623 for (octave_idx_type i = 0; i < nr; i++) |
| 4513 | 624 { |
| 625 OCTAVE_QUIT; | |
| 626 | |
| 5765 | 627 std::ostringstream buf; |
| 628 buf << "[" << i+1 << "," << j+1 << "]"; | |
| 3933 | 629 |
| 4513 | 630 octave_value val = matrix(i,j); |
| 631 | |
| 5765 | 632 val.print_with_name (os, buf.str ()); |
| 4513 | 633 } |
| 634 } | |
| 635 | |
| 636 decrement_indent_level (); | |
| 637 | |
| 638 indent (os); | |
| 639 os << "}"; | |
| 640 newline (os); | |
| 641 } | |
| 642 else | |
| 643 { | |
| 644 os << "{}"; | |
| 5360 | 645 if (Vprint_empty_dimensions) |
| 4513 | 646 os << "(" << nr << "x" << nc << ")"; |
| 647 os << "\n"; | |
| 648 } | |
| 649 } | |
| 650 else | |
| 3933 | 651 { |
| 652 indent (os); | |
| 4513 | 653 dim_vector dv = matrix.dims (); |
| 4587 | 654 os << "{" << dv.str () << " Cell Array}"; |
| 3933 | 655 newline (os); |
| 656 } | |
| 657 } | |
| 658 | |
| 4687 | 659 #define CELL_ELT_TAG "<cell-element>" |
| 660 | |
| 661 bool | |
| 6974 | 662 octave_cell::save_ascii (std::ostream& os) |
| 4687 | 663 { |
| 664 dim_vector d = dims (); | |
| 665 if (d.length () > 2) | |
| 666 { | |
| 667 os << "# ndims: " << d.length () << "\n"; | |
| 668 | |
| 5275 | 669 for (int i = 0; i < d.length (); i++) |
| 4687 | 670 os << " " << d (i); |
| 671 os << "\n"; | |
| 672 | |
| 673 Cell tmp = cell_value (); | |
| 674 | |
| 5275 | 675 for (octave_idx_type i = 0; i < d.numel (); i++) |
| 4687 | 676 { |
| 677 octave_value o_val = tmp.elem (i); | |
| 678 | |
| 679 // Recurse to print sub-value. | |
| 6974 | 680 bool b = save_ascii_data (os, o_val, CELL_ELT_TAG, false, 0); |
| 4687 | 681 |
| 682 if (! b) | |
| 683 return os; | |
| 684 } | |
| 685 } | |
| 686 else | |
| 687 { | |
| 688 // Keep this case, rather than use generic code above for backward | |
| 689 // compatiability. Makes load_ascii much more complex!! | |
| 690 os << "# rows: " << rows () << "\n" | |
| 691 << "# columns: " << columns () << "\n"; | |
| 692 | |
| 693 Cell tmp = cell_value (); | |
| 694 | |
| 5275 | 695 for (octave_idx_type j = 0; j < tmp.cols (); j++) |
| 4687 | 696 { |
| 5275 | 697 for (octave_idx_type i = 0; i < tmp.rows (); i++) |
| 4687 | 698 { |
| 699 octave_value o_val = tmp.elem (i, j); | |
| 700 | |
| 701 // Recurse to print sub-value. | |
| 6974 | 702 bool b = save_ascii_data (os, o_val, CELL_ELT_TAG, false, 0); |
| 4687 | 703 |
| 704 if (! b) | |
| 705 return os; | |
| 706 } | |
| 707 | |
| 708 os << "\n"; | |
| 709 } | |
| 710 } | |
| 711 | |
| 712 return true; | |
| 713 } | |
| 714 | |
| 715 bool | |
| 716 octave_cell::load_ascii (std::istream& is) | |
| 717 { | |
| 718 bool success = true; | |
| 5099 | 719 |
|
8815
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
720 clear_cellstr_cache (); |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
721 |
| 5099 | 722 string_vector keywords(2); |
| 4687 | 723 |
| 5099 | 724 keywords[0] = "ndims"; |
| 725 keywords[1] = "rows"; | |
| 726 | |
| 727 std::string kw; | |
| 5275 | 728 octave_idx_type val = 0; |
| 5099 | 729 |
| 730 if (extract_keyword (is, keywords, kw, val, true)) | |
| 4687 | 731 { |
| 5099 | 732 if (kw == "ndims") |
| 4687 | 733 { |
| 5275 | 734 int mdims = static_cast<int> (val); |
| 4687 | 735 |
| 5099 | 736 if (mdims >= 0) |
| 737 { | |
| 738 dim_vector dv; | |
| 739 dv.resize (mdims); | |
| 740 | |
| 741 for (int i = 0; i < mdims; i++) | |
| 742 is >> dv(i); | |
| 4687 | 743 |
| 5099 | 744 Cell tmp(dv); |
| 4687 | 745 |
| 5275 | 746 for (octave_idx_type i = 0; i < dv.numel (); i++) |
| 5099 | 747 { |
| 748 octave_value t2; | |
| 749 bool dummy; | |
| 750 | |
| 751 // recurse to read cell elements | |
| 752 std::string nm = read_ascii_data (is, std::string (), | |
| 5759 | 753 dummy, t2, i); |
| 4687 | 754 |
| 5099 | 755 if (nm == CELL_ELT_TAG) |
| 756 { | |
| 757 if (is) | |
| 758 tmp.elem (i) = t2; | |
| 759 } | |
| 760 else | |
| 761 { | |
| 762 error ("load: cell array element had unexpected name"); | |
| 763 success = false; | |
| 764 break; | |
| 765 } | |
| 766 } | |
| 4687 | 767 |
| 5099 | 768 if (is) |
| 769 matrix = tmp; | |
| 4687 | 770 else |
| 771 { | |
| 5099 | 772 error ("load: failed to load matrix constant"); |
| 4687 | 773 success = false; |
| 774 } | |
| 775 } | |
| 776 else | |
| 777 { | |
| 5099 | 778 error ("load: failed to extract number of rows and columns"); |
| 779 success = false; | |
| 780 } | |
| 781 } | |
| 782 else if (kw == "rows") | |
| 783 { | |
| 5275 | 784 octave_idx_type nr = val; |
| 785 octave_idx_type nc = 0; | |
| 5099 | 786 |
| 787 if (nr >= 0 && extract_keyword (is, "columns", nc) && nc >= 0) | |
| 788 { | |
| 789 if (nr > 0 && nc > 0) | |
| 790 { | |
| 791 Cell tmp (nr, nc); | |
| 792 | |
| 5275 | 793 for (octave_idx_type j = 0; j < nc; j++) |
| 5099 | 794 { |
| 5275 | 795 for (octave_idx_type i = 0; i < nr; i++) |
| 5099 | 796 { |
| 797 octave_value t2; | |
| 798 bool dummy; | |
| 799 | |
| 800 // recurse to read cell elements | |
| 801 std::string nm = read_ascii_data (is, std::string (), | |
| 5759 | 802 dummy, t2, i); |
| 5099 | 803 |
| 804 if (nm == CELL_ELT_TAG) | |
| 805 { | |
| 806 if (is) | |
| 807 tmp.elem (i, j) = t2; | |
| 808 } | |
| 809 else | |
| 810 { | |
| 811 error ("load: cell array element had unexpected name"); | |
| 812 success = false; | |
| 813 goto cell_read_error; | |
| 814 } | |
| 815 } | |
| 816 } | |
| 817 | |
| 818 cell_read_error: | |
| 819 | |
| 820 if (is) | |
| 821 matrix = tmp; | |
| 822 else | |
| 823 { | |
| 824 error ("load: failed to load cell element"); | |
| 825 success = false; | |
| 826 } | |
| 827 } | |
| 828 else if (nr == 0 || nc == 0) | |
| 829 matrix = Cell (nr, nc); | |
| 830 else | |
| 831 panic_impossible (); | |
| 832 } | |
| 833 else | |
| 834 { | |
| 835 error ("load: failed to extract number of rows and columns for cell array"); | |
| 4687 | 836 success = false; |
| 837 } | |
| 838 } | |
| 839 else | |
| 5099 | 840 panic_impossible (); |
| 4687 | 841 } |
| 842 else | |
| 843 { | |
| 5099 | 844 error ("load: failed to extract number of rows and columns"); |
| 845 success = false; | |
| 4687 | 846 } |
| 847 | |
| 848 return success; | |
| 849 } | |
| 850 | |
| 851 bool | |
| 852 octave_cell::save_binary (std::ostream& os, bool& save_as_floats) | |
| 853 { | |
| 854 dim_vector d = dims (); | |
| 855 if (d.length () < 1) | |
| 856 return false; | |
| 857 | |
| 858 // Use negative value for ndims | |
| 5828 | 859 int32_t di = - d.length(); |
| 5760 | 860 os.write (reinterpret_cast<char *> (&di), 4); |
| 5275 | 861 for (int i = 0; i < d.length (); i++) |
| 4687 | 862 { |
| 863 di = d(i); | |
| 5760 | 864 os.write (reinterpret_cast<char *> (&di), 4); |
| 4687 | 865 } |
| 866 | |
| 867 Cell tmp = cell_value (); | |
| 868 | |
| 5275 | 869 for (octave_idx_type i = 0; i < d.numel (); i++) |
| 4687 | 870 { |
| 871 octave_value o_val = tmp.elem (i); | |
| 872 | |
| 873 // Recurse to print sub-value. | |
| 874 bool b = save_binary_data (os, o_val, CELL_ELT_TAG, "", 0, | |
| 875 save_as_floats); | |
| 876 | |
| 877 if (! b) | |
| 878 return false; | |
| 879 } | |
| 880 | |
| 881 return true; | |
| 882 } | |
| 883 | |
| 884 bool | |
| 885 octave_cell::load_binary (std::istream& is, bool swap, | |
|
8815
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
886 oct_mach_info::float_format fmt) |
| 4687 | 887 { |
|
8815
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
888 clear_cellstr_cache (); |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
889 |
| 4687 | 890 bool success = true; |
| 5828 | 891 int32_t mdims; |
| 5760 | 892 if (! is.read (reinterpret_cast<char *> (&mdims), 4)) |
| 4687 | 893 return false; |
| 894 if (swap) | |
| 4944 | 895 swap_bytes<4> (&mdims); |
| 4687 | 896 if (mdims >= 0) |
| 897 return false; | |
| 898 | |
| 899 mdims = -mdims; | |
| 5828 | 900 int32_t di; |
| 4687 | 901 dim_vector dv; |
| 902 dv.resize (mdims); | |
| 903 | |
| 904 for (int i = 0; i < mdims; i++) | |
| 905 { | |
| 5760 | 906 if (! is.read (reinterpret_cast<char *> (&di), 4)) |
| 4687 | 907 return false; |
| 908 if (swap) | |
| 4944 | 909 swap_bytes<4> (&di); |
| 4687 | 910 dv(i) = di; |
| 911 } | |
| 912 | |
| 5157 | 913 // Convert an array with a single dimension to be a row vector. |
| 914 // Octave should never write files like this, other software | |
| 915 // might. | |
| 916 | |
| 917 if (mdims == 1) | |
| 918 { | |
| 919 mdims = 2; | |
| 920 dv.resize (mdims); | |
| 921 dv(1) = dv(0); | |
| 922 dv(0) = 1; | |
| 923 } | |
| 924 | |
| 5275 | 925 octave_idx_type nel = dv.numel (); |
| 4687 | 926 Cell tmp(dv); |
| 927 | |
| 5275 | 928 for (octave_idx_type i = 0; i < nel; i++) |
| 4687 | 929 { |
| 930 octave_value t2; | |
| 931 bool dummy; | |
| 932 std::string doc; | |
| 933 | |
| 934 // recurse to read cell elements | |
| 935 std::string nm = read_binary_data (is, swap, fmt, std::string (), | |
| 936 dummy, t2, doc); | |
| 937 | |
| 938 if (nm == CELL_ELT_TAG) | |
| 939 { | |
| 940 if (is) | |
| 941 tmp.elem (i) = t2; | |
| 942 } | |
| 943 else | |
| 944 { | |
| 945 error ("load: cell array element had unexpected name"); | |
| 946 success = false; | |
| 947 break; | |
| 948 } | |
| 949 } | |
| 950 | |
| 951 if (is) | |
| 952 matrix = tmp; | |
| 953 else | |
| 954 { | |
| 955 error ("load: failed to load matrix constant"); | |
| 956 success = false; | |
| 957 } | |
| 958 | |
| 959 return success; | |
| 960 } | |
| 961 | |
|
8815
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
962 void * |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
963 octave_cell::mex_get_data (void) const |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
964 { |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
965 clear_cellstr_cache (); |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
966 return matrix.mex_get_data (); |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
967 } |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
968 |
| 4687 | 969 #if defined (HAVE_HDF5) |
| 4815 | 970 |
| 4687 | 971 bool |
| 972 octave_cell::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) | |
| 973 { | |
| 4814 | 974 dim_vector dv = dims (); |
| 4837 | 975 int empty = save_hdf5_empty (loc_id, name, dv); |
| 976 if (empty) | |
| 977 return (empty > 0); | |
| 978 | |
| 4815 | 979 hsize_t rank = dv.length (); |
| 4687 | 980 hid_t space_hid = -1, data_hid = -1, size_hid = -1; |
| 981 | |
| 982 data_hid = H5Gcreate (loc_id, name, 0); | |
| 4815 | 983 |
| 984 if (data_hid < 0) | |
| 985 return false; | |
| 4687 | 986 |
| 4814 | 987 // Have to save cell array shape, since can't have a |
| 988 // dataset of groups.... | |
| 4815 | 989 |
| 990 space_hid = H5Screate_simple (1, &rank, 0); | |
| 991 | |
| 4687 | 992 if (space_hid < 0) |
| 993 { | |
| 994 H5Gclose (data_hid); | |
| 995 return false; | |
| 996 } | |
| 997 | |
| 5351 | 998 OCTAVE_LOCAL_BUFFER (octave_idx_type, hdims, rank); |
| 4814 | 999 |
| 1000 // Octave uses column-major, while HDF5 uses row-major ordering | |
| 4933 | 1001 for (hsize_t i = 0; i < rank; i++) |
| 4815 | 1002 hdims[i] = dv(rank-i-1); |
| 4814 | 1003 |
| 5351 | 1004 size_hid = H5Dcreate (data_hid, "dims", H5T_NATIVE_IDX, space_hid, |
| 4687 | 1005 H5P_DEFAULT); |
| 1006 if (size_hid < 0) | |
| 1007 { | |
| 1008 H5Sclose (space_hid); | |
| 1009 H5Gclose (data_hid); | |
| 1010 return false; | |
| 1011 } | |
| 1012 | |
| 6276 | 1013 if (H5Dwrite (size_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, |
| 1014 H5P_DEFAULT, hdims) < 0) | |
| 4687 | 1015 { |
| 1016 H5Dclose (size_hid); | |
| 1017 H5Sclose (space_hid); | |
| 1018 H5Gclose (data_hid); | |
| 1019 return false; | |
| 1020 } | |
| 4815 | 1021 |
| 4687 | 1022 H5Dclose (size_hid); |
| 1023 H5Sclose (space_hid); | |
| 1024 | |
| 4815 | 1025 // Recursively add each element of the cell to this group. |
| 1026 | |
| 4687 | 1027 Cell tmp = cell_value (); |
| 5850 | 1028 |
| 1029 octave_idx_type nel = dv.numel (); | |
| 1030 | |
| 1031 for (octave_idx_type i = 0; i < nel; i++) | |
| 4687 | 1032 { |
| 5765 | 1033 std::ostringstream buf; |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7285
diff
changeset
|
1034 int digits = static_cast<int> (::floor (::log10 (static_cast<double> (nel)) + 1.0)); |
| 5850 | 1035 buf << "_" << std::setw (digits) << std::setfill ('0') << i; |
| 5765 | 1036 std::string s = buf.str (); |
| 4687 | 1037 |
| 5850 | 1038 if (! add_hdf5_data (data_hid, tmp.elem (i), s.c_str (), "", false, |
| 1039 save_as_floats)) | |
| 4814 | 1040 { |
| 1041 H5Gclose (data_hid); | |
| 1042 return false; | |
| 4687 | 1043 } |
| 1044 } | |
| 1045 | |
| 1046 H5Gclose (data_hid); | |
| 4815 | 1047 |
| 4687 | 1048 return true; |
| 1049 } | |
| 1050 | |
| 1051 bool | |
| 1052 octave_cell::load_hdf5 (hid_t loc_id, const char *name, | |
| 1053 bool have_h5giterate_bug) | |
| 1054 { | |
|
8815
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
1055 clear_cellstr_cache (); |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
1056 |
| 4687 | 1057 bool retval = false; |
| 4837 | 1058 |
| 1059 dim_vector dv; | |
| 1060 int empty = load_hdf5_empty (loc_id, name, dv); | |
| 1061 if (empty > 0) | |
| 1062 matrix.resize(dv); | |
| 1063 if (empty) | |
| 1064 return (empty > 0); | |
| 1065 | |
| 4687 | 1066 hid_t group_id = H5Gopen (loc_id, name); |
| 1067 | |
| 1068 if (group_id < 0) | |
| 1069 return false; | |
| 1070 | |
| 4814 | 1071 hid_t data_hid = H5Dopen (group_id, "dims"); |
| 4687 | 1072 hid_t space_hid = H5Dget_space (data_hid); |
| 1073 hsize_t rank = H5Sget_simple_extent_ndims (space_hid); | |
| 4814 | 1074 if (rank != 1) |
| 4687 | 1075 { |
| 4837 | 1076 H5Dclose (data_hid); |
| 1077 H5Gclose (group_id); | |
| 4687 | 1078 return false; |
| 1079 } | |
| 1080 | |
| 4814 | 1081 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank); |
| 1082 OCTAVE_LOCAL_BUFFER (hsize_t, maxdims, rank); | |
| 4815 | 1083 |
| 4814 | 1084 H5Sget_simple_extent_dims (space_hid, hdims, maxdims); |
| 4687 | 1085 |
| 4815 | 1086 // Octave uses column-major, while HDF5 uses row-major ordering. |
| 1087 | |
| 4814 | 1088 dv.resize (hdims[0]); |
| 4815 | 1089 |
| 5351 | 1090 OCTAVE_LOCAL_BUFFER (octave_idx_type, tmp, hdims[0]); |
| 4814 | 1091 |
| 5351 | 1092 if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, |
| 4815 | 1093 H5P_DEFAULT, tmp) < 0) |
| 4687 | 1094 { |
| 4837 | 1095 H5Dclose (data_hid); |
| 1096 H5Gclose (group_id); | |
| 4687 | 1097 return false; |
| 1098 } | |
| 4815 | 1099 |
| 4687 | 1100 H5Dclose (data_hid); |
| 1101 H5Gclose (group_id); | |
| 1102 | |
| 4815 | 1103 for (hsize_t i = 0, j = hdims[0] - 1; i < hdims[0]; i++, j--) |
| 4814 | 1104 dv(j) = tmp[i]; |
| 1105 | |
| 4687 | 1106 hdf5_callback_data dsub; |
| 1107 | |
| 1108 herr_t retval2 = -1; | |
| 4815 | 1109 |
| 4814 | 1110 Cell m (dv); |
| 4815 | 1111 |
| 4687 | 1112 int current_item = 0; |
| 4815 | 1113 |
| 4687 | 1114 if (have_h5giterate_bug) |
| 4815 | 1115 current_item = 1; // Skip dims items in group. |
| 4687 | 1116 |
| 4696 | 1117 #ifdef HAVE_H5GGET_NUM_OBJS |
| 1118 hsize_t num_obj = 0; | |
| 5060 | 1119 group_id = H5Gopen (loc_id, name); |
| 1120 H5Gget_num_objs (group_id, &num_obj); | |
| 1121 H5Gclose (group_id); | |
| 4696 | 1122 #endif |
| 1123 | |
| 5275 | 1124 for (octave_idx_type i = 0; i < dv.numel (); i++) |
| 4687 | 1125 { |
| 4696 | 1126 |
| 1127 #ifdef HAVE_H5GGET_NUM_OBJS | |
| 4814 | 1128 if (current_item >= static_cast<int> (num_obj)) |
| 1129 retval2 = -1; | |
| 1130 else | |
| 4696 | 1131 #endif |
| 4814 | 1132 retval2 = H5Giterate (loc_id, name, ¤t_item, |
| 1133 hdf5_read_next_data, &dsub); | |
| 1134 | |
| 4687 | 1135 if (retval2 <= 0) |
| 1136 break; | |
| 4814 | 1137 |
| 1138 octave_value ov = dsub.tc; | |
| 1139 m.elem (i) = ov; | |
| 1140 | |
| 1141 if (have_h5giterate_bug) | |
| 4815 | 1142 current_item++; // H5Giterate returned the last index processed. |
| 4814 | 1143 |
| 4687 | 1144 } |
| 1145 | |
| 1146 if (retval2 >= 0) | |
| 1147 { | |
| 1148 matrix = m; | |
| 1149 retval = true; | |
| 1150 } | |
| 1151 | |
| 1152 return retval; | |
| 1153 } | |
| 4815 | 1154 |
| 4687 | 1155 #endif |
| 1156 | |
| 3354 | 1157 DEFUN (iscell, args, , |
| 3448 | 1158 "-*- texinfo -*-\n\ |
| 1159 @deftypefn {Built-in Function} {} iscell (@var{x})\n\ | |
| 1160 Return true if @var{x} is a cell array object. Otherwise, return\n\ | |
| 1161 false.\n\ | |
| 1162 @end deftypefn") | |
| 3354 | 1163 { |
| 1164 octave_value retval; | |
| 1165 | |
| 1166 if (args.length () == 1) | |
| 1167 retval = args(0).is_cell (); | |
| 1168 else | |
| 5823 | 1169 print_usage (); |
| 3354 | 1170 |
| 1171 return retval; | |
| 1172 } | |
| 1173 | |
| 1174 DEFUN (cell, args, , | |
| 3448 | 1175 "-*- texinfo -*-\n\ |
| 1176 @deftypefn {Built-in Function} {} cell (@var{x})\n\ | |
| 1177 @deftypefnx {Built-in Function} {} cell (@var{n}, @var{m})\n\ | |
| 1178 Create a new cell array object. If invoked with a single scalar\n\ | |
| 1179 argument, @code{cell} returns a square cell array with the dimension\n\ | |
| 1180 specified. If you supply two scalar arguments, @code{cell} takes\n\ | |
| 1181 them to be the number of rows and columns. If given a vector with two\n\ | |
| 1182 elements, @code{cell} uses the values of the elements as the number of\n\ | |
| 1183 rows and columns, respectively.\n\ | |
| 1184 @end deftypefn") | |
| 3354 | 1185 { |
| 1186 octave_value retval; | |
| 1187 | |
| 1188 int nargin = args.length (); | |
| 1189 | |
| 4563 | 1190 dim_vector dims; |
| 1191 | |
| 3354 | 1192 switch (nargin) |
| 1193 { | |
| 4563 | 1194 case 0: |
| 1195 dims = dim_vector (0, 0); | |
| 3354 | 1196 break; |
| 1197 | |
| 4563 | 1198 case 1: |
| 1199 get_dimensions (args(0), "cell", dims); | |
| 3354 | 1200 break; |
| 1201 | |
| 1202 default: | |
| 4563 | 1203 { |
| 1204 dims.resize (nargin); | |
| 1205 | |
| 1206 for (int i = 0; i < nargin; i++) | |
| 1207 { | |
| 1208 dims(i) = args(i).is_empty () ? 0 : args(i).nint_value (); | |
| 1209 | |
| 1210 if (error_state) | |
| 1211 { | |
| 1212 error ("cell: expecting scalar arguments"); | |
| 1213 break; | |
| 1214 } | |
| 1215 } | |
| 1216 } | |
| 3354 | 1217 break; |
| 1218 } | |
| 1219 | |
| 4563 | 1220 if (! error_state) |
| 1221 { | |
|
8290
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1222 dims.chop_trailing_singletons (); |
| 4563 | 1223 |
| 1224 check_dimensions (dims, "cell"); | |
| 1225 | |
| 1226 if (! error_state) | |
|
8290
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1227 retval = Cell (dims, Matrix ()); |
| 4563 | 1228 } |
| 1229 | |
| 3354 | 1230 return retval; |
| 1231 } | |
| 1232 | |
| 4610 | 1233 DEFUN (iscellstr, args, , |
| 1234 "-*- texinfo -*-\n\ | |
| 1235 @deftypefn {Built-in Function} {} iscellstr (@var{cell})\n\ | |
| 1236 Return true if every element of the cell array @var{cell} is a\n\ | |
| 1237 character string\n\ | |
| 1238 @end deftypefn") | |
| 1239 { | |
| 4699 | 1240 octave_value retval; |
| 4610 | 1241 |
| 1242 if (args.length () == 1) | |
| 6116 | 1243 retval = args(0).is_cellstr (); |
| 4610 | 1244 else |
| 5823 | 1245 print_usage (); |
| 4610 | 1246 |
| 1247 return retval; | |
| 1248 } | |
| 1249 | |
| 4817 | 1250 // Note that since Fcellstr calls Fiscellstr, we need to have |
| 1251 // Fiscellstr defined first (to provide a declaration) and also we | |
| 1252 // should keep it in the same file (so we don't have to provide a | |
| 1253 // declaration) and so we don't have to use feval to call it. | |
| 1254 | |
| 1255 DEFUN (cellstr, args, , | |
| 1256 "-*- texinfo -*-\n\ | |
| 1257 @deftypefn {Built-in Function} {} cellstr (@var{string})\n\ | |
| 1258 Create a new cell array object from the elements of the string\n\ | |
| 1259 array @var{string}.\n\ | |
| 1260 @end deftypefn") | |
| 1261 { | |
| 1262 octave_value retval; | |
| 1263 | |
| 1264 if (args.length () == 1) | |
| 1265 { | |
| 1266 octave_value_list tmp = Fiscellstr (args, 1); | |
| 1267 | |
| 1268 if (tmp(0).is_true ()) | |
| 1269 retval = args(0); | |
| 1270 else | |
| 1271 { | |
| 1272 string_vector s = args(0).all_strings (); | |
| 1273 | |
| 1274 if (! error_state) | |
| 7813 | 1275 retval = (s.is_empty () |
| 1276 ? Cell (octave_value (std::string ())) | |
| 1277 : Cell (s, true)); | |
| 4817 | 1278 else |
| 1279 error ("cellstr: expecting argument to be a 2-d character array"); | |
| 1280 } | |
| 1281 } | |
| 1282 else | |
| 5823 | 1283 print_usage (); |
| 4817 | 1284 |
| 1285 return retval; | |
| 1286 } | |
| 1287 | |
| 4762 | 1288 DEFUN (struct2cell, args, , |
| 1289 "-*- texinfo -*-\n\ | |
| 1290 @deftypefn {Built-in Function} {} struct2cell (@var{S})\n\ | |
| 1291 Create a new cell array from the objects stored in the struct object.\n\ | |
| 4764 | 1292 If @var{f} is the number of fields in the structure, the resulting\n\ |
| 1293 cell array will have a dimension vector corresponding to\n\ | |
| 1294 @code{[@var{F} size(@var{S})]}.\n\ | |
| 5642 | 1295 @seealso{cell2struct, fieldnames}\n\ |
| 1296 @end deftypefn") | |
| 4762 | 1297 { |
| 1298 octave_value retval; | |
| 4764 | 1299 |
| 4762 | 1300 int nargin = args.length (); |
| 4764 | 1301 |
| 4762 | 1302 if (nargin == 1) |
| 1303 { | |
| 4764 | 1304 Octave_map m = args(0).map_value (); |
| 1305 | |
| 4762 | 1306 if (! error_state) |
| 1307 { | |
| 1308 dim_vector m_dv = m.dims (); | |
| 4764 | 1309 |
| 4762 | 1310 string_vector keys = m.keys (); |
| 4764 | 1311 |
|
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1312 octave_idx_type num_fields = keys.length (); |
| 4764 | 1313 |
| 4762 | 1314 // The resulting dim_vector should have dimensions: |
| 1315 // [numel(fields) size(struct)] | |
| 4764 | 1316 |
| 4762 | 1317 dim_vector result_dv; |
| 4764 | 1318 result_dv.resize (m_dv.length () + 1); // Add 1 for the fields. |
| 1319 | |
|
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1320 result_dv(0) = num_fields; |
| 4762 | 1321 |
| 1322 for (int i = 1; i < result_dv.length (); i++) | |
| 1323 result_dv(i) = m_dv(i-1); | |
| 4764 | 1324 |
| 4762 | 1325 Cell c (result_dv); |
| 4764 | 1326 |
|
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1327 octave_idx_type n_elts = m.numel (); |
| 4764 | 1328 |
|
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1329 for (octave_idx_type j = 0; j < num_fields; j++) |
| 4762 | 1330 { |
|
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1331 octave_idx_type k = j; |
| 4764 | 1332 |
|
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1333 const Cell vals = m.contents (keys(j)); |
| 4764 | 1334 |
|
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1335 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
|
1336 { |
|
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1337 c(k) = vals(i); |
|
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1338 k += num_fields; |
| 4762 | 1339 } |
| 1340 } | |
| 1341 | |
| 1342 retval = c; | |
| 1343 } | |
| 1344 else | |
| 1345 error ("struct2cell: expecting argument to be a cell array"); | |
| 1346 } | |
| 1347 else | |
| 5823 | 1348 print_usage (); |
| 4764 | 1349 |
| 4762 | 1350 return retval; |
| 1351 } | |
| 1352 | |
| 5900 | 1353 mxArray * |
| 1354 octave_cell::as_mxArray (void) const | |
| 1355 { | |
| 1356 mxArray *retval = new mxArray (dims ()); | |
| 1357 | |
| 1358 mxArray **elts = static_cast<mxArray **> (retval->get_data ()); | |
| 1359 | |
| 6686 | 1360 mwSize nel = numel (); |
| 5900 | 1361 |
| 1362 const octave_value *p = matrix.data (); | |
| 1363 | |
| 6686 | 1364 for (mwIndex i = 0; i < nel; i++) |
| 5900 | 1365 elts[i] = new mxArray (p[i]); |
| 1366 | |
| 1367 return retval; | |
| 1368 } | |
| 1369 | |
| 3353 | 1370 /* |
| 1371 ;;; Local Variables: *** | |
| 1372 ;;; mode: C++ *** | |
| 1373 ;;; End: *** | |
| 1374 */ |