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