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