Mercurial > octave-nkf
annotate src/Cell.cc @ 8710:739141cde75a ss-3-1-52
fix typo in Array-f.cc
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Mon, 09 Feb 2009 21:51:31 +0100 |
| parents | 280fae940bb0 |
| children | a669df7beb73 |
| rev | line source |
|---|---|
| 3353 | 1 /* |
| 2 | |
| 7017 | 3 Copyright (C) 1999, 2002, 2003, 2004, 2005, 2006, 2007 John W. Eaton |
| 3353 | 4 |
| 5 This file is part of Octave. | |
| 6 | |
| 7 Octave is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
| 10 option) any later version. | |
| 3353 | 11 |
| 12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 7016 | 18 along with Octave; see the file COPYING. If not, see |
| 19 <http://www.gnu.org/licenses/>. | |
| 3353 | 20 |
| 21 */ | |
| 22 | |
| 23 #ifdef HAVE_CONFIG_H | |
| 24 #include <config.h> | |
| 25 #endif | |
| 26 | |
| 4513 | 27 #include "idx-vector.h" |
| 28 | |
| 3353 | 29 #include "Cell.h" |
| 4919 | 30 #include "error.h" |
| 5602 | 31 #include "gripes.h" |
|
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8290
diff
changeset
|
32 #include "oct-obj.h" |
|
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8290
diff
changeset
|
33 |
|
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8290
diff
changeset
|
34 Cell::Cell (const octave_value_list& ovl) |
|
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8290
diff
changeset
|
35 : ArrayN<octave_value> (ovl.cell_value ()) |
|
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8290
diff
changeset
|
36 { |
|
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8290
diff
changeset
|
37 } |
| 3353 | 38 |
| 5805 | 39 Cell::Cell (const string_vector& sv, bool trim) |
| 4513 | 40 : ArrayN<octave_value> () |
| 4216 | 41 { |
| 5275 | 42 octave_idx_type n = sv.length (); |
| 4216 | 43 |
| 44 if (n > 0) | |
| 45 { | |
| 4625 | 46 resize (dim_vector (n, 1)); |
| 4216 | 47 |
| 5275 | 48 for (octave_idx_type i = 0; i < n; i++) |
| 5805 | 49 { |
| 50 std::string s = sv[i]; | |
| 51 | |
| 52 if (trim) | |
| 53 { | |
| 5814 | 54 size_t pos = s.find_last_not_of (' '); |
| 5805 | 55 |
| 8021 | 56 s = (pos == std::string::npos) ? "" : s.substr (0, pos+1); |
| 5805 | 57 } |
| 58 | |
| 59 elem(i,0) = s; | |
| 60 } | |
| 4216 | 61 } |
| 62 } | |
| 3354 | 63 |
| 6116 | 64 // Set size to DV, filling with []. Then fill with as many elements of |
| 65 // SV as possible. | |
| 7209 | 66 |
| 6116 | 67 Cell::Cell (const dim_vector& dv, const string_vector& sv, bool trim) |
| 7209 | 68 : ArrayN<octave_value> (dv, resize_fill_value ()) |
| 6116 | 69 { |
| 70 octave_idx_type n = sv.length (); | |
| 71 | |
| 72 if (n > 0) | |
| 73 { | |
| 74 octave_idx_type m = numel (); | |
| 75 | |
| 76 octave_idx_type len = n > m ? m : n; | |
| 77 | |
| 78 for (octave_idx_type i = 0; i < len; i++) | |
| 79 { | |
| 80 std::string s = sv[i]; | |
| 81 | |
| 82 if (trim) | |
| 83 { | |
| 84 size_t pos = s.find_last_not_of (' '); | |
| 85 | |
| 8021 | 86 s = (pos == std::string::npos) ? "" : s.substr (0, pos+1); |
| 6116 | 87 } |
| 88 | |
| 89 elem(i) = s; | |
| 90 } | |
| 91 } | |
| 92 } | |
| 93 | |
| 94 bool | |
| 95 Cell::is_cellstr (void) const | |
| 96 { | |
| 97 bool retval = true; | |
| 98 | |
| 99 for (int i = 0; i < numel (); i++) | |
| 100 { | |
| 101 if (! elem(i).is_string ()) | |
| 102 { | |
| 103 retval = false; | |
| 104 break; | |
| 105 } | |
| 106 } | |
| 107 | |
| 108 return retval; | |
| 109 } | |
| 110 | |
| 4513 | 111 Cell |
| 4587 | 112 Cell::index (const octave_value_list& idx_arg, bool resize_ok) const |
| 4513 | 113 { |
| 114 Cell retval; | |
| 115 | |
| 5275 | 116 octave_idx_type n = idx_arg.length (); |
| 4513 | 117 |
| 118 switch (n) | |
| 119 { | |
| 5539 | 120 case 0: |
| 121 retval = *this; | |
| 122 break; | |
| 123 | |
| 4513 | 124 case 1: |
| 125 { | |
| 4587 | 126 idx_vector i = idx_arg(0).index_vector (); |
| 4513 | 127 |
| 4919 | 128 if (! error_state) |
|
8679
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
129 retval = ArrayN<octave_value>::index (i, resize_ok); |
| 4513 | 130 } |
| 131 break; | |
| 132 | |
| 133 case 2: | |
| 134 { | |
| 4587 | 135 idx_vector i = idx_arg(0).index_vector (); |
| 4513 | 136 |
| 4919 | 137 if (! error_state) |
| 138 { | |
| 139 idx_vector j = idx_arg(1).index_vector (); | |
| 140 | |
| 141 if (! error_state) | |
|
8679
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
142 retval = ArrayN<octave_value>::index (i, j, resize_ok); |
| 4919 | 143 } |
| 4513 | 144 } |
| 145 break; | |
| 146 | |
| 147 default: | |
| 148 { | |
| 149 Array<idx_vector> iv (n); | |
| 150 | |
| 5275 | 151 for (octave_idx_type i = 0; i < n; i++) |
| 4919 | 152 { |
| 153 iv(i) = idx_arg(i).index_vector (); | |
| 4513 | 154 |
| 4919 | 155 if (error_state) |
| 156 break; | |
| 157 } | |
| 158 | |
| 159 if (!error_state) | |
|
8679
280fae940bb0
optimize scalar indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
160 retval = ArrayN<octave_value>::index (iv, resize_ok); |
| 4513 | 161 } |
| 162 break; | |
| 163 } | |
| 164 | |
| 165 return retval; | |
| 166 } | |
| 167 | |
| 168 Cell& | |
| 4587 | 169 Cell::assign (const octave_value_list& idx_arg, const Cell& rhs, |
| 4513 | 170 const octave_value& fill_val) |
| 171 | |
| 172 { | |
|
8290
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8179
diff
changeset
|
173 octave_idx_type len = idx_arg.length (); |
|
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8179
diff
changeset
|
174 |
|
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8179
diff
changeset
|
175 Array<idx_vector> ra_idx (len); |
| 4513 | 176 |
|
8290
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8179
diff
changeset
|
177 for (octave_idx_type i = 0; i < len; i++) |
|
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8179
diff
changeset
|
178 ra_idx(i) = idx_arg(i).index_vector (); |
|
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8179
diff
changeset
|
179 |
|
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8179
diff
changeset
|
180 Array<octave_value>::assign (ra_idx, rhs, fill_val); |
| 4513 | 181 |
| 182 return *this; | |
| 183 } | |
| 184 | |
|
8175
977d5204cf67
fix null assignment for structs
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
185 Cell& |
|
977d5204cf67
fix null assignment for structs
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
186 Cell::delete_elements (const octave_value_list& idx_arg) |
|
977d5204cf67
fix null assignment for structs
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
187 |
|
977d5204cf67
fix null assignment for structs
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
188 { |
|
8290
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8179
diff
changeset
|
189 octave_idx_type len = idx_arg.length (); |
|
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8179
diff
changeset
|
190 |
|
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8179
diff
changeset
|
191 Array<idx_vector> ra_idx (len); |
|
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8179
diff
changeset
|
192 |
|
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8179
diff
changeset
|
193 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
|
194 ra_idx.xelem (i) = idx_arg(i).index_vector (); |
|
977d5204cf67
fix null assignment for structs
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
195 |
|
8290
7cbe01c21986
improve dense array indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8179
diff
changeset
|
196 Array<octave_value>::delete_elements (ra_idx); |
|
8175
977d5204cf67
fix null assignment for structs
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
197 |
|
977d5204cf67
fix null assignment for structs
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
198 return *this; |
|
977d5204cf67
fix null assignment for structs
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
199 } |
|
977d5204cf67
fix null assignment for structs
Jaroslav Hajek <highegg@gmail.com>
parents:
8021
diff
changeset
|
200 |
| 5602 | 201 octave_idx_type |
| 202 Cell::nnz (void) const | |
| 203 { | |
| 204 gripe_wrong_type_arg ("nnz", "cell array"); | |
| 205 return -1; | |
| 206 } | |
| 207 | |
| 4915 | 208 Cell |
| 5570 | 209 Cell::column (octave_idx_type i) const |
| 210 { | |
| 211 Cell retval; | |
| 212 | |
| 213 if (ndims () < 3) | |
| 214 { | |
| 215 if (i < 0 || i >= cols ()) | |
| 216 error ("invalid column selection"); | |
| 217 else | |
| 218 { | |
| 219 octave_idx_type nr = rows (); | |
| 220 | |
| 221 retval.resize (dim_vector (nr, 1)); | |
| 222 | |
| 223 for (octave_idx_type j = 0; j < nr; j++) | |
| 224 retval.xelem (j) = elem (j, i); | |
| 225 } | |
| 226 } | |
| 227 else | |
| 228 error ("Cell::column: requires 2-d cell array"); | |
| 229 | |
| 230 return retval; | |
| 231 } | |
| 232 | |
| 233 Cell | |
| 5275 | 234 Cell::concat (const Cell& rb, const Array<octave_idx_type>& ra_idx) |
| 4806 | 235 { |
| 5073 | 236 return insert (rb, ra_idx); |
| 4915 | 237 } |
| 238 | |
| 239 Cell& | |
| 5275 | 240 Cell::insert (const Cell& a, octave_idx_type r, octave_idx_type c) |
| 4915 | 241 { |
| 242 Array<octave_value>::insert (a, r, c); | |
| 243 return *this; | |
| 244 } | |
| 245 | |
| 246 Cell& | |
| 5275 | 247 Cell::insert (const Cell& a, const Array<octave_idx_type>& ra_idx) |
| 4915 | 248 { |
| 249 Array<octave_value>::insert (a, ra_idx); | |
| 250 return *this; | |
| 4806 | 251 } |
| 252 | |
|
7530
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7209
diff
changeset
|
253 Cell |
|
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7209
diff
changeset
|
254 Cell::map (ctype_mapper fcn) const |
|
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7209
diff
changeset
|
255 { |
|
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7209
diff
changeset
|
256 Cell retval (dims ()); |
|
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7209
diff
changeset
|
257 octave_value *r = retval.fortran_vec (); |
|
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7209
diff
changeset
|
258 |
|
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7209
diff
changeset
|
259 const octave_value *p = data (); |
|
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7209
diff
changeset
|
260 |
|
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7209
diff
changeset
|
261 for (octave_idx_type i = 0; i < numel (); i++) |
|
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7209
diff
changeset
|
262 r[i] = ((p++)->*fcn) (); |
|
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7209
diff
changeset
|
263 |
|
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7209
diff
changeset
|
264 return retval; |
|
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7209
diff
changeset
|
265 } |
|
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7209
diff
changeset
|
266 |
|
7618
3209a584e1ac
Further type preservation tests and fix of diag for cell arrays
David Bateman <dbateman@free.fr>
parents:
7530
diff
changeset
|
267 Cell |
|
3209a584e1ac
Further type preservation tests and fix of diag for cell arrays
David Bateman <dbateman@free.fr>
parents:
7530
diff
changeset
|
268 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
|
269 { |
|
7620
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7618
diff
changeset
|
270 return ArrayN<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
|
271 } |
|
3209a584e1ac
Further type preservation tests and fix of diag for cell arrays
David Bateman <dbateman@free.fr>
parents:
7530
diff
changeset
|
272 |
| 3353 | 273 /* |
| 274 ;;; Local Variables: *** | |
| 275 ;;; mode: C++ *** | |
| 276 ;;; End: *** | |
| 277 */ |