Mercurial > hg > octave-lyh
annotate src/ov-cell.cc @ 8823:3efa512a0957
make issorted work for cells
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Fri, 20 Feb 2009 07:44:48 +0100 |
| parents | af907aeedbf4 |
| children | 76ddf0ab985d |
| 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 | |
|
8823
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
486 sortmode |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
487 octave_cell::is_sorted (sortmode mode) const |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
488 { |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
489 sortmode retval = UNSORTED; |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
490 |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
491 if (is_cellstr ()) |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
492 { |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
493 Array<std::string> tmp = cellstr_value (); |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
494 |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
495 retval = tmp.is_sorted (mode); |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
496 } |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
497 else |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
498 error ("issorted: not a cell array of strings"); |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
499 |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
500 return retval; |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
501 } |
|
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 |
| 8732 | 504 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
|
505 octave_cell::sort_rows_idx (sortmode mode) const |
| 8732 | 506 { |
| 507 Array<octave_idx_type> retval; | |
| 508 | |
| 509 if (is_cellstr ()) | |
| 510 { | |
| 511 Array<std::string> tmp = cellstr_value (); | |
| 512 | |
| 513 retval = tmp.sort_rows_idx (mode); | |
| 514 } | |
| 515 else | |
| 516 error ("sortrows: only cell arrays of character strings may be sorted"); | |
| 517 | |
| 518 return retval; | |
| 519 } | |
| 520 | |
|
8823
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
521 sortmode |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
522 octave_cell::is_sorted_rows (sortmode mode) const |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
523 { |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
524 sortmode retval = UNSORTED; |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
525 |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
526 if (is_cellstr ()) |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
527 { |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
528 Array<std::string> tmp = cellstr_value (); |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
529 |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
530 retval = tmp.is_sorted_rows (mode); |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
531 } |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
532 else |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
533 error ("issorted: not a cell array of strings"); |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
534 |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
535 return retval; |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
536 } |
|
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
537 |
|
8626
1dce30ab0e72
don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents:
8587
diff
changeset
|
538 bool |
|
1dce30ab0e72
don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents:
8587
diff
changeset
|
539 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
|
540 { |
|
1dce30ab0e72
don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents:
8587
diff
changeset
|
541 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
|
542 return false; |
|
1dce30ab0e72
don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents:
8587
diff
changeset
|
543 } |
|
1dce30ab0e72
don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents:
8587
diff
changeset
|
544 |
| 3933 | 545 octave_value_list |
| 546 octave_cell::list_value (void) const | |
| 547 { | |
|
8580
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
548 return octave_value_list (matrix); |
| 3933 | 549 } |
| 550 | |
| 4243 | 551 string_vector |
| 5715 | 552 octave_cell::all_strings (bool pad) const |
| 4243 | 553 { |
| 4358 | 554 string_vector retval; |
| 555 | |
| 7285 | 556 octave_idx_type nel = numel (); |
| 4243 | 557 |
| 4358 | 558 int n_elts = 0; |
| 559 | |
| 5275 | 560 octave_idx_type max_len = 0; |
| 4358 | 561 |
| 7285 | 562 for (octave_idx_type i = 0; i < nel; i++) |
| 4358 | 563 { |
| 7285 | 564 string_vector s = matrix(i).all_strings (); |
| 565 | |
| 566 if (error_state) | |
| 567 return retval; | |
| 4358 | 568 |
| 7285 | 569 octave_idx_type s_len = s.length (); |
| 4358 | 570 |
| 7285 | 571 n_elts += s_len ? s_len : 1; |
| 4358 | 572 |
| 7285 | 573 octave_idx_type s_max_len = s.max_length (); |
| 4358 | 574 |
| 7285 | 575 if (s_max_len > max_len) |
| 576 max_len = s_max_len; | |
| 4358 | 577 } |
| 578 | |
| 579 retval.resize (n_elts); | |
| 4243 | 580 |
| 5275 | 581 octave_idx_type k = 0; |
| 4243 | 582 |
| 7285 | 583 for (octave_idx_type i = 0; i < nel; i++) |
| 4243 | 584 { |
| 7285 | 585 string_vector s = matrix(i).all_strings (); |
| 586 | |
| 587 octave_idx_type s_len = s.length (); | |
| 4358 | 588 |
| 7285 | 589 if (s_len) |
| 590 { | |
| 591 for (octave_idx_type j = 0; j < s_len; j++) | |
| 5715 | 592 { |
| 7285 | 593 std::string t = s[j]; |
| 5715 | 594 int t_len = t.length (); |
| 595 | |
| 596 if (pad && max_len > t_len) | |
| 597 t += std::string (max_len - t_len, ' '); | |
| 598 | |
| 599 retval[k++] = t; | |
| 600 } | |
| 4243 | 601 } |
| 7285 | 602 else if (pad) |
| 603 retval[k++] = std::string (max_len, ' '); | |
| 604 else | |
| 605 retval[k++] = std::string (); | |
| 4243 | 606 } |
| 607 | |
| 608 return retval; | |
| 609 } | |
| 610 | |
| 8732 | 611 Array<std::string> |
| 612 octave_cell::cellstr_value (void) const | |
| 613 { | |
|
8815
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
614 Array<std::string> retval; |
| 8732 | 615 |
| 616 if (is_cellstr ()) | |
| 617 { | |
|
8815
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
618 retval = cellstr_cache; |
| 8732 | 619 } |
| 620 else | |
|
8815
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
621 error ("invalid conversion from cell array to array of strings"); |
| 8732 | 622 |
| 623 return retval; | |
| 624 } | |
| 625 | |
| 4604 | 626 bool |
| 627 octave_cell::print_as_scalar (void) const | |
| 628 { | |
| 629 return (ndims () > 2 || numel () == 0); | |
| 630 } | |
| 631 | |
| 3933 | 632 void |
| 633 octave_cell::print (std::ostream& os, bool) const | |
| 634 { | |
| 635 print_raw (os); | |
| 636 } | |
| 637 | |
| 638 void | |
| 639 octave_cell::print_raw (std::ostream& os, bool) const | |
| 640 { | |
| 4587 | 641 int nd = matrix.ndims (); |
| 4513 | 642 |
| 4587 | 643 if (nd == 2) |
| 4513 | 644 { |
| 5275 | 645 octave_idx_type nr = rows (); |
| 646 octave_idx_type nc = columns (); | |
| 4513 | 647 |
| 648 if (nr > 0 && nc > 0) | |
| 649 { | |
| 650 indent (os); | |
| 651 os << "{"; | |
| 652 newline (os); | |
| 653 | |
| 654 increment_indent_level (); | |
| 655 | |
| 5275 | 656 for (octave_idx_type j = 0; j < nc; j++) |
| 4513 | 657 { |
| 5275 | 658 for (octave_idx_type i = 0; i < nr; i++) |
| 4513 | 659 { |
| 660 OCTAVE_QUIT; | |
| 661 | |
| 5765 | 662 std::ostringstream buf; |
| 663 buf << "[" << i+1 << "," << j+1 << "]"; | |
| 3933 | 664 |
| 4513 | 665 octave_value val = matrix(i,j); |
| 666 | |
| 5765 | 667 val.print_with_name (os, buf.str ()); |
| 4513 | 668 } |
| 669 } | |
| 670 | |
| 671 decrement_indent_level (); | |
| 672 | |
| 673 indent (os); | |
| 674 os << "}"; | |
| 675 newline (os); | |
| 676 } | |
| 677 else | |
| 678 { | |
| 679 os << "{}"; | |
| 5360 | 680 if (Vprint_empty_dimensions) |
| 4513 | 681 os << "(" << nr << "x" << nc << ")"; |
| 682 os << "\n"; | |
| 683 } | |
| 684 } | |
| 685 else | |
| 3933 | 686 { |
| 687 indent (os); | |
| 4513 | 688 dim_vector dv = matrix.dims (); |
| 4587 | 689 os << "{" << dv.str () << " Cell Array}"; |
| 3933 | 690 newline (os); |
| 691 } | |
| 692 } | |
| 693 | |
| 4687 | 694 #define CELL_ELT_TAG "<cell-element>" |
| 695 | |
| 696 bool | |
| 6974 | 697 octave_cell::save_ascii (std::ostream& os) |
| 4687 | 698 { |
| 699 dim_vector d = dims (); | |
| 700 if (d.length () > 2) | |
| 701 { | |
| 702 os << "# ndims: " << d.length () << "\n"; | |
| 703 | |
| 5275 | 704 for (int i = 0; i < d.length (); i++) |
| 4687 | 705 os << " " << d (i); |
| 706 os << "\n"; | |
| 707 | |
| 708 Cell tmp = cell_value (); | |
| 709 | |
| 5275 | 710 for (octave_idx_type i = 0; i < d.numel (); i++) |
| 4687 | 711 { |
| 712 octave_value o_val = tmp.elem (i); | |
| 713 | |
| 714 // Recurse to print sub-value. | |
| 6974 | 715 bool b = save_ascii_data (os, o_val, CELL_ELT_TAG, false, 0); |
| 4687 | 716 |
| 717 if (! b) | |
| 718 return os; | |
| 719 } | |
| 720 } | |
| 721 else | |
| 722 { | |
| 723 // Keep this case, rather than use generic code above for backward | |
| 724 // compatiability. Makes load_ascii much more complex!! | |
| 725 os << "# rows: " << rows () << "\n" | |
| 726 << "# columns: " << columns () << "\n"; | |
| 727 | |
| 728 Cell tmp = cell_value (); | |
| 729 | |
| 5275 | 730 for (octave_idx_type j = 0; j < tmp.cols (); j++) |
| 4687 | 731 { |
| 5275 | 732 for (octave_idx_type i = 0; i < tmp.rows (); i++) |
| 4687 | 733 { |
| 734 octave_value o_val = tmp.elem (i, j); | |
| 735 | |
| 736 // Recurse to print sub-value. | |
| 6974 | 737 bool b = save_ascii_data (os, o_val, CELL_ELT_TAG, false, 0); |
| 4687 | 738 |
| 739 if (! b) | |
| 740 return os; | |
| 741 } | |
| 742 | |
| 743 os << "\n"; | |
| 744 } | |
| 745 } | |
| 746 | |
| 747 return true; | |
| 748 } | |
| 749 | |
| 750 bool | |
| 751 octave_cell::load_ascii (std::istream& is) | |
| 752 { | |
| 753 bool success = true; | |
| 5099 | 754 |
|
8815
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
755 clear_cellstr_cache (); |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
756 |
| 5099 | 757 string_vector keywords(2); |
| 4687 | 758 |
| 5099 | 759 keywords[0] = "ndims"; |
| 760 keywords[1] = "rows"; | |
| 761 | |
| 762 std::string kw; | |
| 5275 | 763 octave_idx_type val = 0; |
| 5099 | 764 |
| 765 if (extract_keyword (is, keywords, kw, val, true)) | |
| 4687 | 766 { |
| 5099 | 767 if (kw == "ndims") |
| 4687 | 768 { |
| 5275 | 769 int mdims = static_cast<int> (val); |
| 4687 | 770 |
| 5099 | 771 if (mdims >= 0) |
| 772 { | |
| 773 dim_vector dv; | |
| 774 dv.resize (mdims); | |
| 775 | |
| 776 for (int i = 0; i < mdims; i++) | |
| 777 is >> dv(i); | |
| 4687 | 778 |
| 5099 | 779 Cell tmp(dv); |
| 4687 | 780 |
| 5275 | 781 for (octave_idx_type i = 0; i < dv.numel (); i++) |
| 5099 | 782 { |
| 783 octave_value t2; | |
| 784 bool dummy; | |
| 785 | |
| 786 // recurse to read cell elements | |
| 787 std::string nm = read_ascii_data (is, std::string (), | |
| 5759 | 788 dummy, t2, i); |
| 4687 | 789 |
| 5099 | 790 if (nm == CELL_ELT_TAG) |
| 791 { | |
| 792 if (is) | |
| 793 tmp.elem (i) = t2; | |
| 794 } | |
| 795 else | |
| 796 { | |
| 797 error ("load: cell array element had unexpected name"); | |
| 798 success = false; | |
| 799 break; | |
| 800 } | |
| 801 } | |
| 4687 | 802 |
| 5099 | 803 if (is) |
| 804 matrix = tmp; | |
| 4687 | 805 else |
| 806 { | |
| 5099 | 807 error ("load: failed to load matrix constant"); |
| 4687 | 808 success = false; |
| 809 } | |
| 810 } | |
| 811 else | |
| 812 { | |
| 5099 | 813 error ("load: failed to extract number of rows and columns"); |
| 814 success = false; | |
| 815 } | |
| 816 } | |
| 817 else if (kw == "rows") | |
| 818 { | |
| 5275 | 819 octave_idx_type nr = val; |
| 820 octave_idx_type nc = 0; | |
| 5099 | 821 |
| 822 if (nr >= 0 && extract_keyword (is, "columns", nc) && nc >= 0) | |
| 823 { | |
| 824 if (nr > 0 && nc > 0) | |
| 825 { | |
| 826 Cell tmp (nr, nc); | |
| 827 | |
| 5275 | 828 for (octave_idx_type j = 0; j < nc; j++) |
| 5099 | 829 { |
| 5275 | 830 for (octave_idx_type i = 0; i < nr; i++) |
| 5099 | 831 { |
| 832 octave_value t2; | |
| 833 bool dummy; | |
| 834 | |
| 835 // recurse to read cell elements | |
| 836 std::string nm = read_ascii_data (is, std::string (), | |
| 5759 | 837 dummy, t2, i); |
| 5099 | 838 |
| 839 if (nm == CELL_ELT_TAG) | |
| 840 { | |
| 841 if (is) | |
| 842 tmp.elem (i, j) = t2; | |
| 843 } | |
| 844 else | |
| 845 { | |
| 846 error ("load: cell array element had unexpected name"); | |
| 847 success = false; | |
| 848 goto cell_read_error; | |
| 849 } | |
| 850 } | |
| 851 } | |
| 852 | |
| 853 cell_read_error: | |
| 854 | |
| 855 if (is) | |
| 856 matrix = tmp; | |
| 857 else | |
| 858 { | |
| 859 error ("load: failed to load cell element"); | |
| 860 success = false; | |
| 861 } | |
| 862 } | |
| 863 else if (nr == 0 || nc == 0) | |
| 864 matrix = Cell (nr, nc); | |
| 865 else | |
| 866 panic_impossible (); | |
| 867 } | |
| 868 else | |
| 869 { | |
| 870 error ("load: failed to extract number of rows and columns for cell array"); | |
| 4687 | 871 success = false; |
| 872 } | |
| 873 } | |
| 874 else | |
| 5099 | 875 panic_impossible (); |
| 4687 | 876 } |
| 877 else | |
| 878 { | |
| 5099 | 879 error ("load: failed to extract number of rows and columns"); |
| 880 success = false; | |
| 4687 | 881 } |
| 882 | |
| 883 return success; | |
| 884 } | |
| 885 | |
| 886 bool | |
| 887 octave_cell::save_binary (std::ostream& os, bool& save_as_floats) | |
| 888 { | |
| 889 dim_vector d = dims (); | |
| 890 if (d.length () < 1) | |
| 891 return false; | |
| 892 | |
| 893 // Use negative value for ndims | |
| 5828 | 894 int32_t di = - d.length(); |
| 5760 | 895 os.write (reinterpret_cast<char *> (&di), 4); |
| 5275 | 896 for (int i = 0; i < d.length (); i++) |
| 4687 | 897 { |
| 898 di = d(i); | |
| 5760 | 899 os.write (reinterpret_cast<char *> (&di), 4); |
| 4687 | 900 } |
| 901 | |
| 902 Cell tmp = cell_value (); | |
| 903 | |
| 5275 | 904 for (octave_idx_type i = 0; i < d.numel (); i++) |
| 4687 | 905 { |
| 906 octave_value o_val = tmp.elem (i); | |
| 907 | |
| 908 // Recurse to print sub-value. | |
| 909 bool b = save_binary_data (os, o_val, CELL_ELT_TAG, "", 0, | |
| 910 save_as_floats); | |
| 911 | |
| 912 if (! b) | |
| 913 return false; | |
| 914 } | |
| 915 | |
| 916 return true; | |
| 917 } | |
| 918 | |
| 919 bool | |
| 920 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
|
921 oct_mach_info::float_format fmt) |
| 4687 | 922 { |
|
8815
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
923 clear_cellstr_cache (); |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
924 |
| 4687 | 925 bool success = true; |
| 5828 | 926 int32_t mdims; |
| 5760 | 927 if (! is.read (reinterpret_cast<char *> (&mdims), 4)) |
| 4687 | 928 return false; |
| 929 if (swap) | |
| 4944 | 930 swap_bytes<4> (&mdims); |
| 4687 | 931 if (mdims >= 0) |
| 932 return false; | |
| 933 | |
| 934 mdims = -mdims; | |
| 5828 | 935 int32_t di; |
| 4687 | 936 dim_vector dv; |
| 937 dv.resize (mdims); | |
| 938 | |
| 939 for (int i = 0; i < mdims; i++) | |
| 940 { | |
| 5760 | 941 if (! is.read (reinterpret_cast<char *> (&di), 4)) |
| 4687 | 942 return false; |
| 943 if (swap) | |
| 4944 | 944 swap_bytes<4> (&di); |
| 4687 | 945 dv(i) = di; |
| 946 } | |
| 947 | |
| 5157 | 948 // Convert an array with a single dimension to be a row vector. |
| 949 // Octave should never write files like this, other software | |
| 950 // might. | |
| 951 | |
| 952 if (mdims == 1) | |
| 953 { | |
| 954 mdims = 2; | |
| 955 dv.resize (mdims); | |
| 956 dv(1) = dv(0); | |
| 957 dv(0) = 1; | |
| 958 } | |
| 959 | |
| 5275 | 960 octave_idx_type nel = dv.numel (); |
| 4687 | 961 Cell tmp(dv); |
| 962 | |
| 5275 | 963 for (octave_idx_type i = 0; i < nel; i++) |
| 4687 | 964 { |
| 965 octave_value t2; | |
| 966 bool dummy; | |
| 967 std::string doc; | |
| 968 | |
| 969 // recurse to read cell elements | |
| 970 std::string nm = read_binary_data (is, swap, fmt, std::string (), | |
| 971 dummy, t2, doc); | |
| 972 | |
| 973 if (nm == CELL_ELT_TAG) | |
| 974 { | |
| 975 if (is) | |
| 976 tmp.elem (i) = t2; | |
| 977 } | |
| 978 else | |
| 979 { | |
| 980 error ("load: cell array element had unexpected name"); | |
| 981 success = false; | |
| 982 break; | |
| 983 } | |
| 984 } | |
| 985 | |
| 986 if (is) | |
| 987 matrix = tmp; | |
| 988 else | |
| 989 { | |
| 990 error ("load: failed to load matrix constant"); | |
| 991 success = false; | |
| 992 } | |
| 993 | |
| 994 return success; | |
| 995 } | |
| 996 | |
|
8815
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
997 void * |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
998 octave_cell::mex_get_data (void) const |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
999 { |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
1000 clear_cellstr_cache (); |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
1001 return matrix.mex_get_data (); |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
1002 } |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
1003 |
| 4687 | 1004 #if defined (HAVE_HDF5) |
| 4815 | 1005 |
| 4687 | 1006 bool |
| 1007 octave_cell::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) | |
| 1008 { | |
| 4814 | 1009 dim_vector dv = dims (); |
| 4837 | 1010 int empty = save_hdf5_empty (loc_id, name, dv); |
| 1011 if (empty) | |
| 1012 return (empty > 0); | |
| 1013 | |
| 4815 | 1014 hsize_t rank = dv.length (); |
| 4687 | 1015 hid_t space_hid = -1, data_hid = -1, size_hid = -1; |
| 1016 | |
| 1017 data_hid = H5Gcreate (loc_id, name, 0); | |
| 4815 | 1018 |
| 1019 if (data_hid < 0) | |
| 1020 return false; | |
| 4687 | 1021 |
| 4814 | 1022 // Have to save cell array shape, since can't have a |
| 1023 // dataset of groups.... | |
| 4815 | 1024 |
| 1025 space_hid = H5Screate_simple (1, &rank, 0); | |
| 1026 | |
| 4687 | 1027 if (space_hid < 0) |
| 1028 { | |
| 1029 H5Gclose (data_hid); | |
| 1030 return false; | |
| 1031 } | |
| 1032 | |
| 5351 | 1033 OCTAVE_LOCAL_BUFFER (octave_idx_type, hdims, rank); |
| 4814 | 1034 |
| 1035 // Octave uses column-major, while HDF5 uses row-major ordering | |
| 4933 | 1036 for (hsize_t i = 0; i < rank; i++) |
| 4815 | 1037 hdims[i] = dv(rank-i-1); |
| 4814 | 1038 |
| 5351 | 1039 size_hid = H5Dcreate (data_hid, "dims", H5T_NATIVE_IDX, space_hid, |
| 4687 | 1040 H5P_DEFAULT); |
| 1041 if (size_hid < 0) | |
| 1042 { | |
| 1043 H5Sclose (space_hid); | |
| 1044 H5Gclose (data_hid); | |
| 1045 return false; | |
| 1046 } | |
| 1047 | |
| 6276 | 1048 if (H5Dwrite (size_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, |
| 1049 H5P_DEFAULT, hdims) < 0) | |
| 4687 | 1050 { |
| 1051 H5Dclose (size_hid); | |
| 1052 H5Sclose (space_hid); | |
| 1053 H5Gclose (data_hid); | |
| 1054 return false; | |
| 1055 } | |
| 4815 | 1056 |
| 4687 | 1057 H5Dclose (size_hid); |
| 1058 H5Sclose (space_hid); | |
| 1059 | |
| 4815 | 1060 // Recursively add each element of the cell to this group. |
| 1061 | |
| 4687 | 1062 Cell tmp = cell_value (); |
| 5850 | 1063 |
| 1064 octave_idx_type nel = dv.numel (); | |
| 1065 | |
| 1066 for (octave_idx_type i = 0; i < nel; i++) | |
| 4687 | 1067 { |
| 5765 | 1068 std::ostringstream buf; |
|
7503
8c32f95c2639
convert mapper functions to new format
David Bateman <dbateman@free.fr>
parents:
7285
diff
changeset
|
1069 int digits = static_cast<int> (::floor (::log10 (static_cast<double> (nel)) + 1.0)); |
| 5850 | 1070 buf << "_" << std::setw (digits) << std::setfill ('0') << i; |
| 5765 | 1071 std::string s = buf.str (); |
| 4687 | 1072 |
| 5850 | 1073 if (! add_hdf5_data (data_hid, tmp.elem (i), s.c_str (), "", false, |
| 1074 save_as_floats)) | |
| 4814 | 1075 { |
| 1076 H5Gclose (data_hid); | |
| 1077 return false; | |
| 4687 | 1078 } |
| 1079 } | |
| 1080 | |
| 1081 H5Gclose (data_hid); | |
| 4815 | 1082 |
| 4687 | 1083 return true; |
| 1084 } | |
| 1085 | |
| 1086 bool | |
| 1087 octave_cell::load_hdf5 (hid_t loc_id, const char *name, | |
| 1088 bool have_h5giterate_bug) | |
| 1089 { | |
|
8815
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
1090 clear_cellstr_cache (); |
|
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
1091 |
| 4687 | 1092 bool retval = false; |
| 4837 | 1093 |
| 1094 dim_vector dv; | |
| 1095 int empty = load_hdf5_empty (loc_id, name, dv); | |
| 1096 if (empty > 0) | |
| 1097 matrix.resize(dv); | |
| 1098 if (empty) | |
| 1099 return (empty > 0); | |
| 1100 | |
| 4687 | 1101 hid_t group_id = H5Gopen (loc_id, name); |
| 1102 | |
| 1103 if (group_id < 0) | |
| 1104 return false; | |
| 1105 | |
| 4814 | 1106 hid_t data_hid = H5Dopen (group_id, "dims"); |
| 4687 | 1107 hid_t space_hid = H5Dget_space (data_hid); |
| 1108 hsize_t rank = H5Sget_simple_extent_ndims (space_hid); | |
| 4814 | 1109 if (rank != 1) |
| 4687 | 1110 { |
| 4837 | 1111 H5Dclose (data_hid); |
| 1112 H5Gclose (group_id); | |
| 4687 | 1113 return false; |
| 1114 } | |
| 1115 | |
| 4814 | 1116 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank); |
| 1117 OCTAVE_LOCAL_BUFFER (hsize_t, maxdims, rank); | |
| 4815 | 1118 |
| 4814 | 1119 H5Sget_simple_extent_dims (space_hid, hdims, maxdims); |
| 4687 | 1120 |
| 4815 | 1121 // Octave uses column-major, while HDF5 uses row-major ordering. |
| 1122 | |
| 4814 | 1123 dv.resize (hdims[0]); |
| 4815 | 1124 |
| 5351 | 1125 OCTAVE_LOCAL_BUFFER (octave_idx_type, tmp, hdims[0]); |
| 4814 | 1126 |
| 5351 | 1127 if (H5Dread (data_hid, H5T_NATIVE_IDX, H5S_ALL, H5S_ALL, |
| 4815 | 1128 H5P_DEFAULT, tmp) < 0) |
| 4687 | 1129 { |
| 4837 | 1130 H5Dclose (data_hid); |
| 1131 H5Gclose (group_id); | |
| 4687 | 1132 return false; |
| 1133 } | |
| 4815 | 1134 |
| 4687 | 1135 H5Dclose (data_hid); |
| 1136 H5Gclose (group_id); | |
| 1137 | |
| 4815 | 1138 for (hsize_t i = 0, j = hdims[0] - 1; i < hdims[0]; i++, j--) |
| 4814 | 1139 dv(j) = tmp[i]; |
| 1140 | |
| 4687 | 1141 hdf5_callback_data dsub; |
| 1142 | |
| 1143 herr_t retval2 = -1; | |
| 4815 | 1144 |
| 4814 | 1145 Cell m (dv); |
| 4815 | 1146 |
| 4687 | 1147 int current_item = 0; |
| 4815 | 1148 |
| 4687 | 1149 if (have_h5giterate_bug) |
| 4815 | 1150 current_item = 1; // Skip dims items in group. |
| 4687 | 1151 |
| 4696 | 1152 #ifdef HAVE_H5GGET_NUM_OBJS |
| 1153 hsize_t num_obj = 0; | |
| 5060 | 1154 group_id = H5Gopen (loc_id, name); |
| 1155 H5Gget_num_objs (group_id, &num_obj); | |
| 1156 H5Gclose (group_id); | |
| 4696 | 1157 #endif |
| 1158 | |
| 5275 | 1159 for (octave_idx_type i = 0; i < dv.numel (); i++) |
| 4687 | 1160 { |
| 4696 | 1161 |
| 1162 #ifdef HAVE_H5GGET_NUM_OBJS | |
| 4814 | 1163 if (current_item >= static_cast<int> (num_obj)) |
| 1164 retval2 = -1; | |
| 1165 else | |
| 4696 | 1166 #endif |
| 4814 | 1167 retval2 = H5Giterate (loc_id, name, ¤t_item, |
| 1168 hdf5_read_next_data, &dsub); | |
| 1169 | |
| 4687 | 1170 if (retval2 <= 0) |
| 1171 break; | |
| 4814 | 1172 |
| 1173 octave_value ov = dsub.tc; | |
| 1174 m.elem (i) = ov; | |
| 1175 | |
| 1176 if (have_h5giterate_bug) | |
| 4815 | 1177 current_item++; // H5Giterate returned the last index processed. |
| 4814 | 1178 |
| 4687 | 1179 } |
| 1180 | |
| 1181 if (retval2 >= 0) | |
| 1182 { | |
| 1183 matrix = m; | |
| 1184 retval = true; | |
| 1185 } | |
| 1186 | |
| 1187 return retval; | |
| 1188 } | |
| 4815 | 1189 |
| 4687 | 1190 #endif |
| 1191 | |
| 3354 | 1192 DEFUN (iscell, args, , |
| 3448 | 1193 "-*- texinfo -*-\n\ |
| 1194 @deftypefn {Built-in Function} {} iscell (@var{x})\n\ | |
| 1195 Return true if @var{x} is a cell array object. Otherwise, return\n\ | |
| 1196 false.\n\ | |
| 1197 @end deftypefn") | |
| 3354 | 1198 { |
| 1199 octave_value retval; | |
| 1200 | |
| 1201 if (args.length () == 1) | |
| 1202 retval = args(0).is_cell (); | |
| 1203 else | |
| 5823 | 1204 print_usage (); |
| 3354 | 1205 |
| 1206 return retval; | |
| 1207 } | |
| 1208 | |
| 1209 DEFUN (cell, args, , | |
| 3448 | 1210 "-*- texinfo -*-\n\ |
| 1211 @deftypefn {Built-in Function} {} cell (@var{x})\n\ | |
| 1212 @deftypefnx {Built-in Function} {} cell (@var{n}, @var{m})\n\ | |
| 1213 Create a new cell array object. If invoked with a single scalar\n\ | |
| 1214 argument, @code{cell} returns a square cell array with the dimension\n\ | |
| 1215 specified. If you supply two scalar arguments, @code{cell} takes\n\ | |
| 1216 them to be the number of rows and columns. If given a vector with two\n\ | |
| 1217 elements, @code{cell} uses the values of the elements as the number of\n\ | |
| 1218 rows and columns, respectively.\n\ | |
| 1219 @end deftypefn") | |
| 3354 | 1220 { |
| 1221 octave_value retval; | |
| 1222 | |
| 1223 int nargin = args.length (); | |
| 1224 | |
| 4563 | 1225 dim_vector dims; |
| 1226 | |
| 3354 | 1227 switch (nargin) |
| 1228 { | |
| 4563 | 1229 case 0: |
| 1230 dims = dim_vector (0, 0); | |
| 3354 | 1231 break; |
| 1232 | |
| 4563 | 1233 case 1: |
| 1234 get_dimensions (args(0), "cell", dims); | |
| 3354 | 1235 break; |
| 1236 | |
| 1237 default: | |
| 4563 | 1238 { |
| 1239 dims.resize (nargin); | |
| 1240 | |
| 1241 for (int i = 0; i < nargin; i++) | |
| 1242 { | |
| 1243 dims(i) = args(i).is_empty () ? 0 : args(i).nint_value (); | |
| 1244 | |
| 1245 if (error_state) | |
| 1246 { | |
| 1247 error ("cell: expecting scalar arguments"); | |
| 1248 break; | |
| 1249 } | |
| 1250 } | |
| 1251 } | |
| 3354 | 1252 break; |
| 1253 } | |
| 1254 | |
| 4563 | 1255 if (! error_state) |
| 1256 { | |
|
8290
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1257 dims.chop_trailing_singletons (); |
| 4563 | 1258 |
| 1259 check_dimensions (dims, "cell"); | |
| 1260 | |
| 1261 if (! error_state) | |
|
8290
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
1262 retval = Cell (dims, Matrix ()); |
| 4563 | 1263 } |
| 1264 | |
| 3354 | 1265 return retval; |
| 1266 } | |
| 1267 | |
| 4610 | 1268 DEFUN (iscellstr, args, , |
| 1269 "-*- texinfo -*-\n\ | |
| 1270 @deftypefn {Built-in Function} {} iscellstr (@var{cell})\n\ | |
| 1271 Return true if every element of the cell array @var{cell} is a\n\ | |
| 1272 character string\n\ | |
| 1273 @end deftypefn") | |
| 1274 { | |
| 4699 | 1275 octave_value retval; |
| 4610 | 1276 |
| 1277 if (args.length () == 1) | |
| 6116 | 1278 retval = args(0).is_cellstr (); |
| 4610 | 1279 else |
| 5823 | 1280 print_usage (); |
| 4610 | 1281 |
| 1282 return retval; | |
| 1283 } | |
| 1284 | |
| 4817 | 1285 // Note that since Fcellstr calls Fiscellstr, we need to have |
| 1286 // Fiscellstr defined first (to provide a declaration) and also we | |
| 1287 // should keep it in the same file (so we don't have to provide a | |
| 1288 // declaration) and so we don't have to use feval to call it. | |
| 1289 | |
| 1290 DEFUN (cellstr, args, , | |
| 1291 "-*- texinfo -*-\n\ | |
| 1292 @deftypefn {Built-in Function} {} cellstr (@var{string})\n\ | |
| 1293 Create a new cell array object from the elements of the string\n\ | |
| 1294 array @var{string}.\n\ | |
| 1295 @end deftypefn") | |
| 1296 { | |
| 1297 octave_value retval; | |
| 1298 | |
| 1299 if (args.length () == 1) | |
| 1300 { | |
| 1301 octave_value_list tmp = Fiscellstr (args, 1); | |
| 1302 | |
| 1303 if (tmp(0).is_true ()) | |
| 1304 retval = args(0); | |
| 1305 else | |
| 1306 { | |
| 1307 string_vector s = args(0).all_strings (); | |
| 1308 | |
| 1309 if (! error_state) | |
| 7813 | 1310 retval = (s.is_empty () |
| 1311 ? Cell (octave_value (std::string ())) | |
| 1312 : Cell (s, true)); | |
| 4817 | 1313 else |
| 1314 error ("cellstr: expecting argument to be a 2-d character array"); | |
| 1315 } | |
| 1316 } | |
| 1317 else | |
| 5823 | 1318 print_usage (); |
| 4817 | 1319 |
| 1320 return retval; | |
| 1321 } | |
| 1322 | |
| 4762 | 1323 DEFUN (struct2cell, args, , |
| 1324 "-*- texinfo -*-\n\ | |
| 1325 @deftypefn {Built-in Function} {} struct2cell (@var{S})\n\ | |
| 1326 Create a new cell array from the objects stored in the struct object.\n\ | |
| 4764 | 1327 If @var{f} is the number of fields in the structure, the resulting\n\ |
| 1328 cell array will have a dimension vector corresponding to\n\ | |
| 1329 @code{[@var{F} size(@var{S})]}.\n\ | |
| 5642 | 1330 @seealso{cell2struct, fieldnames}\n\ |
| 1331 @end deftypefn") | |
| 4762 | 1332 { |
| 1333 octave_value retval; | |
| 4764 | 1334 |
| 4762 | 1335 int nargin = args.length (); |
| 4764 | 1336 |
| 4762 | 1337 if (nargin == 1) |
| 1338 { | |
| 4764 | 1339 Octave_map m = args(0).map_value (); |
| 1340 | |
| 4762 | 1341 if (! error_state) |
| 1342 { | |
| 1343 dim_vector m_dv = m.dims (); | |
| 4764 | 1344 |
| 4762 | 1345 string_vector keys = m.keys (); |
| 4764 | 1346 |
|
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1347 octave_idx_type num_fields = keys.length (); |
| 4764 | 1348 |
| 4762 | 1349 // The resulting dim_vector should have dimensions: |
| 1350 // [numel(fields) size(struct)] | |
| 4764 | 1351 |
| 4762 | 1352 dim_vector result_dv; |
| 4764 | 1353 result_dv.resize (m_dv.length () + 1); // Add 1 for the fields. |
| 1354 | |
|
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1355 result_dv(0) = num_fields; |
| 4762 | 1356 |
| 1357 for (int i = 1; i < result_dv.length (); i++) | |
| 1358 result_dv(i) = m_dv(i-1); | |
| 4764 | 1359 |
| 4762 | 1360 Cell c (result_dv); |
| 4764 | 1361 |
|
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1362 octave_idx_type n_elts = m.numel (); |
| 4764 | 1363 |
|
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1364 for (octave_idx_type j = 0; j < num_fields; j++) |
| 4762 | 1365 { |
|
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1366 octave_idx_type k = j; |
| 4764 | 1367 |
|
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1368 const Cell vals = m.contents (keys(j)); |
| 4764 | 1369 |
|
7760
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1370 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
|
1371 { |
|
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1372 c(k) = vals(i); |
|
f5268d7045d7
struct2cell: handle structure arrays properly
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
1373 k += num_fields; |
| 4762 | 1374 } |
| 1375 } | |
| 1376 | |
| 1377 retval = c; | |
| 1378 } | |
| 1379 else | |
| 1380 error ("struct2cell: expecting argument to be a cell array"); | |
| 1381 } | |
| 1382 else | |
| 5823 | 1383 print_usage (); |
| 4764 | 1384 |
| 4762 | 1385 return retval; |
| 1386 } | |
| 1387 | |
| 5900 | 1388 mxArray * |
| 1389 octave_cell::as_mxArray (void) const | |
| 1390 { | |
| 1391 mxArray *retval = new mxArray (dims ()); | |
| 1392 | |
| 1393 mxArray **elts = static_cast<mxArray **> (retval->get_data ()); | |
| 1394 | |
| 6686 | 1395 mwSize nel = numel (); |
| 5900 | 1396 |
| 1397 const octave_value *p = matrix.data (); | |
| 1398 | |
| 6686 | 1399 for (mwIndex i = 0; i < nel; i++) |
| 5900 | 1400 elts[i] = new mxArray (p[i]); |
| 1401 | |
| 1402 return retval; | |
| 1403 } | |
| 1404 | |
| 3353 | 1405 /* |
| 1406 ;;; Local Variables: *** | |
| 1407 ;;; mode: C++ *** | |
| 1408 ;;; End: *** | |
| 1409 */ |