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