Mercurial > octave-nkf
annotate src/Cell.cc @ 9813:8fa32b527d9a
improve & partially revert previous change
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Fri, 13 Nov 2009 11:45:39 +0100 |
| parents | f80c566bc751 |
| children | 64a06079cae4 |
| rev | line source |
|---|---|
| 3353 | 1 /* |
| 2 | |
| 8920 | 3 Copyright (C) 1999, 2002, 2003, 2004, 2005, 2006, 2007, 2008, |
| 4 2009 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 | |
| 4513 | 28 #include "idx-vector.h" |
| 29 | |
| 3353 | 30 #include "Cell.h" |
| 4919 | 31 #include "error.h" |
| 5602 | 32 #include "gripes.h" |
|
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8290
diff
changeset
|
33 #include "oct-obj.h" |
|
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8290
diff
changeset
|
34 |
|
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8290
diff
changeset
|
35 Cell::Cell (const octave_value_list& ovl) |
|
9732
b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9415
diff
changeset
|
36 : Array<octave_value> (ovl.cell_value ()) |
|
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8290
diff
changeset
|
37 { |
|
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8290
diff
changeset
|
38 } |
| 3353 | 39 |
| 5805 | 40 Cell::Cell (const string_vector& sv, bool trim) |
|
9732
b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9415
diff
changeset
|
41 : Array<octave_value> () |
| 4216 | 42 { |
| 5275 | 43 octave_idx_type n = sv.length (); |
| 4216 | 44 |
| 45 if (n > 0) | |
| 46 { | |
| 4625 | 47 resize (dim_vector (n, 1)); |
| 4216 | 48 |
| 5275 | 49 for (octave_idx_type i = 0; i < n; i++) |
| 5805 | 50 { |
| 51 std::string s = sv[i]; | |
| 52 | |
| 53 if (trim) | |
| 54 { | |
| 5814 | 55 size_t pos = s.find_last_not_of (' '); |
| 5805 | 56 |
| 8021 | 57 s = (pos == std::string::npos) ? "" : s.substr (0, pos+1); |
| 5805 | 58 } |
| 59 | |
| 60 elem(i,0) = s; | |
| 61 } | |
| 4216 | 62 } |
| 63 } | |
| 3354 | 64 |
| 8732 | 65 Cell::Cell (const Array<std::string>& sa) |
|
9732
b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9415
diff
changeset
|
66 : Array<octave_value> (sa.dims ()) |
| 8732 | 67 { |
| 68 octave_idx_type n = sa.numel (); | |
| 69 | |
| 70 octave_value *dst = fortran_vec (); | |
| 71 const std::string *src = sa.data (); | |
| 72 | |
| 73 for (octave_idx_type i = 0; i < n; i++) | |
| 74 dst[i] = src[i]; | |
| 75 } | |
| 76 | |
| 6116 | 77 // Set size to DV, filling with []. Then fill with as many elements of |
| 78 // SV as possible. | |
| 7209 | 79 |
| 6116 | 80 Cell::Cell (const dim_vector& dv, const string_vector& sv, bool trim) |
|
9732
b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9415
diff
changeset
|
81 : Array<octave_value> (dv, resize_fill_value ()) |
| 6116 | 82 { |
| 83 octave_idx_type n = sv.length (); | |
| 84 | |
| 85 if (n > 0) | |
| 86 { | |
| 87 octave_idx_type m = numel (); | |
| 88 | |
| 89 octave_idx_type len = n > m ? m : n; | |
| 90 | |
| 91 for (octave_idx_type i = 0; i < len; i++) | |
| 92 { | |
| 93 std::string s = sv[i]; | |
| 94 | |
| 95 if (trim) | |
| 96 { | |
| 97 size_t pos = s.find_last_not_of (' '); | |
| 98 | |
| 8021 | 99 s = (pos == std::string::npos) ? "" : s.substr (0, pos+1); |
| 6116 | 100 } |
| 101 | |
| 102 elem(i) = s; | |
| 103 } | |
| 104 } | |
| 105 } | |
| 106 | |
| 107 bool | |
| 108 Cell::is_cellstr (void) const | |
| 109 { | |
| 110 bool retval = true; | |
| 111 | |
| 112 for (int i = 0; i < numel (); i++) | |
| 113 { | |
| 114 if (! elem(i).is_string ()) | |
| 115 { | |
| 116 retval = false; | |
| 117 break; | |
| 118 } | |
| 119 } | |
| 120 | |
| 121 return retval; | |
| 122 } | |
| 123 | |
| 4513 | 124 Cell |
| 4587 | 125 Cell::index (const octave_value_list& idx_arg, bool resize_ok) const |
| 4513 | 126 { |
| 127 Cell retval; | |
| 128 | |
| 5275 | 129 octave_idx_type n = idx_arg.length (); |
| 4513 | 130 |
| 131 switch (n) | |
| 132 { | |
| 5539 | 133 case 0: |
| 134 retval = *this; | |
| 135 break; | |
| 136 | |
| 4513 | 137 case 1: |
| 138 { | |
| 4587 | 139 idx_vector i = idx_arg(0).index_vector (); |
| 4513 | 140 |
| 4919 | 141 if (! error_state) |
|
9732
b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9415
diff
changeset
|
142 retval = Array<octave_value>::index (i, resize_ok, resize_fill_value ()); |
| 4513 | 143 } |
| 144 break; | |
| 145 | |
| 146 case 2: | |
| 147 { | |
| 4587 | 148 idx_vector i = idx_arg(0).index_vector (); |
| 4513 | 149 |
| 4919 | 150 if (! error_state) |
| 151 { | |
| 152 idx_vector j = idx_arg(1).index_vector (); | |
| 153 | |
| 154 if (! error_state) | |
|
9732
b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9415
diff
changeset
|
155 retval = Array<octave_value>::index (i, j, resize_ok, |
|
9415
f16079069972
use proper empty value in Cell::index
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
156 resize_fill_value ()); |
| 4919 | 157 } |
| 4513 | 158 } |
| 159 break; | |
| 160 | |
| 161 default: | |
| 162 { | |
| 163 Array<idx_vector> iv (n); | |
| 164 | |
| 5275 | 165 for (octave_idx_type i = 0; i < n; i++) |
| 4919 | 166 { |
| 167 iv(i) = idx_arg(i).index_vector (); | |
| 4513 | 168 |
| 4919 | 169 if (error_state) |
| 170 break; | |
| 171 } | |
| 172 | |
| 173 if (!error_state) | |
|
9732
b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9415
diff
changeset
|
174 retval = Array<octave_value>::index (iv, resize_ok, |
|
9415
f16079069972
use proper empty value in Cell::index
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
175 resize_fill_value ()); |
| 4513 | 176 } |
| 177 break; | |
| 178 } | |
| 179 | |
| 180 return retval; | |
| 181 } | |
| 182 | |
| 183 Cell& | |
| 4587 | 184 Cell::assign (const octave_value_list& idx_arg, const Cell& rhs, |
| 4513 | 185 const octave_value& fill_val) |
| 186 | |
| 187 { | |
|
8290
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8179
diff
changeset
|
188 octave_idx_type len = idx_arg.length (); |
|
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8179
diff
changeset
|
189 |
|
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8179
diff
changeset
|
190 Array<idx_vector> ra_idx (len); |
| 4513 | 191 |
|
8290
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8179
diff
changeset
|
192 for (octave_idx_type i = 0; i < len; i++) |
|
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8179
diff
changeset
|
193 ra_idx(i) = idx_arg(i).index_vector (); |
|
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8179
diff
changeset
|
194 |
|
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8179
diff
changeset
|
195 Array<octave_value>::assign (ra_idx, rhs, fill_val); |
| 4513 | 196 |
| 197 return *this; | |
| 198 } | |
| 199 | |
|
8175
977d5204cf67
fix null assignment for structs
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
200 Cell& |
|
977d5204cf67
fix null assignment for structs
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
201 Cell::delete_elements (const octave_value_list& idx_arg) |
|
977d5204cf67
fix null assignment for structs
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
202 |
|
977d5204cf67
fix null assignment for structs
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
203 { |
|
8290
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8179
diff
changeset
|
204 octave_idx_type len = idx_arg.length (); |
|
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8179
diff
changeset
|
205 |
|
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8179
diff
changeset
|
206 Array<idx_vector> ra_idx (len); |
|
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8179
diff
changeset
|
207 |
|
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8179
diff
changeset
|
208 for (octave_idx_type i = 0; i < len; i++) |
|
8175
977d5204cf67
fix null assignment for structs
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
209 ra_idx.xelem (i) = idx_arg(i).index_vector (); |
|
977d5204cf67
fix null assignment for structs
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
210 |
|
8290
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8179
diff
changeset
|
211 Array<octave_value>::delete_elements (ra_idx); |
|
8175
977d5204cf67
fix null assignment for structs
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
212 |
|
977d5204cf67
fix null assignment for structs
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
213 return *this; |
|
977d5204cf67
fix null assignment for structs
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
214 } |
|
977d5204cf67
fix null assignment for structs
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
215 |
| 5602 | 216 octave_idx_type |
| 217 Cell::nnz (void) const | |
| 218 { | |
| 219 gripe_wrong_type_arg ("nnz", "cell array"); | |
| 220 return -1; | |
| 221 } | |
| 222 | |
| 4915 | 223 Cell |
| 5570 | 224 Cell::column (octave_idx_type i) const |
| 225 { | |
| 226 Cell retval; | |
| 227 | |
| 228 if (ndims () < 3) | |
| 229 { | |
| 230 if (i < 0 || i >= cols ()) | |
| 231 error ("invalid column selection"); | |
| 232 else | |
| 233 { | |
| 234 octave_idx_type nr = rows (); | |
| 235 | |
| 236 retval.resize (dim_vector (nr, 1)); | |
| 237 | |
| 238 for (octave_idx_type j = 0; j < nr; j++) | |
| 239 retval.xelem (j) = elem (j, i); | |
| 240 } | |
| 241 } | |
| 242 else | |
| 243 error ("Cell::column: requires 2-d cell array"); | |
| 244 | |
| 245 return retval; | |
| 246 } | |
| 247 | |
| 248 Cell | |
| 5275 | 249 Cell::concat (const Cell& rb, const Array<octave_idx_type>& ra_idx) |
| 4806 | 250 { |
| 5073 | 251 return insert (rb, ra_idx); |
| 4915 | 252 } |
| 253 | |
| 254 Cell& | |
| 5275 | 255 Cell::insert (const Cell& a, octave_idx_type r, octave_idx_type c) |
| 4915 | 256 { |
| 257 Array<octave_value>::insert (a, r, c); | |
| 258 return *this; | |
| 259 } | |
| 260 | |
| 261 Cell& | |
| 5275 | 262 Cell::insert (const Cell& a, const Array<octave_idx_type>& ra_idx) |
| 4915 | 263 { |
| 264 Array<octave_value>::insert (a, ra_idx); | |
| 265 return *this; | |
| 4806 | 266 } |
| 267 | |
|
7530
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7209
diff
changeset
|
268 Cell |
|
9813
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
269 Cell::map (ctype_mapper fcn) const |
|
7530
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7209
diff
changeset
|
270 { |
|
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7209
diff
changeset
|
271 Cell retval (dims ()); |
|
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7209
diff
changeset
|
272 octave_value *r = retval.fortran_vec (); |
|
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7209
diff
changeset
|
273 |
|
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7209
diff
changeset
|
274 const octave_value *p = data (); |
|
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7209
diff
changeset
|
275 |
|
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7209
diff
changeset
|
276 for (octave_idx_type i = 0; i < numel (); i++) |
|
9813
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
277 r[i] = ((p++)->*fcn) (); |
|
7530
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7209
diff
changeset
|
278 |
|
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7209
diff
changeset
|
279 return retval; |
|
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7209
diff
changeset
|
280 } |
|
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7209
diff
changeset
|
281 |
|
7618
3209a584e1ac
Further type preservation tests and fix of diag for cell arrays
David Bateman <dbateman@free.fr>
parents:
7530
diff
changeset
|
282 Cell |
|
3209a584e1ac
Further type preservation tests and fix of diag for cell arrays
David Bateman <dbateman@free.fr>
parents:
7530
diff
changeset
|
283 Cell::diag (octave_idx_type k) const |
|
3209a584e1ac
Further type preservation tests and fix of diag for cell arrays
David Bateman <dbateman@free.fr>
parents:
7530
diff
changeset
|
284 { |
|
9732
b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9415
diff
changeset
|
285 return Array<octave_value>::diag (k); |
|
7618
3209a584e1ac
Further type preservation tests and fix of diag for cell arrays
David Bateman <dbateman@free.fr>
parents:
7530
diff
changeset
|
286 } |
|
3209a584e1ac
Further type preservation tests and fix of diag for cell arrays
David Bateman <dbateman@free.fr>
parents:
7530
diff
changeset
|
287 |
| 3353 | 288 /* |
| 289 ;;; Local Variables: *** | |
| 290 ;;; mode: C++ *** | |
| 291 ;;; End: *** | |
| 292 */ |