Mercurial > octave
annotate liboctave/Array.cc @ 8028:f0fbf47c914c
avoid null pointer call in Array<T>::hermitian
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Sat, 09 Aug 2008 23:33:03 +0200 |
| parents | 762801c50b21 |
| children | acfd80c08d60 |
| rev | line source |
|---|---|
| 1993 | 1 // Template array classes |
| 237 | 2 /* |
| 3 | |
| 7017 | 4 Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2002, 2003, 2004, |
| 5 2005, 2006, 2007 John W. Eaton | |
| 237 | 6 |
| 7 This file is part of Octave. | |
| 8 | |
| 9 Octave is free software; you can redistribute it and/or modify it | |
| 10 under the terms of the GNU General Public License as published by the | |
| 7016 | 11 Free Software Foundation; either version 3 of the License, or (at your |
| 12 option) any later version. | |
| 237 | 13 |
| 14 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 17 for more details. | |
| 18 | |
| 19 You should have received a copy of the GNU General Public License | |
| 7016 | 20 along with Octave; see the file COPYING. If not, see |
| 21 <http://www.gnu.org/licenses/>. | |
| 237 | 22 |
| 23 */ | |
| 24 | |
| 25 #ifdef HAVE_CONFIG_H | |
| 1192 | 26 #include <config.h> |
| 237 | 27 #endif |
| 28 | |
| 1367 | 29 #include <cassert> |
| 4518 | 30 #include <climits> |
| 449 | 31 |
| 3503 | 32 #include <iostream> |
| 5765 | 33 #include <sstream> |
| 5607 | 34 #include <vector> |
| 6674 | 35 #include <new> |
| 1560 | 36 |
| 237 | 37 #include "Array.h" |
| 4588 | 38 #include "Array-util.h" |
| 1560 | 39 #include "idx-vector.h" |
| 40 #include "lo-error.h" | |
| 41 | |
| 1360 | 42 // One dimensional array class. Handles the reference counting for |
| 43 // all the derived classes. | |
| 237 | 44 |
| 45 template <class T> | |
| 4834 | 46 Array<T>::Array (const Array<T>& a, const dim_vector& dv) |
| 47 : rep (a.rep), dimensions (dv), idx (0), idx_count (0) | |
| 48 { | |
| 49 rep->count++; | |
| 50 | |
| 51 if (a.numel () < dv.numel ()) | |
| 52 (*current_liboctave_error_handler) | |
| 53 ("Array::Array (const Array&, const dim_vector&): dimension mismatch"); | |
| 54 } | |
| 55 | |
| 56 template <class T> | |
| 1619 | 57 Array<T>::~Array (void) |
| 58 { | |
| 59 if (--rep->count <= 0) | |
| 60 delete rep; | |
| 61 | |
| 62 delete [] idx; | |
| 4513 | 63 } |
| 64 | |
| 4532 | 65 template <class T> |
|
7717
ff918ee1a983
Delete idx in Sparse<T> and Array<T> operator =
David Bateman <dbateman@free.fr>
parents:
7646
diff
changeset
|
66 Array<T>& |
|
ff918ee1a983
Delete idx in Sparse<T> and Array<T> operator =
David Bateman <dbateman@free.fr>
parents:
7646
diff
changeset
|
67 Array<T>::operator = (const Array<T>& a) |
|
ff918ee1a983
Delete idx in Sparse<T> and Array<T> operator =
David Bateman <dbateman@free.fr>
parents:
7646
diff
changeset
|
68 { |
|
ff918ee1a983
Delete idx in Sparse<T> and Array<T> operator =
David Bateman <dbateman@free.fr>
parents:
7646
diff
changeset
|
69 if (this != &a) |
|
ff918ee1a983
Delete idx in Sparse<T> and Array<T> operator =
David Bateman <dbateman@free.fr>
parents:
7646
diff
changeset
|
70 { |
|
ff918ee1a983
Delete idx in Sparse<T> and Array<T> operator =
David Bateman <dbateman@free.fr>
parents:
7646
diff
changeset
|
71 if (--rep->count <= 0) |
|
ff918ee1a983
Delete idx in Sparse<T> and Array<T> operator =
David Bateman <dbateman@free.fr>
parents:
7646
diff
changeset
|
72 delete rep; |
|
ff918ee1a983
Delete idx in Sparse<T> and Array<T> operator =
David Bateman <dbateman@free.fr>
parents:
7646
diff
changeset
|
73 |
|
ff918ee1a983
Delete idx in Sparse<T> and Array<T> operator =
David Bateman <dbateman@free.fr>
parents:
7646
diff
changeset
|
74 rep = a.rep; |
|
ff918ee1a983
Delete idx in Sparse<T> and Array<T> operator =
David Bateman <dbateman@free.fr>
parents:
7646
diff
changeset
|
75 rep->count++; |
|
ff918ee1a983
Delete idx in Sparse<T> and Array<T> operator =
David Bateman <dbateman@free.fr>
parents:
7646
diff
changeset
|
76 |
|
ff918ee1a983
Delete idx in Sparse<T> and Array<T> operator =
David Bateman <dbateman@free.fr>
parents:
7646
diff
changeset
|
77 dimensions = a.dimensions; |
|
ff918ee1a983
Delete idx in Sparse<T> and Array<T> operator =
David Bateman <dbateman@free.fr>
parents:
7646
diff
changeset
|
78 |
|
ff918ee1a983
Delete idx in Sparse<T> and Array<T> operator =
David Bateman <dbateman@free.fr>
parents:
7646
diff
changeset
|
79 delete [] idx; |
|
ff918ee1a983
Delete idx in Sparse<T> and Array<T> operator =
David Bateman <dbateman@free.fr>
parents:
7646
diff
changeset
|
80 idx_count = 0; |
|
ff918ee1a983
Delete idx in Sparse<T> and Array<T> operator =
David Bateman <dbateman@free.fr>
parents:
7646
diff
changeset
|
81 idx = 0; |
|
ff918ee1a983
Delete idx in Sparse<T> and Array<T> operator =
David Bateman <dbateman@free.fr>
parents:
7646
diff
changeset
|
82 } |
|
ff918ee1a983
Delete idx in Sparse<T> and Array<T> operator =
David Bateman <dbateman@free.fr>
parents:
7646
diff
changeset
|
83 |
|
ff918ee1a983
Delete idx in Sparse<T> and Array<T> operator =
David Bateman <dbateman@free.fr>
parents:
7646
diff
changeset
|
84 return *this; |
|
ff918ee1a983
Delete idx in Sparse<T> and Array<T> operator =
David Bateman <dbateman@free.fr>
parents:
7646
diff
changeset
|
85 } |
|
ff918ee1a983
Delete idx in Sparse<T> and Array<T> operator =
David Bateman <dbateman@free.fr>
parents:
7646
diff
changeset
|
86 |
|
ff918ee1a983
Delete idx in Sparse<T> and Array<T> operator =
David Bateman <dbateman@free.fr>
parents:
7646
diff
changeset
|
87 template <class T> |
| 4532 | 88 Array<T> |
| 89 Array<T>::squeeze (void) const | |
| 90 { | |
| 91 Array<T> retval = *this; | |
| 92 | |
| 4929 | 93 if (ndims () > 2) |
| 4532 | 94 { |
| 4929 | 95 bool dims_changed = false; |
| 96 | |
| 97 dim_vector new_dimensions = dimensions; | |
| 98 | |
| 99 int k = 0; | |
| 100 | |
| 101 for (int i = 0; i < ndims (); i++) | |
| 4759 | 102 { |
| 4929 | 103 if (dimensions(i) == 1) |
| 104 dims_changed = true; | |
| 105 else | |
| 106 new_dimensions(k++) = dimensions(i); | |
| 107 } | |
| 108 | |
| 109 if (dims_changed) | |
| 110 { | |
| 111 switch (k) | |
| 112 { | |
| 113 case 0: | |
| 114 new_dimensions = dim_vector (1, 1); | |
| 115 break; | |
| 116 | |
| 117 case 1: | |
| 4759 | 118 { |
| 5275 | 119 octave_idx_type tmp = new_dimensions(0); |
| 4929 | 120 |
| 121 new_dimensions.resize (2); | |
| 122 | |
| 4759 | 123 new_dimensions(0) = tmp; |
| 124 new_dimensions(1) = 1; | |
| 125 } | |
| 4929 | 126 break; |
| 127 | |
| 128 default: | |
| 129 new_dimensions.resize (k); | |
| 130 break; | |
| 131 } | |
| 4759 | 132 } |
| 4532 | 133 |
| 5775 | 134 // FIXME -- it would be better if we did not have to do |
| 5047 | 135 // this, so we could share the data while still having different |
| 136 // dimension vectors. | |
| 137 | |
| 4532 | 138 retval.make_unique (); |
| 139 | |
| 140 retval.dimensions = new_dimensions; | |
| 141 } | |
| 142 | |
| 143 return retval; | |
| 144 } | |
| 145 | |
| 6674 | 146 // KLUGE |
| 147 | |
| 148 // The following get_size functions will throw a std::bad_alloc () | |
| 149 // exception if the requested size is larger than can be indexed by | |
| 150 // octave_idx_type. This may be smaller than the actual amount of | |
| 151 // memory that can be safely allocated on a system. However, if we | |
| 152 // don't fail here, we can end up with a mysterious crash inside a | |
| 153 // function that is iterating over an array using octave_idx_type | |
| 154 // indices. | |
| 155 | |
| 4513 | 156 // A guess (should be quite conservative). |
| 157 #define MALLOC_OVERHEAD 1024 | |
| 158 | |
| 159 template <class T> | |
| 5275 | 160 octave_idx_type |
| 161 Array<T>::get_size (octave_idx_type r, octave_idx_type c) | |
| 4513 | 162 { |
| 163 static int nl; | |
| 164 static double dl | |
| 5275 | 165 = frexp (static_cast<double> |
| 166 (std::numeric_limits<octave_idx_type>::max() - MALLOC_OVERHEAD) / sizeof (T), &nl); | |
| 4513 | 167 |
| 168 int nr, nc; | |
| 5275 | 169 double dr = frexp (static_cast<double> (r), &nr); // r = dr * 2^nr |
| 170 double dc = frexp (static_cast<double> (c), &nc); // c = dc * 2^nc | |
| 4513 | 171 |
| 172 int nt = nr + nc; | |
| 173 double dt = dr * dc; | |
| 174 | |
| 4532 | 175 if (dt < 0.5) |
| 4513 | 176 { |
| 177 nt--; | |
| 178 dt *= 2; | |
| 179 } | |
| 180 | |
| 6674 | 181 if (nt < nl || (nt == nl && dt < dl)) |
| 182 return r * c; | |
| 183 else | |
| 184 { | |
| 185 throw std::bad_alloc (); | |
| 186 return 0; | |
| 187 } | |
| 237 | 188 } |
| 189 | |
| 190 template <class T> | |
| 5275 | 191 octave_idx_type |
| 192 Array<T>::get_size (octave_idx_type r, octave_idx_type c, octave_idx_type p) | |
| 237 | 193 { |
| 4513 | 194 static int nl; |
| 195 static double dl | |
| 196 = frexp (static_cast<double> | |
| 5275 | 197 (std::numeric_limits<octave_idx_type>::max() - MALLOC_OVERHEAD) / sizeof (T), &nl); |
| 4513 | 198 |
| 199 int nr, nc, np; | |
| 200 double dr = frexp (static_cast<double> (r), &nr); | |
| 201 double dc = frexp (static_cast<double> (c), &nc); | |
| 202 double dp = frexp (static_cast<double> (p), &np); | |
| 203 | |
| 204 int nt = nr + nc + np; | |
| 205 double dt = dr * dc * dp; | |
| 206 | |
| 4532 | 207 if (dt < 0.5) |
| 659 | 208 { |
| 4513 | 209 nt--; |
| 210 dt *= 2; | |
| 237 | 211 |
| 4532 | 212 if (dt < 0.5) |
| 213 { | |
| 214 nt--; | |
| 215 dt *= 2; | |
| 216 } | |
| 659 | 217 } |
| 1619 | 218 |
| 6674 | 219 if (nt < nl || (nt == nl && dt < dl)) |
| 220 return r * c * p; | |
| 221 else | |
| 222 { | |
| 223 throw std::bad_alloc (); | |
| 224 return 0; | |
| 225 } | |
| 237 | 226 } |
| 227 | |
| 228 template <class T> | |
| 5275 | 229 octave_idx_type |
| 4513 | 230 Array<T>::get_size (const dim_vector& ra_idx) |
| 237 | 231 { |
| 4513 | 232 static int nl; |
| 233 static double dl | |
| 234 = frexp (static_cast<double> | |
| 5275 | 235 (std::numeric_limits<octave_idx_type>::max() - MALLOC_OVERHEAD) / sizeof (T), &nl); |
| 4513 | 236 |
| 237 int n = ra_idx.length (); | |
| 238 | |
| 239 int nt = 0; | |
| 240 double dt = 1; | |
| 241 | |
| 242 for (int i = 0; i < n; i++) | |
| 237 | 243 { |
| 4513 | 244 int nra_idx; |
| 245 double dra_idx = frexp (static_cast<double> (ra_idx(i)), &nra_idx); | |
| 246 | |
| 247 nt += nra_idx; | |
| 248 dt *= dra_idx; | |
| 4532 | 249 |
| 250 if (dt < 0.5) | |
| 251 { | |
| 252 nt--; | |
| 253 dt *= 2; | |
| 254 } | |
| 237 | 255 } |
| 256 | |
| 4513 | 257 if (nt < nl || (nt == nl && dt < dl)) |
| 258 { | |
| 6674 | 259 octave_idx_type retval = 1; |
| 4513 | 260 |
| 261 for (int i = 0; i < n; i++) | |
| 262 retval *= ra_idx(i); | |
| 6674 | 263 |
| 264 return retval; | |
| 4513 | 265 } |
| 6674 | 266 else |
| 267 { | |
| 268 throw std::bad_alloc (); | |
| 269 return 0; | |
| 270 } | |
| 237 | 271 } |
| 272 | |
| 4513 | 273 #undef MALLOC_OVERHEAD |
| 274 | |
| 237 | 275 template <class T> |
| 5275 | 276 octave_idx_type |
| 277 Array<T>::compute_index (const Array<octave_idx_type>& ra_idx) const | |
| 237 | 278 { |
| 5275 | 279 octave_idx_type retval = -1; |
| 4513 | 280 |
| 281 int n = dimensions.length (); | |
| 282 | |
| 283 if (n > 0 && n == ra_idx.length ()) | |
| 237 | 284 { |
| 4513 | 285 retval = ra_idx(--n); |
| 237 | 286 |
| 4513 | 287 while (--n >= 0) |
| 288 { | |
| 289 retval *= dimensions(n); | |
| 290 retval += ra_idx(n); | |
| 291 } | |
| 292 } | |
| 293 else | |
| 294 (*current_liboctave_error_handler) | |
| 295 ("Array<T>::compute_index: invalid ra_idxing operation"); | |
| 237 | 296 |
| 4513 | 297 return retval; |
| 237 | 298 } |
| 299 | |
| 2049 | 300 template <class T> |
| 301 T | |
| 5275 | 302 Array<T>::range_error (const char *fcn, octave_idx_type n) const |
| 2049 | 303 { |
| 2109 | 304 (*current_liboctave_error_handler) ("%s (%d): range error", fcn, n); |
| 2049 | 305 return T (); |
| 306 } | |
| 307 | |
| 308 template <class T> | |
| 309 T& | |
| 5275 | 310 Array<T>::range_error (const char *fcn, octave_idx_type n) |
| 2049 | 311 { |
| 2109 | 312 (*current_liboctave_error_handler) ("%s (%d): range error", fcn, n); |
| 2049 | 313 static T foo; |
| 314 return foo; | |
| 315 } | |
| 316 | |
| 3933 | 317 template <class T> |
| 4513 | 318 T |
| 5275 | 319 Array<T>::range_error (const char *fcn, octave_idx_type i, octave_idx_type j) const |
| 4513 | 320 { |
| 321 (*current_liboctave_error_handler) | |
| 322 ("%s (%d, %d): range error", fcn, i, j); | |
| 323 return T (); | |
| 324 } | |
| 325 | |
| 326 template <class T> | |
| 327 T& | |
| 5275 | 328 Array<T>::range_error (const char *fcn, octave_idx_type i, octave_idx_type j) |
| 4513 | 329 { |
| 330 (*current_liboctave_error_handler) | |
| 331 ("%s (%d, %d): range error", fcn, i, j); | |
| 332 static T foo; | |
| 333 return foo; | |
| 334 } | |
| 335 | |
| 336 template <class T> | |
| 337 T | |
| 5275 | 338 Array<T>::range_error (const char *fcn, octave_idx_type i, octave_idx_type j, octave_idx_type k) const |
| 4513 | 339 { |
| 340 (*current_liboctave_error_handler) | |
| 341 ("%s (%d, %d, %d): range error", fcn, i, j, k); | |
| 342 return T (); | |
| 343 } | |
| 344 | |
| 345 template <class T> | |
| 346 T& | |
| 5275 | 347 Array<T>::range_error (const char *fcn, octave_idx_type i, octave_idx_type j, octave_idx_type k) |
| 4513 | 348 { |
| 349 (*current_liboctave_error_handler) | |
| 350 ("%s (%d, %d, %d): range error", fcn, i, j, k); | |
| 351 static T foo; | |
| 352 return foo; | |
| 353 } | |
| 354 | |
| 355 template <class T> | |
| 356 T | |
| 6867 | 357 Array<T>::range_error (const char *fcn, const Array<octave_idx_type>& ra_idx) const |
| 4513 | 358 { |
| 5765 | 359 std::ostringstream buf; |
| 4661 | 360 |
| 361 buf << fcn << " ("; | |
| 362 | |
| 5275 | 363 octave_idx_type n = ra_idx.length (); |
| 4661 | 364 |
| 365 if (n > 0) | |
| 366 buf << ra_idx(0); | |
| 367 | |
| 5275 | 368 for (octave_idx_type i = 1; i < n; i++) |
| 4661 | 369 buf << ", " << ra_idx(i); |
| 370 | |
| 371 buf << "): range error"; | |
| 372 | |
| 5765 | 373 std::string buf_str = buf.str (); |
| 374 | |
| 375 (*current_liboctave_error_handler) (buf_str.c_str ()); | |
| 4513 | 376 |
| 377 return T (); | |
| 378 } | |
| 379 | |
| 380 template <class T> | |
| 381 T& | |
| 6867 | 382 Array<T>::range_error (const char *fcn, const Array<octave_idx_type>& ra_idx) |
| 4513 | 383 { |
| 5765 | 384 std::ostringstream buf; |
| 4661 | 385 |
| 386 buf << fcn << " ("; | |
| 387 | |
| 5275 | 388 octave_idx_type n = ra_idx.length (); |
| 4661 | 389 |
| 390 if (n > 0) | |
| 391 buf << ra_idx(0); | |
| 392 | |
| 5275 | 393 for (octave_idx_type i = 1; i < n; i++) |
| 4661 | 394 buf << ", " << ra_idx(i); |
| 395 | |
| 396 buf << "): range error"; | |
| 397 | |
| 5765 | 398 std::string buf_str = buf.str (); |
| 399 | |
| 400 (*current_liboctave_error_handler) (buf_str.c_str ()); | |
| 4513 | 401 |
| 402 static T foo; | |
| 403 return foo; | |
| 404 } | |
| 405 | |
| 406 template <class T> | |
| 4567 | 407 Array<T> |
| 408 Array<T>::reshape (const dim_vector& new_dims) const | |
| 409 { | |
| 410 Array<T> retval; | |
| 411 | |
| 412 if (dimensions != new_dims) | |
| 413 { | |
| 414 if (dimensions.numel () == new_dims.numel ()) | |
| 415 retval = Array<T> (*this, new_dims); | |
| 416 else | |
| 417 (*current_liboctave_error_handler) ("reshape: size mismatch"); | |
| 418 } | |
| 4916 | 419 else |
| 420 retval = *this; | |
| 4567 | 421 |
| 422 return retval; | |
| 423 } | |
| 424 | |
| 7241 | 425 |
| 5607 | 426 |
| 4567 | 427 template <class T> |
| 4593 | 428 Array<T> |
| 5607 | 429 Array<T>::permute (const Array<octave_idx_type>& perm_vec_arg, bool inv) const |
| 4593 | 430 { |
| 431 Array<T> retval; | |
| 432 | |
| 5607 | 433 Array<octave_idx_type> perm_vec = perm_vec_arg; |
| 434 | |
| 4593 | 435 dim_vector dv = dims (); |
| 436 dim_vector dv_new; | |
| 437 | |
| 5148 | 438 int perm_vec_len = perm_vec.length (); |
| 439 | |
| 440 if (perm_vec_len < dv.length ()) | |
| 441 (*current_liboctave_error_handler) | |
| 442 ("%s: invalid permutation vector", inv ? "ipermute" : "permute"); | |
| 443 | |
| 444 dv_new.resize (perm_vec_len); | |
| 445 | |
| 446 // Append singleton dimensions as needed. | |
| 447 dv.resize (perm_vec_len, 1); | |
| 448 | |
| 4593 | 449 // Need this array to check for identical elements in permutation array. |
| 5148 | 450 Array<bool> checked (perm_vec_len, false); |
| 4593 | 451 |
| 452 // Find dimension vector of permuted array. | |
| 5148 | 453 for (int i = 0; i < perm_vec_len; i++) |
| 4593 | 454 { |
| 5275 | 455 octave_idx_type perm_elt = perm_vec.elem (i); |
| 5148 | 456 |
| 457 if (perm_elt >= perm_vec_len || perm_elt < 0) | |
| 4593 | 458 { |
| 459 (*current_liboctave_error_handler) | |
| 5148 | 460 ("%s: permutation vector contains an invalid element", |
| 461 inv ? "ipermute" : "permute"); | |
| 4593 | 462 |
| 463 return retval; | |
| 464 } | |
| 465 | |
| 5148 | 466 if (checked.elem(perm_elt)) |
| 4593 | 467 { |
| 468 (*current_liboctave_error_handler) | |
| 5148 | 469 ("%s: permutation vector cannot contain identical elements", |
| 470 inv ? "ipermute" : "permute"); | |
| 4593 | 471 |
| 472 return retval; | |
| 473 } | |
| 474 else | |
| 5148 | 475 checked.elem(perm_elt) = true; |
| 476 | |
| 477 dv_new(i) = dv(perm_elt); | |
| 4593 | 478 } |
| 479 | |
| 5607 | 480 int nd = dv.length (); |
| 481 | |
| 5775 | 482 // FIXME -- it would be nice to have a sort method in the |
| 5607 | 483 // Array class that also returns the sort indices. |
| 484 | |
| 485 if (inv) | |
| 486 { | |
| 487 OCTAVE_LOCAL_BUFFER (permute_vector, pvec, nd); | |
| 488 | |
| 489 for (int i = 0; i < nd; i++) | |
| 490 { | |
| 491 pvec[i].pidx = perm_vec(i); | |
| 492 pvec[i].iidx = i; | |
| 493 } | |
| 494 | |
| 495 octave_qsort (pvec, static_cast<size_t> (nd), | |
| 496 sizeof (permute_vector), permute_vector_compare); | |
| 497 | |
| 498 for (int i = 0; i < nd; i++) | |
| 499 { | |
| 500 perm_vec(i) = pvec[i].iidx; | |
| 501 dv_new(i) = dv(perm_vec(i)); | |
| 502 } | |
| 503 } | |
| 504 | |
| 4593 | 505 retval.resize (dv_new); |
| 506 | |
| 5940 | 507 if (numel () > 0) |
| 5607 | 508 { |
| 5940 | 509 Array<octave_idx_type> cp (nd+1, 1); |
| 510 for (octave_idx_type i = 1; i < nd+1; i++) | |
| 511 cp(i) = cp(i-1) * dv(i-1); | |
| 512 | |
| 513 octave_idx_type incr = cp(perm_vec(0)); | |
| 514 | |
| 515 Array<octave_idx_type> base_delta (nd-1, 0); | |
| 516 Array<octave_idx_type> base_delta_max (nd-1); | |
| 517 Array<octave_idx_type> base_incr (nd-1); | |
| 518 for (octave_idx_type i = 0; i < nd-1; i++) | |
| 5607 | 519 { |
| 5940 | 520 base_delta_max(i) = dv_new(i+1); |
| 521 base_incr(i) = cp(perm_vec(i+1)); | |
| 5607 | 522 } |
| 523 | |
| 5940 | 524 octave_idx_type nr_new = dv_new(0); |
| 525 octave_idx_type nel_new = dv_new.numel (); | |
| 526 octave_idx_type n = nel_new / nr_new; | |
| 527 | |
| 528 octave_idx_type k = 0; | |
| 529 | |
| 530 for (octave_idx_type i = 0; i < n; i++) | |
| 5607 | 531 { |
| 5940 | 532 octave_idx_type iidx = 0; |
| 533 for (octave_idx_type kk = 0; kk < nd-1; kk++) | |
| 534 iidx += base_delta(kk) * base_incr(kk); | |
| 535 | |
| 536 for (octave_idx_type j = 0; j < nr_new; j++) | |
| 5607 | 537 { |
| 5940 | 538 OCTAVE_QUIT; |
| 539 | |
| 540 retval(k++) = elem(iidx); | |
| 541 iidx += incr; | |
| 542 } | |
| 543 | |
| 544 base_delta(0)++; | |
| 545 | |
| 546 for (octave_idx_type kk = 0; kk < nd-2; kk++) | |
| 547 { | |
| 548 if (base_delta(kk) == base_delta_max(kk)) | |
| 549 { | |
| 550 base_delta(kk) = 0; | |
| 551 base_delta(kk+1)++; | |
| 552 } | |
| 5607 | 553 } |
| 554 } | |
| 4593 | 555 } |
| 556 | |
| 5340 | 557 retval.chop_trailing_singletons (); |
| 5338 | 558 |
| 4593 | 559 return retval; |
| 560 } | |
| 561 | |
| 562 template <class T> | |
| 4513 | 563 void |
| 5275 | 564 Array<T>::resize_no_fill (octave_idx_type n) |
| 4513 | 565 { |
| 566 if (n < 0) | |
| 567 { | |
| 568 (*current_liboctave_error_handler) | |
| 569 ("can't resize to negative dimension"); | |
| 570 return; | |
| 571 } | |
| 572 | |
| 573 if (n == length ()) | |
| 574 return; | |
| 575 | |
| 576 typename Array<T>::ArrayRep *old_rep = rep; | |
| 577 const T *old_data = data (); | |
| 5275 | 578 octave_idx_type old_len = length (); |
| 4513 | 579 |
| 580 rep = new typename Array<T>::ArrayRep (n); | |
| 581 | |
| 582 dimensions = dim_vector (n); | |
| 583 | |
| 4747 | 584 if (n > 0 && old_data && old_len > 0) |
| 4513 | 585 { |
| 5275 | 586 octave_idx_type min_len = old_len < n ? old_len : n; |
| 587 | |
| 588 for (octave_idx_type i = 0; i < min_len; i++) | |
| 4513 | 589 xelem (i) = old_data[i]; |
| 590 } | |
| 591 | |
| 592 if (--old_rep->count <= 0) | |
| 593 delete old_rep; | |
| 594 } | |
| 595 | |
| 596 template <class T> | |
| 597 void | |
| 4587 | 598 Array<T>::resize_no_fill (const dim_vector& dv) |
| 4513 | 599 { |
| 5275 | 600 octave_idx_type n = dv.length (); |
| 601 | |
| 602 for (octave_idx_type i = 0; i < n; i++) | |
| 4513 | 603 { |
| 4587 | 604 if (dv(i) < 0) |
| 4513 | 605 { |
| 606 (*current_liboctave_error_handler) | |
| 607 ("can't resize to negative dimension"); | |
| 608 return; | |
| 609 } | |
| 610 } | |
| 611 | |
| 4548 | 612 bool same_size = true; |
| 613 | |
| 614 if (dimensions.length () != n) | |
| 615 { | |
| 616 same_size = false; | |
| 617 } | |
| 618 else | |
| 4513 | 619 { |
| 5275 | 620 for (octave_idx_type i = 0; i < n; i++) |
| 4513 | 621 { |
| 4587 | 622 if (dv(i) != dimensions(i)) |
| 4548 | 623 { |
| 624 same_size = false; | |
| 625 break; | |
| 626 } | |
| 4513 | 627 } |
| 628 } | |
| 629 | |
| 4548 | 630 if (same_size) |
| 4513 | 631 return; |
| 632 | |
| 633 typename Array<T>::ArrayRep *old_rep = rep; | |
| 634 const T *old_data = data (); | |
| 635 | |
| 5275 | 636 octave_idx_type ts = get_size (dv); |
| 4747 | 637 |
| 638 rep = new typename Array<T>::ArrayRep (ts); | |
| 4587 | 639 |
| 4870 | 640 dim_vector dv_old = dimensions; |
| 5275 | 641 octave_idx_type dv_old_orig_len = dv_old.length (); |
| 4587 | 642 dimensions = dv; |
| 5275 | 643 octave_idx_type ts_old = get_size (dv_old); |
| 4915 | 644 |
| 645 if (ts > 0 && ts_old > 0 && dv_old_orig_len > 0) | |
| 4513 | 646 { |
| 5275 | 647 Array<octave_idx_type> ra_idx (dimensions.length (), 0); |
| 4747 | 648 |
| 4870 | 649 if (n > dv_old_orig_len) |
| 4747 | 650 { |
| 4870 | 651 dv_old.resize (n); |
| 652 | |
| 5275 | 653 for (octave_idx_type i = dv_old_orig_len; i < n; i++) |
| 4870 | 654 dv_old.elem (i) = 1; |
| 655 } | |
| 656 | |
| 5275 | 657 for (octave_idx_type i = 0; i < ts; i++) |
| 4870 | 658 { |
| 659 if (index_in_bounds (ra_idx, dv_old)) | |
| 660 rep->elem (i) = old_data[get_scalar_idx (ra_idx, dv_old)]; | |
| 4747 | 661 |
| 662 increment_index (ra_idx, dimensions); | |
| 663 } | |
| 4513 | 664 } |
| 665 | |
| 666 if (--old_rep->count <= 0) | |
| 667 delete old_rep; | |
| 668 } | |
| 669 | |
| 670 template <class T> | |
| 671 void | |
| 5275 | 672 Array<T>::resize_no_fill (octave_idx_type r, octave_idx_type c) |
| 4513 | 673 { |
| 674 if (r < 0 || c < 0) | |
| 675 { | |
| 676 (*current_liboctave_error_handler) | |
| 677 ("can't resize to negative dimension"); | |
| 678 return; | |
| 679 } | |
| 680 | |
| 4548 | 681 int n = ndims (); |
| 682 | |
| 683 if (n == 0) | |
| 684 dimensions = dim_vector (0, 0); | |
| 685 | |
| 686 assert (ndims () == 2); | |
| 687 | |
| 4513 | 688 if (r == dim1 () && c == dim2 ()) |
| 689 return; | |
| 690 | |
| 691 typename Array<T>::ArrayRep *old_rep = Array<T>::rep; | |
| 692 const T *old_data = data (); | |
| 693 | |
| 5275 | 694 octave_idx_type old_d1 = dim1 (); |
| 695 octave_idx_type old_d2 = dim2 (); | |
| 696 octave_idx_type old_len = length (); | |
| 697 | |
| 698 octave_idx_type ts = get_size (r, c); | |
| 4747 | 699 |
| 700 rep = new typename Array<T>::ArrayRep (ts); | |
| 4513 | 701 |
| 702 dimensions = dim_vector (r, c); | |
| 703 | |
| 4747 | 704 if (ts > 0 && old_data && old_len > 0) |
| 4513 | 705 { |
| 5275 | 706 octave_idx_type min_r = old_d1 < r ? old_d1 : r; |
| 707 octave_idx_type min_c = old_d2 < c ? old_d2 : c; | |
| 708 | |
| 709 for (octave_idx_type j = 0; j < min_c; j++) | |
| 710 for (octave_idx_type i = 0; i < min_r; i++) | |
| 4513 | 711 xelem (i, j) = old_data[old_d1*j+i]; |
| 712 } | |
| 713 | |
| 714 if (--old_rep->count <= 0) | |
| 715 delete old_rep; | |
| 716 } | |
| 717 | |
| 718 template <class T> | |
| 719 void | |
| 5275 | 720 Array<T>::resize_no_fill (octave_idx_type r, octave_idx_type c, octave_idx_type p) |
| 4513 | 721 { |
| 722 if (r < 0 || c < 0 || p < 0) | |
| 723 { | |
| 724 (*current_liboctave_error_handler) | |
| 725 ("can't resize to negative dimension"); | |
| 726 return; | |
| 727 } | |
| 728 | |
| 4548 | 729 int n = ndims (); |
| 730 | |
| 731 if (n == 0) | |
| 732 dimensions = dim_vector (0, 0, 0); | |
| 733 | |
| 734 assert (ndims () == 3); | |
| 735 | |
| 4513 | 736 if (r == dim1 () && c == dim2 () && p == dim3 ()) |
| 737 return; | |
| 738 | |
| 739 typename Array<T>::ArrayRep *old_rep = rep; | |
| 740 const T *old_data = data (); | |
| 741 | |
| 5275 | 742 octave_idx_type old_d1 = dim1 (); |
| 743 octave_idx_type old_d2 = dim2 (); | |
| 744 octave_idx_type old_d3 = dim3 (); | |
| 745 octave_idx_type old_len = length (); | |
| 746 | |
| 747 octave_idx_type ts = get_size (get_size (r, c), p); | |
| 4513 | 748 |
| 749 rep = new typename Array<T>::ArrayRep (ts); | |
| 750 | |
| 751 dimensions = dim_vector (r, c, p); | |
| 752 | |
| 4747 | 753 if (ts > 0 && old_data && old_len > 0) |
| 4513 | 754 { |
| 5275 | 755 octave_idx_type min_r = old_d1 < r ? old_d1 : r; |
| 756 octave_idx_type min_c = old_d2 < c ? old_d2 : c; | |
| 757 octave_idx_type min_p = old_d3 < p ? old_d3 : p; | |
| 758 | |
| 759 for (octave_idx_type k = 0; k < min_p; k++) | |
| 760 for (octave_idx_type j = 0; j < min_c; j++) | |
| 761 for (octave_idx_type i = 0; i < min_r; i++) | |
| 4513 | 762 xelem (i, j, k) = old_data[old_d1*(old_d2*k+j)+i]; |
| 763 } | |
| 764 | |
| 765 if (--old_rep->count <= 0) | |
| 766 delete old_rep; | |
| 767 } | |
| 768 | |
| 769 template <class T> | |
| 770 void | |
| 5275 | 771 Array<T>::resize_and_fill (octave_idx_type n, const T& val) |
| 4513 | 772 { |
| 773 if (n < 0) | |
| 774 { | |
| 775 (*current_liboctave_error_handler) | |
| 776 ("can't resize to negative dimension"); | |
| 777 return; | |
| 778 } | |
| 779 | |
| 780 if (n == length ()) | |
| 781 return; | |
| 782 | |
| 783 typename Array<T>::ArrayRep *old_rep = rep; | |
| 784 const T *old_data = data (); | |
| 5275 | 785 octave_idx_type old_len = length (); |
| 4513 | 786 |
| 787 rep = new typename Array<T>::ArrayRep (n); | |
| 788 | |
| 789 dimensions = dim_vector (n); | |
| 790 | |
| 4747 | 791 if (n > 0) |
| 4513 | 792 { |
| 5275 | 793 octave_idx_type min_len = old_len < n ? old_len : n; |
| 4747 | 794 |
| 795 if (old_data && old_len > 0) | |
| 796 { | |
| 5275 | 797 for (octave_idx_type i = 0; i < min_len; i++) |
| 4747 | 798 xelem (i) = old_data[i]; |
| 799 } | |
| 800 | |
| 5275 | 801 for (octave_idx_type i = old_len; i < n; i++) |
| 4747 | 802 xelem (i) = val; |
| 4513 | 803 } |
| 804 | |
| 805 if (--old_rep->count <= 0) | |
| 806 delete old_rep; | |
| 807 } | |
| 808 | |
| 809 template <class T> | |
| 810 void | |
| 5275 | 811 Array<T>::resize_and_fill (octave_idx_type r, octave_idx_type c, const T& val) |
| 4513 | 812 { |
| 813 if (r < 0 || c < 0) | |
| 814 { | |
| 815 (*current_liboctave_error_handler) | |
| 816 ("can't resize to negative dimension"); | |
| 817 return; | |
| 818 } | |
| 819 | |
| 4548 | 820 if (ndims () == 0) |
| 821 dimensions = dim_vector (0, 0); | |
| 822 | |
| 823 assert (ndims () == 2); | |
| 824 | |
| 4513 | 825 if (r == dim1 () && c == dim2 ()) |
| 826 return; | |
| 827 | |
| 828 typename Array<T>::ArrayRep *old_rep = Array<T>::rep; | |
| 829 const T *old_data = data (); | |
| 830 | |
| 5275 | 831 octave_idx_type old_d1 = dim1 (); |
| 832 octave_idx_type old_d2 = dim2 (); | |
| 833 octave_idx_type old_len = length (); | |
| 834 | |
| 835 octave_idx_type ts = get_size (r, c); | |
| 4747 | 836 |
| 837 rep = new typename Array<T>::ArrayRep (ts); | |
| 4513 | 838 |
| 839 dimensions = dim_vector (r, c); | |
| 840 | |
| 4747 | 841 if (ts > 0) |
| 4513 | 842 { |
| 5275 | 843 octave_idx_type min_r = old_d1 < r ? old_d1 : r; |
| 844 octave_idx_type min_c = old_d2 < c ? old_d2 : c; | |
| 4747 | 845 |
| 846 if (old_data && old_len > 0) | |
| 847 { | |
| 5275 | 848 for (octave_idx_type j = 0; j < min_c; j++) |
| 849 for (octave_idx_type i = 0; i < min_r; i++) | |
| 4747 | 850 xelem (i, j) = old_data[old_d1*j+i]; |
| 851 } | |
| 852 | |
| 5275 | 853 for (octave_idx_type j = 0; j < min_c; j++) |
| 854 for (octave_idx_type i = min_r; i < r; i++) | |
| 4747 | 855 xelem (i, j) = val; |
| 856 | |
| 5275 | 857 for (octave_idx_type j = min_c; j < c; j++) |
| 858 for (octave_idx_type i = 0; i < r; i++) | |
| 4747 | 859 xelem (i, j) = val; |
| 4513 | 860 } |
| 861 | |
| 862 if (--old_rep->count <= 0) | |
| 863 delete old_rep; | |
| 864 } | |
| 865 | |
| 866 template <class T> | |
| 867 void | |
| 5275 | 868 Array<T>::resize_and_fill (octave_idx_type r, octave_idx_type c, octave_idx_type p, const T& val) |
| 4513 | 869 { |
| 870 if (r < 0 || c < 0 || p < 0) | |
| 871 { | |
| 872 (*current_liboctave_error_handler) | |
| 873 ("can't resize to negative dimension"); | |
| 874 return; | |
| 875 } | |
| 876 | |
| 4548 | 877 if (ndims () == 0) |
| 878 dimensions = dim_vector (0, 0, 0); | |
| 879 | |
| 880 assert (ndims () == 3); | |
| 881 | |
| 4513 | 882 if (r == dim1 () && c == dim2 () && p == dim3 ()) |
| 883 return; | |
| 884 | |
| 885 typename Array<T>::ArrayRep *old_rep = rep; | |
| 886 const T *old_data = data (); | |
| 887 | |
| 5275 | 888 octave_idx_type old_d1 = dim1 (); |
| 889 octave_idx_type old_d2 = dim2 (); | |
| 890 octave_idx_type old_d3 = dim3 (); | |
| 891 | |
| 892 octave_idx_type old_len = length (); | |
| 893 | |
| 894 octave_idx_type ts = get_size (get_size (r, c), p); | |
| 4513 | 895 |
| 896 rep = new typename Array<T>::ArrayRep (ts); | |
| 897 | |
| 898 dimensions = dim_vector (r, c, p); | |
| 899 | |
| 4747 | 900 if (ts > 0) |
| 901 { | |
| 5275 | 902 octave_idx_type min_r = old_d1 < r ? old_d1 : r; |
| 903 octave_idx_type min_c = old_d2 < c ? old_d2 : c; | |
| 904 octave_idx_type min_p = old_d3 < p ? old_d3 : p; | |
| 4747 | 905 |
| 906 if (old_data && old_len > 0) | |
| 5275 | 907 for (octave_idx_type k = 0; k < min_p; k++) |
| 908 for (octave_idx_type j = 0; j < min_c; j++) | |
| 909 for (octave_idx_type i = 0; i < min_r; i++) | |
| 4747 | 910 xelem (i, j, k) = old_data[old_d1*(old_d2*k+j)+i]; |
| 911 | |
| 5775 | 912 // FIXME -- if the copy constructor is expensive, this |
| 4747 | 913 // may win. Otherwise, it may make more sense to just copy the |
| 914 // value everywhere when making the new ArrayRep. | |
| 915 | |
| 5275 | 916 for (octave_idx_type k = 0; k < min_p; k++) |
| 917 for (octave_idx_type j = min_c; j < c; j++) | |
| 918 for (octave_idx_type i = 0; i < min_r; i++) | |
| 4747 | 919 xelem (i, j, k) = val; |
| 920 | |
| 5275 | 921 for (octave_idx_type k = 0; k < min_p; k++) |
| 922 for (octave_idx_type j = 0; j < c; j++) | |
| 923 for (octave_idx_type i = min_r; i < r; i++) | |
| 4747 | 924 xelem (i, j, k) = val; |
| 925 | |
| 5275 | 926 for (octave_idx_type k = min_p; k < p; k++) |
| 927 for (octave_idx_type j = 0; j < c; j++) | |
| 928 for (octave_idx_type i = 0; i < r; i++) | |
| 4747 | 929 xelem (i, j, k) = val; |
| 930 } | |
| 4513 | 931 |
| 932 if (--old_rep->count <= 0) | |
| 933 delete old_rep; | |
| 934 } | |
| 935 | |
| 936 template <class T> | |
| 937 void | |
| 4587 | 938 Array<T>::resize_and_fill (const dim_vector& dv, const T& val) |
| 4513 | 939 { |
| 5275 | 940 octave_idx_type n = dv.length (); |
| 941 | |
| 942 for (octave_idx_type i = 0; i < n; i++) | |
| 4513 | 943 { |
| 4587 | 944 if (dv(i) < 0) |
| 4513 | 945 { |
| 946 (*current_liboctave_error_handler) | |
| 947 ("can't resize to negative dimension"); | |
| 948 return; | |
| 949 } | |
| 950 } | |
| 951 | |
| 4553 | 952 bool same_size = true; |
| 953 | |
| 954 if (dimensions.length () != n) | |
| 955 { | |
| 956 same_size = false; | |
| 957 } | |
| 958 else | |
| 4513 | 959 { |
| 5275 | 960 for (octave_idx_type i = 0; i < n; i++) |
| 4513 | 961 { |
| 4587 | 962 if (dv(i) != dimensions(i)) |
| 4553 | 963 { |
| 964 same_size = false; | |
| 965 break; | |
| 966 } | |
| 4513 | 967 } |
| 968 } | |
| 969 | |
| 4553 | 970 if (same_size) |
| 4513 | 971 return; |
| 972 | |
| 973 typename Array<T>::ArrayRep *old_rep = rep; | |
| 974 const T *old_data = data (); | |
| 975 | |
| 5275 | 976 octave_idx_type len = get_size (dv); |
| 4709 | 977 |
| 4513 | 978 rep = new typename Array<T>::ArrayRep (len); |
| 979 | |
| 4707 | 980 dim_vector dv_old = dimensions; |
| 5275 | 981 octave_idx_type dv_old_orig_len = dv_old.length (); |
| 4587 | 982 dimensions = dv; |
| 4513 | 983 |
| 4870 | 984 if (len > 0 && dv_old_orig_len > 0) |
| 4513 | 985 { |
| 5275 | 986 Array<octave_idx_type> ra_idx (dimensions.length (), 0); |
| 4870 | 987 |
| 988 if (n > dv_old_orig_len) | |
| 989 { | |
| 990 dv_old.resize (n); | |
| 991 | |
| 5275 | 992 for (octave_idx_type i = dv_old_orig_len; i < n; i++) |
| 4870 | 993 dv_old.elem (i) = 1; |
| 994 } | |
| 4747 | 995 |
| 5275 | 996 for (octave_idx_type i = 0; i < len; i++) |
| 4747 | 997 { |
| 998 if (index_in_bounds (ra_idx, dv_old)) | |
| 4870 | 999 rep->elem (i) = old_data[get_scalar_idx (ra_idx, dv_old)]; |
| 1000 else | |
| 1001 rep->elem (i) = val; | |
| 1002 | |
| 1003 increment_index (ra_idx, dimensions); | |
| 4747 | 1004 } |
| 4513 | 1005 } |
| 4870 | 1006 else |
| 5275 | 1007 for (octave_idx_type i = 0; i < len; i++) |
| 4870 | 1008 rep->elem (i) = val; |
| 4513 | 1009 |
| 1010 if (--old_rep->count <= 0) | |
| 1011 delete old_rep; | |
| 1012 } | |
| 1013 | |
| 1014 template <class T> | |
| 1015 Array<T>& | |
| 5275 | 1016 Array<T>::insert (const Array<T>& a, octave_idx_type r, octave_idx_type c) |
| 4513 | 1017 { |
| 4786 | 1018 if (ndims () == 2 && a.ndims () == 2) |
| 1019 insert2 (a, r, c); | |
| 1020 else | |
| 1021 insertN (a, r, c); | |
| 1022 | |
| 1023 return *this; | |
| 1024 } | |
| 1025 | |
| 1026 | |
| 1027 template <class T> | |
| 1028 Array<T>& | |
| 5275 | 1029 Array<T>::insert2 (const Array<T>& a, octave_idx_type r, octave_idx_type c) |
| 4786 | 1030 { |
| 5275 | 1031 octave_idx_type a_rows = a.rows (); |
| 1032 octave_idx_type a_cols = a.cols (); | |
| 4786 | 1033 |
| 1034 if (r < 0 || r + a_rows > rows () || c < 0 || c + a_cols > cols ()) | |
| 1035 { | |
| 1036 (*current_liboctave_error_handler) ("range error for insert"); | |
| 1037 return *this; | |
| 1038 } | |
| 1039 | |
| 5275 | 1040 for (octave_idx_type j = 0; j < a_cols; j++) |
| 1041 for (octave_idx_type i = 0; i < a_rows; i++) | |
| 4786 | 1042 elem (r+i, c+j) = a.elem (i, j); |
| 1043 | |
| 1044 return *this; | |
| 1045 } | |
| 1046 | |
| 1047 template <class T> | |
| 1048 Array<T>& | |
| 5275 | 1049 Array<T>::insertN (const Array<T>& a, octave_idx_type r, octave_idx_type c) |
| 4786 | 1050 { |
| 4806 | 1051 dim_vector dv = dims (); |
| 1052 | |
| 4765 | 1053 dim_vector a_dv = a.dims (); |
| 1054 | |
| 1055 int n = a_dv.length (); | |
| 1056 | |
| 1057 if (n == dimensions.length ()) | |
| 4513 | 1058 { |
| 5275 | 1059 Array<octave_idx_type> a_ra_idx (a_dv.length (), 0); |
| 4765 | 1060 |
| 1061 a_ra_idx.elem (0) = r; | |
| 1062 a_ra_idx.elem (1) = c; | |
| 1063 | |
| 1064 for (int i = 0; i < n; i++) | |
| 1065 { | |
| 4806 | 1066 if (a_ra_idx(i) < 0 || (a_ra_idx(i) + a_dv(i)) > dv(i)) |
| 4765 | 1067 { |
| 1068 (*current_liboctave_error_handler) | |
| 1069 ("Array<T>::insert: range error for insert"); | |
| 1070 return *this; | |
| 1071 } | |
| 1072 } | |
| 1073 | |
| 5275 | 1074 octave_idx_type n_elt = a.numel (); |
| 4806 | 1075 |
| 1076 const T *a_data = a.data (); | |
| 1077 | |
| 5275 | 1078 octave_idx_type iidx = 0; |
| 4806 | 1079 |
| 5275 | 1080 octave_idx_type a_rows = a_dv(0); |
| 1081 | |
| 1082 octave_idx_type this_rows = dv(0); | |
| 4806 | 1083 |
| 5275 | 1084 octave_idx_type numel_page = a_dv(0) * a_dv(1); |
| 1085 | |
| 1086 octave_idx_type count_pages = 0; | |
| 4806 | 1087 |
| 5275 | 1088 for (octave_idx_type i = 0; i < n_elt; i++) |
| 4765 | 1089 { |
| 4806 | 1090 if (i != 0 && i % a_rows == 0) |
| 1091 iidx += (this_rows - a_rows); | |
| 1092 | |
| 1093 if (i % numel_page == 0) | |
| 1094 iidx = c * dv(0) + r + dv(0) * dv(1) * count_pages++; | |
| 1095 | |
| 1096 elem (iidx++) = a_data[i]; | |
| 4765 | 1097 } |
| 4513 | 1098 } |
| 4765 | 1099 else |
| 1100 (*current_liboctave_error_handler) | |
| 1101 ("Array<T>::insert: invalid indexing operation"); | |
| 4513 | 1102 |
| 1103 return *this; | |
| 1104 } | |
| 1105 | |
| 1106 template <class T> | |
| 1107 Array<T>& | |
| 5275 | 1108 Array<T>::insert (const Array<T>& a, const Array<octave_idx_type>& ra_idx) |
| 4513 | 1109 { |
| 5275 | 1110 octave_idx_type n = ra_idx.length (); |
| 4513 | 1111 |
| 1112 if (n == dimensions.length ()) | |
| 1113 { | |
| 4915 | 1114 dim_vector dva = a.dims (); |
| 1115 dim_vector dv = dims (); | |
| 1116 int len_a = dva.length (); | |
| 5120 | 1117 int non_full_dim = 0; |
| 4513 | 1118 |
| 5275 | 1119 for (octave_idx_type i = 0; i < n; i++) |
| 4513 | 1120 { |
| 4915 | 1121 if (ra_idx(i) < 0 || (ra_idx(i) + |
| 1122 (i < len_a ? dva(i) : 1)) > dimensions(i)) | |
| 4513 | 1123 { |
| 1124 (*current_liboctave_error_handler) | |
| 1125 ("Array<T>::insert: range error for insert"); | |
| 1126 return *this; | |
| 1127 } | |
| 5120 | 1128 |
| 1129 if (dv(i) != (i < len_a ? dva(i) : 1)) | |
| 1130 non_full_dim++; | |
| 4513 | 1131 } |
| 1132 | |
| 4915 | 1133 if (dva.numel ()) |
| 1134 { | |
| 5120 | 1135 if (non_full_dim < 2) |
| 4915 | 1136 { |
| 5120 | 1137 // Special case for fast concatenation |
| 1138 const T *a_data = a.data (); | |
| 5275 | 1139 octave_idx_type numel_to_move = 1; |
| 1140 octave_idx_type skip = 0; | |
| 5120 | 1141 for (int i = 0; i < len_a; i++) |
| 1142 if (ra_idx(i) == 0 && dva(i) == dv(i)) | |
| 1143 numel_to_move *= dva(i); | |
| 1144 else | |
| 1145 { | |
| 1146 skip = numel_to_move * (dv(i) - dva(i)); | |
| 1147 numel_to_move *= dva(i); | |
| 1148 break; | |
| 1149 } | |
| 1150 | |
| 5275 | 1151 octave_idx_type jidx = ra_idx(n-1); |
| 5120 | 1152 for (int i = n-2; i >= 0; i--) |
| 1153 { | |
| 1154 jidx *= dv(i); | |
| 1155 jidx += ra_idx(i); | |
| 1156 } | |
| 1157 | |
| 5275 | 1158 octave_idx_type iidx = 0; |
| 1159 octave_idx_type moves = dva.numel () / numel_to_move; | |
| 1160 for (octave_idx_type i = 0; i < moves; i++) | |
| 5120 | 1161 { |
| 5275 | 1162 for (octave_idx_type j = 0; j < numel_to_move; j++) |
| 5120 | 1163 elem (jidx++) = a_data[iidx++]; |
| 1164 jidx += skip; | |
| 1165 } | |
| 4915 | 1166 } |
| 5120 | 1167 else |
| 4915 | 1168 { |
| 5120 | 1169 // Generic code |
| 1170 const T *a_data = a.data (); | |
| 1171 int nel = a.numel (); | |
| 5275 | 1172 Array<octave_idx_type> a_idx (n, 0); |
| 5120 | 1173 |
| 1174 for (int i = 0; i < nel; i++) | |
| 1175 { | |
| 1176 int iidx = a_idx(n-1) + ra_idx(n-1); | |
| 1177 for (int j = n-2; j >= 0; j--) | |
| 1178 { | |
| 1179 iidx *= dv(j); | |
| 1180 iidx += a_idx(j) + ra_idx(j); | |
| 1181 } | |
| 1182 | |
| 1183 elem (iidx) = a_data[i]; | |
| 1184 | |
| 1185 increment_index (a_idx, dva); | |
| 1186 } | |
| 4915 | 1187 } |
| 1188 } | |
| 4513 | 1189 } |
| 1190 else | |
| 1191 (*current_liboctave_error_handler) | |
| 1192 ("Array<T>::insert: invalid indexing operation"); | |
| 1193 | |
| 1194 return *this; | |
| 1195 } | |
| 1196 | |
| 1197 template <class T> | |
| 1198 Array<T> | |
| 1199 Array<T>::transpose (void) const | |
| 1200 { | |
| 4548 | 1201 assert (ndims () == 2); |
| 1202 | |
| 5275 | 1203 octave_idx_type nr = dim1 (); |
| 1204 octave_idx_type nc = dim2 (); | |
| 4513 | 1205 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1206 if (nr >= 8 && nc >= 8) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1207 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1208 Array<T> result (dim_vector (nc, nr)); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1209 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1210 // Blocked transpose to attempt to avoid cache misses. |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1211 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1212 // Don't use OCTAVE_LOCAL_BUFFER here as it doesn't work with bool |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1213 // on some compilers. |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1214 T buf[64]; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1215 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1216 octave_idx_type ii = 0, jj; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1217 for (jj = 0; jj < (nc - 8 + 1); jj += 8) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1218 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1219 for (ii = 0; ii < (nr - 8 + 1); ii += 8) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1220 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1221 // Copy to buffer |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1222 for (octave_idx_type j = jj, k = 0, idxj = jj * nr; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1223 j < jj + 8; j++, idxj += nr) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1224 for (octave_idx_type i = ii; i < ii + 8; i++) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1225 buf[k++] = xelem (i + idxj); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1226 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1227 // Copy from buffer |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1228 for (octave_idx_type i = ii, idxi = ii * nc; i < ii + 8; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1229 i++, idxi += nc) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1230 for (octave_idx_type j = jj, k = i - ii; j < jj + 8; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1231 j++, k+=8) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1232 result.xelem (j + idxi) = buf[k]; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1233 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1234 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1235 if (ii < nr) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1236 for (octave_idx_type j = jj; j < jj + 8; j++) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1237 for (octave_idx_type i = ii; i < nr; i++) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1238 result.xelem (j, i) = xelem (i, j); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1239 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1240 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1241 for (octave_idx_type j = jj; j < nc; j++) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1242 for (octave_idx_type i = 0; i < nr; i++) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1243 result.xelem (j, i) = xelem (i, j); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1244 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1245 return result; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1246 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1247 else if (nr > 1 && nc > 1) |
| 4513 | 1248 { |
| 1249 Array<T> result (dim_vector (nc, nr)); | |
| 1250 | |
| 5275 | 1251 for (octave_idx_type j = 0; j < nc; j++) |
| 1252 for (octave_idx_type i = 0; i < nr; i++) | |
| 4513 | 1253 result.xelem (j, i) = xelem (i, j); |
| 1254 | |
| 1255 return result; | |
| 1256 } | |
| 1257 else | |
| 1258 { | |
| 1259 // Fast transpose for vectors and empty matrices | |
| 1260 return Array<T> (*this, dim_vector (nc, nr)); | |
| 1261 } | |
| 1262 } | |
| 1263 | |
| 1264 template <class T> | |
|
8028
f0fbf47c914c
avoid null pointer call in Array<T>::hermitian
Jaroslav Hajek <highegg@gmail.com>
parents:
7796
diff
changeset
|
1265 static T |
|
f0fbf47c914c
avoid null pointer call in Array<T>::hermitian
Jaroslav Hajek <highegg@gmail.com>
parents:
7796
diff
changeset
|
1266 no_op_fcn (const T& x) |
|
f0fbf47c914c
avoid null pointer call in Array<T>::hermitian
Jaroslav Hajek <highegg@gmail.com>
parents:
7796
diff
changeset
|
1267 { |
|
f0fbf47c914c
avoid null pointer call in Array<T>::hermitian
Jaroslav Hajek <highegg@gmail.com>
parents:
7796
diff
changeset
|
1268 return x; |
|
f0fbf47c914c
avoid null pointer call in Array<T>::hermitian
Jaroslav Hajek <highegg@gmail.com>
parents:
7796
diff
changeset
|
1269 } |
|
f0fbf47c914c
avoid null pointer call in Array<T>::hermitian
Jaroslav Hajek <highegg@gmail.com>
parents:
7796
diff
changeset
|
1270 |
|
f0fbf47c914c
avoid null pointer call in Array<T>::hermitian
Jaroslav Hajek <highegg@gmail.com>
parents:
7796
diff
changeset
|
1271 template <class T> |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1272 Array<T> |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1273 Array<T>::hermitian (T (*fcn) (const T&)) const |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1274 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1275 assert (ndims () == 2); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1276 |
|
8028
f0fbf47c914c
avoid null pointer call in Array<T>::hermitian
Jaroslav Hajek <highegg@gmail.com>
parents:
7796
diff
changeset
|
1277 if (! fcn) |
|
f0fbf47c914c
avoid null pointer call in Array<T>::hermitian
Jaroslav Hajek <highegg@gmail.com>
parents:
7796
diff
changeset
|
1278 fcn = no_op_fcn<T>; |
|
f0fbf47c914c
avoid null pointer call in Array<T>::hermitian
Jaroslav Hajek <highegg@gmail.com>
parents:
7796
diff
changeset
|
1279 |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1280 octave_idx_type nr = dim1 (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1281 octave_idx_type nc = dim2 (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1282 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1283 if (nr >= 8 && nc >= 8) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1284 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1285 Array<T> result (dim_vector (nc, nr)); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1286 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1287 // Blocked transpose to attempt to avoid cache misses. |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1288 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1289 // Don't use OCTAVE_LOCAL_BUFFER here as it doesn't work with bool |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1290 // on some compilers. |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1291 T buf[64]; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1292 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1293 octave_idx_type ii = 0, jj; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1294 for (jj = 0; jj < (nc - 8 + 1); jj += 8) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1295 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1296 for (ii = 0; ii < (nr - 8 + 1); ii += 8) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1297 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1298 // Copy to buffer |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1299 for (octave_idx_type j = jj, k = 0, idxj = jj * nr; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1300 j < jj + 8; j++, idxj += nr) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1301 for (octave_idx_type i = ii; i < ii + 8; i++) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1302 buf[k++] = xelem (i + idxj); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1303 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1304 // Copy from buffer |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1305 for (octave_idx_type i = ii, idxi = ii * nc; i < ii + 8; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1306 i++, idxi += nc) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1307 for (octave_idx_type j = jj, k = i - ii; j < jj + 8; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1308 j++, k+=8) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1309 result.xelem (j + idxi) = fcn (buf[k]); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1310 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1311 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1312 if (ii < nr) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1313 for (octave_idx_type j = jj; j < jj + 8; j++) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1314 for (octave_idx_type i = ii; i < nr; i++) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1315 result.xelem (j, i) = fcn (xelem (i, j)); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1316 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1317 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1318 for (octave_idx_type j = jj; j < nc; j++) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1319 for (octave_idx_type i = 0; i < nr; i++) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1320 result.xelem (j, i) = fcn (xelem (i, j)); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1321 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1322 return result; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1323 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1324 else |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1325 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1326 Array<T> result (dim_vector (nc, nr)); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1327 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1328 for (octave_idx_type j = 0; j < nc; j++) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1329 for (octave_idx_type i = 0; i < nr; i++) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1330 result.xelem (j, i) = fcn (xelem (i, j)); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1331 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1332 return result; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1333 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1334 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1335 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1336 /* |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1337 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1338 %% Tranpose tests for matrices of the tile size and plus or minus a row |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1339 %% and with four tiles. |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1340 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1341 %!shared m7, mt7, m8, mt8, m9, mt9 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1342 %! m7 = reshape (1 : 7*8, 8, 7); |
|
7796
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1343 %! mt7 = [1:8; 9:16; 17:24; 25:32; 33:40; 41:48; 49:56]; |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1344 %! m8 = reshape (1 : 8*8, 8, 8); |
|
7796
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1345 %! mt8 = mt8 = [mt7; 57:64]; |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1346 %! m9 = reshape (1 : 9*8, 8, 9); |
|
7796
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1347 %! mt9 = [mt8; 65:72]; |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1348 |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1349 %!assert(m7', mt7) |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1350 %!assert((1i*m7).', 1i * mt7) |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1351 %!assert((1i*m7)', conj (1i * mt7)) |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1352 %!assert(m8', mt8) |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1353 %!assert((1i*m8).', 1i * mt8) |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1354 %!assert((1i*m8)', conj (1i * mt8)) |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1355 %!assert(m9', mt9) |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1356 %!assert((1i*m9).', 1i * mt9) |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1357 %!assert((1i*m9)', conj (1i * mt9)) |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1358 %!assert([m7, m8; m7, m8]', [mt7, mt7; mt8, mt8]) |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1359 %!assert((1i*[m7, m8; m7, m8]).', 1i * [mt7, mt7; mt8, mt8]) |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1360 %!assert((1i*[m7, m8; m7, m8])', conj (1i * [mt7, mt7; mt8, mt8])) |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1361 %!assert([m8, m8; m8, m8]', [mt8, mt8; mt8, mt8]) |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1362 %!assert((1i*[m8, m8; m8, m8]).', 1i * [mt8, mt8; mt8, mt8]) |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1363 %!assert((1i*[m8, m8; m8, m8])', conj (1i * [mt8, mt8; mt8, mt8])) |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1364 %!assert([m9, m8; m9, m8]', [mt9, mt9; mt8, mt8]) |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1365 %!assert((1i*[m9, m8; m9, m8]).', 1i * [mt9, mt9; mt8, mt8]) |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1366 %!assert((1i*[m9, m8; m9, m8])', conj (1i * [mt9, mt9; mt8, mt8])) |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1367 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1368 */ |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1369 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1370 template <class T> |
| 4513 | 1371 T * |
| 1372 Array<T>::fortran_vec (void) | |
| 1373 { | |
| 6881 | 1374 make_unique (); |
| 1375 | |
| 4513 | 1376 return rep->data; |
| 1377 } | |
| 1378 | |
| 1379 template <class T> | |
| 3933 | 1380 void |
| 4517 | 1381 Array<T>::maybe_delete_dims (void) |
| 1382 { | |
| 4587 | 1383 int nd = dimensions.length (); |
| 4517 | 1384 |
| 1385 dim_vector new_dims (1, 1); | |
| 1386 | |
| 1387 bool delete_dims = true; | |
| 1388 | |
| 4587 | 1389 for (int i = nd - 1; i >= 0; i--) |
| 4517 | 1390 { |
| 1391 if (delete_dims) | |
| 1392 { | |
| 1393 if (dimensions(i) != 1) | |
| 1394 { | |
| 1395 delete_dims = false; | |
| 1396 | |
| 1397 new_dims = dim_vector (i + 1, dimensions(i)); | |
| 1398 } | |
| 1399 } | |
| 1400 else | |
| 1401 new_dims(i) = dimensions(i); | |
| 1402 } | |
| 4530 | 1403 |
| 4587 | 1404 if (nd != new_dims.length ()) |
| 4517 | 1405 dimensions = new_dims; |
| 1406 } | |
| 1407 | |
| 1408 template <class T> | |
| 1409 void | |
| 6881 | 1410 Array<T>::clear_index (void) const |
| 4517 | 1411 { |
| 1412 delete [] idx; | |
| 1413 idx = 0; | |
| 1414 idx_count = 0; | |
| 1415 } | |
| 1416 | |
| 1417 template <class T> | |
| 1418 void | |
| 6881 | 1419 Array<T>::set_index (const idx_vector& idx_arg) const |
| 4517 | 1420 { |
| 1421 int nd = ndims (); | |
| 1422 | |
| 1423 if (! idx && nd > 0) | |
| 1424 idx = new idx_vector [nd]; | |
| 1425 | |
| 1426 if (idx_count < nd) | |
| 1427 { | |
| 1428 idx[idx_count++] = idx_arg; | |
| 1429 } | |
| 1430 else | |
| 1431 { | |
| 1432 idx_vector *new_idx = new idx_vector [idx_count+1]; | |
| 1433 | |
| 1434 for (int i = 0; i < idx_count; i++) | |
| 1435 new_idx[i] = idx[i]; | |
| 1436 | |
| 1437 new_idx[idx_count++] = idx_arg; | |
| 1438 | |
| 1439 delete [] idx; | |
| 1440 | |
| 1441 idx = new_idx; | |
| 1442 } | |
| 1443 } | |
| 1444 | |
| 1445 template <class T> | |
| 1446 void | |
| 1447 Array<T>::maybe_delete_elements (idx_vector& idx_arg) | |
| 1448 { | |
| 1449 switch (ndims ()) | |
| 1450 { | |
| 1451 case 1: | |
| 1452 maybe_delete_elements_1 (idx_arg); | |
| 1453 break; | |
| 1454 | |
| 1455 case 2: | |
| 1456 maybe_delete_elements_2 (idx_arg); | |
| 1457 break; | |
| 1458 | |
| 1459 default: | |
| 1460 (*current_liboctave_error_handler) | |
| 1461 ("Array<T>::maybe_delete_elements: invalid operation"); | |
| 1462 break; | |
| 1463 } | |
| 1464 } | |
| 1465 | |
| 1466 template <class T> | |
| 1467 void | |
| 1468 Array<T>::maybe_delete_elements_1 (idx_vector& idx_arg) | |
| 1469 { | |
| 5275 | 1470 octave_idx_type len = length (); |
| 4517 | 1471 |
| 1472 if (len == 0) | |
| 1473 return; | |
| 1474 | |
| 1475 if (idx_arg.is_colon_equiv (len, 1)) | |
| 1476 resize_no_fill (0); | |
| 1477 else | |
| 1478 { | |
| 1479 int num_to_delete = idx_arg.length (len); | |
| 1480 | |
| 1481 if (num_to_delete != 0) | |
| 1482 { | |
| 5275 | 1483 octave_idx_type new_len = len; |
| 1484 | |
| 1485 octave_idx_type iidx = 0; | |
| 1486 | |
| 1487 for (octave_idx_type i = 0; i < len; i++) | |
| 4517 | 1488 if (i == idx_arg.elem (iidx)) |
| 1489 { | |
| 1490 iidx++; | |
| 1491 new_len--; | |
| 1492 | |
| 1493 if (iidx == num_to_delete) | |
| 1494 break; | |
| 1495 } | |
| 1496 | |
| 1497 if (new_len > 0) | |
| 1498 { | |
| 1499 T *new_data = new T [new_len]; | |
| 1500 | |
| 5275 | 1501 octave_idx_type ii = 0; |
| 4517 | 1502 iidx = 0; |
| 5275 | 1503 for (octave_idx_type i = 0; i < len; i++) |
| 4517 | 1504 { |
| 1505 if (iidx < num_to_delete && i == idx_arg.elem (iidx)) | |
| 1506 iidx++; | |
| 1507 else | |
| 1508 { | |
| 6884 | 1509 new_data[ii] = xelem (i); |
| 4517 | 1510 ii++; |
| 1511 } | |
| 1512 } | |
| 1513 | |
| 1514 if (--rep->count <= 0) | |
| 1515 delete rep; | |
| 1516 | |
| 1517 rep = new typename Array<T>::ArrayRep (new_data, new_len); | |
| 1518 | |
| 1519 dimensions.resize (1); | |
| 1520 dimensions(0) = new_len; | |
| 1521 } | |
| 1522 else | |
| 1523 (*current_liboctave_error_handler) | |
| 1524 ("A(idx) = []: index out of range"); | |
| 1525 } | |
| 1526 } | |
| 1527 } | |
| 1528 | |
| 1529 template <class T> | |
| 1530 void | |
| 1531 Array<T>::maybe_delete_elements_2 (idx_vector& idx_arg) | |
| 1532 { | |
| 4548 | 1533 assert (ndims () == 2); |
| 1534 | |
| 5275 | 1535 octave_idx_type nr = dim1 (); |
| 1536 octave_idx_type nc = dim2 (); | |
| 4517 | 1537 |
| 5275 | 1538 octave_idx_type n; |
| 4517 | 1539 if (nr == 1) |
| 1540 n = nc; | |
| 1541 else if (nc == 1) | |
| 1542 n = nr; | |
| 1543 else | |
| 1544 { | |
| 4756 | 1545 // Reshape to row vector for Matlab compatibility. |
| 1546 | |
| 1547 n = nr * nc; | |
| 1548 nr = 1; | |
| 1549 nc = n; | |
| 4517 | 1550 } |
| 1551 | |
| 6525 | 1552 if (nr > 0 && nc > 0 && idx_arg.is_colon_equiv (n, 1)) |
| 4517 | 1553 { |
| 1554 // Either A(:) = [] or A(idx) = [] with idx enumerating all | |
| 1555 // elements, so we delete all elements and return [](0x0). To | |
| 1556 // preserve the orientation of the vector, you have to use | |
| 1557 // A(idx,:) = [] (delete rows) or A(:,idx) (delete columns). | |
| 1558 | |
| 1559 resize_no_fill (0, 0); | |
| 1560 return; | |
| 1561 } | |
| 1562 | |
| 1563 idx_arg.sort (true); | |
| 1564 | |
| 5275 | 1565 octave_idx_type num_to_delete = idx_arg.length (n); |
| 4517 | 1566 |
| 1567 if (num_to_delete != 0) | |
| 1568 { | |
| 5275 | 1569 octave_idx_type new_n = n; |
| 1570 | |
| 1571 octave_idx_type iidx = 0; | |
| 1572 | |
| 1573 for (octave_idx_type i = 0; i < n; i++) | |
| 4517 | 1574 if (i == idx_arg.elem (iidx)) |
| 1575 { | |
| 1576 iidx++; | |
| 1577 new_n--; | |
| 1578 | |
| 1579 if (iidx == num_to_delete) | |
| 1580 break; | |
| 1581 } | |
| 1582 | |
| 1583 if (new_n > 0) | |
| 1584 { | |
| 1585 T *new_data = new T [new_n]; | |
| 1586 | |
| 5275 | 1587 octave_idx_type ii = 0; |
| 4517 | 1588 iidx = 0; |
| 5275 | 1589 for (octave_idx_type i = 0; i < n; i++) |
| 4517 | 1590 { |
| 1591 if (iidx < num_to_delete && i == idx_arg.elem (iidx)) | |
| 1592 iidx++; | |
| 1593 else | |
| 1594 { | |
| 6884 | 1595 new_data[ii] = xelem (i); |
| 4517 | 1596 |
| 1597 ii++; | |
| 1598 } | |
| 1599 } | |
| 1600 | |
| 1601 if (--(Array<T>::rep)->count <= 0) | |
| 1602 delete Array<T>::rep; | |
| 1603 | |
| 1604 Array<T>::rep = new typename Array<T>::ArrayRep (new_data, new_n); | |
| 1605 | |
| 1606 dimensions.resize (2); | |
| 1607 | |
| 1608 if (nr == 1) | |
| 1609 { | |
| 1610 dimensions(0) = 1; | |
| 1611 dimensions(1) = new_n; | |
| 1612 } | |
| 1613 else | |
| 1614 { | |
| 1615 dimensions(0) = new_n; | |
| 1616 dimensions(1) = 1; | |
| 1617 } | |
| 1618 } | |
| 1619 else | |
| 1620 (*current_liboctave_error_handler) | |
| 1621 ("A(idx) = []: index out of range"); | |
| 1622 } | |
| 1623 } | |
| 1624 | |
| 1625 template <class T> | |
| 1626 void | |
| 1627 Array<T>::maybe_delete_elements (idx_vector& idx_i, idx_vector& idx_j) | |
| 1628 { | |
| 4548 | 1629 assert (ndims () == 2); |
| 1630 | |
| 5275 | 1631 octave_idx_type nr = dim1 (); |
| 1632 octave_idx_type nc = dim2 (); | |
| 4517 | 1633 |
| 1634 if (nr == 0 && nc == 0) | |
| 1635 return; | |
| 1636 | |
| 1637 if (idx_i.is_colon ()) | |
| 1638 { | |
| 1639 if (idx_j.is_colon ()) | |
| 1640 { | |
| 1641 // A(:,:) -- We are deleting columns and rows, so the result | |
| 1642 // is [](0x0). | |
| 1643 | |
| 1644 resize_no_fill (0, 0); | |
| 1645 return; | |
| 1646 } | |
| 1647 | |
| 1648 if (idx_j.is_colon_equiv (nc, 1)) | |
| 1649 { | |
| 1650 // A(:,j) -- We are deleting columns by enumerating them, | |
| 1651 // If we enumerate all of them, we should have zero columns | |
| 1652 // with the same number of rows that we started with. | |
| 1653 | |
| 1654 resize_no_fill (nr, 0); | |
| 1655 return; | |
| 1656 } | |
| 1657 } | |
| 1658 | |
| 1659 if (idx_j.is_colon () && idx_i.is_colon_equiv (nr, 1)) | |
| 1660 { | |
| 1661 // A(i,:) -- We are deleting rows by enumerating them. If we | |
| 1662 // enumerate all of them, we should have zero rows with the | |
| 1663 // same number of columns that we started with. | |
| 1664 | |
| 1665 resize_no_fill (0, nc); | |
| 1666 return; | |
| 1667 } | |
| 1668 | |
| 1669 if (idx_i.is_colon_equiv (nr, 1)) | |
| 1670 { | |
| 1671 if (idx_j.is_colon_equiv (nc, 1)) | |
| 1672 resize_no_fill (0, 0); | |
| 1673 else | |
| 1674 { | |
| 1675 idx_j.sort (true); | |
| 1676 | |
| 5275 | 1677 octave_idx_type num_to_delete = idx_j.length (nc); |
| 4517 | 1678 |
| 1679 if (num_to_delete != 0) | |
| 1680 { | |
| 1681 if (nr == 1 && num_to_delete == nc) | |
| 1682 resize_no_fill (0, 0); | |
| 1683 else | |
| 1684 { | |
| 5275 | 1685 octave_idx_type new_nc = nc; |
| 1686 | |
| 1687 octave_idx_type iidx = 0; | |
| 1688 | |
| 1689 for (octave_idx_type j = 0; j < nc; j++) | |
| 4517 | 1690 if (j == idx_j.elem (iidx)) |
| 1691 { | |
| 1692 iidx++; | |
| 1693 new_nc--; | |
| 1694 | |
| 1695 if (iidx == num_to_delete) | |
| 1696 break; | |
| 1697 } | |
| 1698 | |
| 1699 if (new_nc > 0) | |
| 1700 { | |
| 1701 T *new_data = new T [nr * new_nc]; | |
| 1702 | |
| 5275 | 1703 octave_idx_type jj = 0; |
| 4517 | 1704 iidx = 0; |
| 5275 | 1705 for (octave_idx_type j = 0; j < nc; j++) |
| 4517 | 1706 { |
| 1707 if (iidx < num_to_delete && j == idx_j.elem (iidx)) | |
| 1708 iidx++; | |
| 1709 else | |
| 1710 { | |
| 5275 | 1711 for (octave_idx_type i = 0; i < nr; i++) |
| 6884 | 1712 new_data[nr*jj+i] = xelem (i, j); |
| 4517 | 1713 jj++; |
| 1714 } | |
| 1715 } | |
| 1716 | |
| 1717 if (--(Array<T>::rep)->count <= 0) | |
| 1718 delete Array<T>::rep; | |
| 1719 | |
| 1720 Array<T>::rep = new typename Array<T>::ArrayRep (new_data, nr * new_nc); | |
| 1721 | |
| 1722 dimensions.resize (2); | |
| 1723 dimensions(1) = new_nc; | |
| 1724 } | |
| 1725 else | |
| 1726 (*current_liboctave_error_handler) | |
| 1727 ("A(idx) = []: index out of range"); | |
| 1728 } | |
| 1729 } | |
| 1730 } | |
| 1731 } | |
| 1732 else if (idx_j.is_colon_equiv (nc, 1)) | |
| 1733 { | |
| 1734 if (idx_i.is_colon_equiv (nr, 1)) | |
| 1735 resize_no_fill (0, 0); | |
| 1736 else | |
| 1737 { | |
| 1738 idx_i.sort (true); | |
| 1739 | |
| 5275 | 1740 octave_idx_type num_to_delete = idx_i.length (nr); |
| 4517 | 1741 |
| 1742 if (num_to_delete != 0) | |
| 1743 { | |
| 1744 if (nc == 1 && num_to_delete == nr) | |
| 1745 resize_no_fill (0, 0); | |
| 1746 else | |
| 1747 { | |
| 5275 | 1748 octave_idx_type new_nr = nr; |
| 1749 | |
| 1750 octave_idx_type iidx = 0; | |
| 1751 | |
| 1752 for (octave_idx_type i = 0; i < nr; i++) | |
| 4517 | 1753 if (i == idx_i.elem (iidx)) |
| 1754 { | |
| 1755 iidx++; | |
| 1756 new_nr--; | |
| 1757 | |
| 1758 if (iidx == num_to_delete) | |
| 1759 break; | |
| 1760 } | |
| 1761 | |
| 1762 if (new_nr > 0) | |
| 1763 { | |
| 1764 T *new_data = new T [new_nr * nc]; | |
| 1765 | |
| 5275 | 1766 octave_idx_type ii = 0; |
| 4517 | 1767 iidx = 0; |
| 5275 | 1768 for (octave_idx_type i = 0; i < nr; i++) |
| 4517 | 1769 { |
| 1770 if (iidx < num_to_delete && i == idx_i.elem (iidx)) | |
| 1771 iidx++; | |
| 1772 else | |
| 1773 { | |
| 5275 | 1774 for (octave_idx_type j = 0; j < nc; j++) |
| 6884 | 1775 new_data[new_nr*j+ii] = xelem (i, j); |
| 4517 | 1776 ii++; |
| 1777 } | |
| 1778 } | |
| 1779 | |
| 1780 if (--(Array<T>::rep)->count <= 0) | |
| 1781 delete Array<T>::rep; | |
| 1782 | |
| 1783 Array<T>::rep = new typename Array<T>::ArrayRep (new_data, new_nr * nc); | |
| 1784 | |
| 1785 dimensions.resize (2); | |
| 1786 dimensions(0) = new_nr; | |
| 1787 } | |
| 1788 else | |
| 1789 (*current_liboctave_error_handler) | |
| 1790 ("A(idx) = []: index out of range"); | |
| 1791 } | |
| 1792 } | |
| 1793 } | |
| 1794 } | |
| 1795 } | |
| 1796 | |
| 1797 template <class T> | |
| 1798 void | |
| 1799 Array<T>::maybe_delete_elements (idx_vector&, idx_vector&, idx_vector&) | |
| 1800 { | |
| 1801 assert (0); | |
| 1802 } | |
| 1803 | |
| 1804 template <class T> | |
| 1805 void | |
| 4585 | 1806 Array<T>::maybe_delete_elements (Array<idx_vector>& ra_idx, const T& rfv) |
| 4517 | 1807 { |
| 5275 | 1808 octave_idx_type n_idx = ra_idx.length (); |
| 4517 | 1809 |
| 1810 dim_vector lhs_dims = dims (); | |
| 1811 | |
| 6388 | 1812 int n_lhs_dims = lhs_dims.length (); |
| 1813 | |
| 4821 | 1814 if (lhs_dims.all_zero ()) |
| 1815 return; | |
| 1816 | |
| 6384 | 1817 if (n_idx == 1 && ra_idx(0).is_colon ()) |
| 1818 { | |
| 1819 resize (dim_vector (0, 0), rfv); | |
| 1820 return; | |
| 1821 } | |
| 1822 | |
| 6388 | 1823 if (n_idx > n_lhs_dims) |
| 1824 { | |
| 1825 for (int i = n_idx; i < n_lhs_dims; i++) | |
| 1826 { | |
| 1827 // Ensure that extra indices are either colon or 1. | |
| 1828 | |
| 1829 if (! ra_idx(i).is_colon_equiv (1, 1)) | |
| 1830 { | |
| 1831 (*current_liboctave_error_handler) | |
| 1832 ("index exceeds array dimensions"); | |
| 1833 return; | |
| 1834 } | |
| 1835 } | |
| 1836 | |
| 1837 ra_idx.resize (n_lhs_dims); | |
| 1838 | |
| 1839 n_idx = n_lhs_dims; | |
| 1840 } | |
| 4757 | 1841 |
| 4740 | 1842 Array<int> idx_is_colon (n_idx, 0); |
| 1843 | |
| 1844 Array<int> idx_is_colon_equiv (n_idx, 0); | |
| 4517 | 1845 |
| 1846 // Initialization of colon arrays. | |
| 4757 | 1847 |
| 5275 | 1848 for (octave_idx_type i = 0; i < n_idx; i++) |
| 4517 | 1849 { |
| 4585 | 1850 idx_is_colon_equiv(i) = ra_idx(i).is_colon_equiv (lhs_dims(i), 1); |
| 1851 | |
| 1852 idx_is_colon(i) = ra_idx(i).is_colon (); | |
| 4517 | 1853 } |
| 1854 | |
| 4755 | 1855 bool idx_ok = true; |
| 1856 | |
| 1857 // Check for index out of bounds. | |
| 1858 | |
| 5275 | 1859 for (octave_idx_type i = 0 ; i < n_idx - 1; i++) |
| 4517 | 1860 { |
| 4755 | 1861 if (! (idx_is_colon(i) || idx_is_colon_equiv(i))) |
| 1862 { | |
| 1863 ra_idx(i).sort (true); | |
| 4757 | 1864 |
| 4755 | 1865 if (ra_idx(i).max () > lhs_dims(i)) |
| 1866 { | |
| 1867 (*current_liboctave_error_handler) | |
| 1868 ("index exceeds array dimensions"); | |
| 4757 | 1869 |
| 4755 | 1870 idx_ok = false; |
| 1871 break; | |
| 1872 } | |
| 1873 else if (ra_idx(i).min () < 0) // I believe this is checked elsewhere | |
| 1874 { | |
| 1875 (*current_liboctave_error_handler) | |
| 1876 ("index must be one or larger"); | |
| 1877 | |
| 1878 idx_ok = false; | |
| 1879 break; | |
| 1880 } | |
| 1881 } | |
| 4517 | 1882 } |
| 4757 | 1883 |
| 4755 | 1884 if (n_idx <= n_lhs_dims) |
| 4517 | 1885 { |
| 5275 | 1886 octave_idx_type last_idx = ra_idx(n_idx-1).max (); |
| 1887 | |
| 1888 octave_idx_type sum_el = lhs_dims(n_idx-1); | |
| 1889 | |
| 1890 for (octave_idx_type i = n_idx; i < n_lhs_dims; i++) | |
| 4755 | 1891 sum_el *= lhs_dims(i); |
| 1892 | |
| 1893 if (last_idx > sum_el - 1) | |
| 1894 { | |
| 1895 (*current_liboctave_error_handler) | |
| 1896 ("index exceeds array dimensions"); | |
| 1897 | |
| 1898 idx_ok = false; | |
| 1899 } | |
| 4757 | 1900 } |
| 4755 | 1901 |
| 1902 if (idx_ok) | |
| 1903 { | |
| 1904 if (n_idx > 1 | |
| 1905 && (all_ones (idx_is_colon) || all_ones (idx_is_colon_equiv))) | |
| 4517 | 1906 { |
| 4755 | 1907 // A(:,:,:) -- we are deleting elements in all dimensions, so |
| 1908 // the result is [](0x0x0). | |
| 1909 | |
| 1910 dim_vector zeros; | |
| 1911 zeros.resize (n_idx); | |
| 1912 | |
| 1913 for (int i = 0; i < n_idx; i++) | |
| 1914 zeros(i) = 0; | |
| 1915 | |
| 1916 resize (zeros, rfv); | |
| 4517 | 1917 } |
| 1918 | |
| 4755 | 1919 else if (n_idx > 1 |
| 1920 && num_ones (idx_is_colon) == n_idx - 1 | |
| 1921 && num_ones (idx_is_colon_equiv) == n_idx) | |
| 1922 { | |
| 1923 // A(:,:,j) -- we are deleting elements in one dimension by | |
| 1924 // enumerating them. | |
| 1925 // | |
| 1926 // If we enumerate all of the elements, we should have zero | |
| 1927 // elements in that dimension with the same number of elements | |
| 1928 // in the other dimensions that we started with. | |
| 1929 | |
| 1930 dim_vector temp_dims; | |
| 1931 temp_dims.resize (n_idx); | |
| 1932 | |
| 5275 | 1933 for (octave_idx_type i = 0; i < n_idx; i++) |
| 4755 | 1934 { |
| 1935 if (idx_is_colon (i)) | |
| 1936 temp_dims(i) = lhs_dims(i); | |
| 1937 else | |
| 1938 temp_dims(i) = 0; | |
| 1939 } | |
| 1940 | |
| 1941 resize (temp_dims); | |
| 1942 } | |
| 1943 else if (n_idx > 1 && num_ones (idx_is_colon) == n_idx - 1) | |
| 4741 | 1944 { |
| 4755 | 1945 // We have colons in all indices except for one. |
| 1946 // This index tells us which slice to delete | |
| 1947 | |
| 1948 if (n_idx < n_lhs_dims) | |
| 1949 { | |
| 1950 // Collapse dimensions beyond last index. | |
| 1951 | |
| 5781 | 1952 if (! (ra_idx(n_idx-1).is_colon ())) |
| 1953 (*current_liboctave_warning_with_id_handler) | |
| 1954 ("Octave:fortran-indexing", | |
| 1955 "fewer indices than dimensions for N-d array"); | |
| 4755 | 1956 |
| 5275 | 1957 for (octave_idx_type i = n_idx; i < n_lhs_dims; i++) |
| 4755 | 1958 lhs_dims(n_idx-1) *= lhs_dims(i); |
| 1959 | |
| 1960 lhs_dims.resize (n_idx); | |
| 1961 | |
| 1962 // Reshape *this. | |
| 1963 dimensions = lhs_dims; | |
| 1964 } | |
| 1965 | |
| 1966 int non_col = 0; | |
| 1967 | |
| 1968 // Find the non-colon column. | |
| 1969 | |
| 5275 | 1970 for (octave_idx_type i = 0; i < n_idx; i++) |
| 4755 | 1971 { |
| 1972 if (! idx_is_colon(i)) | |
| 1973 non_col = i; | |
| 1974 } | |
| 1975 | |
| 1976 // The length of the non-colon dimension. | |
| 1977 | |
| 5275 | 1978 octave_idx_type non_col_dim = lhs_dims (non_col); |
| 1979 | |
| 1980 octave_idx_type num_to_delete = ra_idx(non_col).length (lhs_dims (non_col)); | |
| 4755 | 1981 |
| 1982 if (num_to_delete > 0) | |
| 1983 { | |
| 1984 int temp = lhs_dims.num_ones (); | |
| 1985 | |
| 1986 if (non_col_dim == 1) | |
| 1987 temp--; | |
| 1988 | |
| 1989 if (temp == n_idx - 1 && num_to_delete == non_col_dim) | |
| 1990 { | |
| 1991 // We have A with (1x1x4), where A(1,:,1:4) | |
| 1992 // Delete all (0x0x0) | |
| 1993 | |
| 1994 dim_vector zero_dims (n_idx, 0); | |
| 1995 | |
| 1996 resize (zero_dims, rfv); | |
| 1997 } | |
| 1998 else | |
| 1999 { | |
| 2000 // New length of non-colon dimension | |
| 2001 // (calculated in the next for loop) | |
| 2002 | |
| 5275 | 2003 octave_idx_type new_dim = non_col_dim; |
| 2004 | |
| 2005 octave_idx_type iidx = 0; | |
| 2006 | |
| 2007 for (octave_idx_type j = 0; j < non_col_dim; j++) | |
| 4755 | 2008 if (j == ra_idx(non_col).elem (iidx)) |
| 2009 { | |
| 2010 iidx++; | |
| 2011 | |
| 2012 new_dim--; | |
| 2013 | |
| 2014 if (iidx == num_to_delete) | |
| 2015 break; | |
| 2016 } | |
| 2017 | |
| 2018 // Creating the new nd array after deletions. | |
| 2019 | |
| 2020 if (new_dim > 0) | |
| 2021 { | |
| 2022 // Calculate number of elements in new array. | |
| 2023 | |
| 5275 | 2024 octave_idx_type num_new_elem=1; |
| 4755 | 2025 |
| 2026 for (int i = 0; i < n_idx; i++) | |
| 2027 { | |
| 2028 if (i == non_col) | |
| 2029 num_new_elem *= new_dim; | |
| 2030 | |
| 2031 else | |
| 2032 num_new_elem *= lhs_dims(i); | |
| 2033 } | |
| 2034 | |
| 2035 T *new_data = new T [num_new_elem]; | |
| 2036 | |
| 5275 | 2037 Array<octave_idx_type> result_idx (n_lhs_dims, 0); |
| 4755 | 2038 |
| 2039 dim_vector new_lhs_dim = lhs_dims; | |
| 2040 | |
| 2041 new_lhs_dim(non_col) = new_dim; | |
| 2042 | |
| 5275 | 2043 octave_idx_type num_elem = 1; |
| 2044 | |
| 2045 octave_idx_type numidx = 0; | |
| 2046 | |
| 2047 octave_idx_type n = length (); | |
| 4755 | 2048 |
| 2049 for (int i = 0; i < n_lhs_dims; i++) | |
| 2050 if (i != non_col) | |
| 2051 num_elem *= lhs_dims(i); | |
| 2052 | |
| 2053 num_elem *= ra_idx(non_col).capacity (); | |
| 2054 | |
| 5275 | 2055 for (octave_idx_type i = 0; i < n; i++) |
| 4755 | 2056 { |
| 2057 if (numidx < num_elem | |
| 2058 && is_in (result_idx(non_col), ra_idx(non_col))) | |
| 2059 numidx++; | |
| 2060 | |
| 2061 else | |
| 2062 { | |
| 5275 | 2063 Array<octave_idx_type> temp_result_idx = result_idx; |
| 2064 | |
| 2065 octave_idx_type num_lgt = how_many_lgt (result_idx(non_col), | |
| 4755 | 2066 ra_idx(non_col)); |
| 2067 | |
| 2068 temp_result_idx(non_col) -= num_lgt; | |
| 2069 | |
| 5275 | 2070 octave_idx_type kidx |
| 4755 | 2071 = ::compute_index (temp_result_idx, new_lhs_dim); |
| 2072 | |
| 6884 | 2073 new_data[kidx] = xelem (result_idx); |
| 4755 | 2074 } |
| 2075 | |
| 2076 increment_index (result_idx, lhs_dims); | |
| 2077 } | |
| 2078 | |
| 2079 if (--rep->count <= 0) | |
| 2080 delete rep; | |
| 2081 | |
| 2082 rep = new typename Array<T>::ArrayRep (new_data, | |
| 2083 num_new_elem); | |
| 2084 | |
| 2085 dimensions = new_lhs_dim; | |
| 2086 } | |
| 2087 } | |
| 2088 } | |
| 4517 | 2089 } |
| 4755 | 2090 else if (n_idx == 1) |
| 4517 | 2091 { |
| 4821 | 2092 // This handle cases where we only have one index (not |
| 2093 // colon). The index denotes which elements we should | |
| 2094 // delete in the array which can be of any dimension. We | |
| 2095 // return a column vector, except for the case where we are | |
| 2096 // operating on a row vector. The elements are numerated | |
| 2097 // column by column. | |
| 4755 | 2098 // |
| 2099 // A(3,3,3)=2; | |
| 2100 // A(3:5) = []; A(6)=[] | |
| 4757 | 2101 |
| 5275 | 2102 octave_idx_type lhs_numel = numel (); |
| 4757 | 2103 |
| 4821 | 2104 idx_vector idx_vec = ra_idx(0); |
| 2105 | |
| 5781 | 2106 idx_vec.freeze (lhs_numel, 0, true); |
| 4821 | 2107 |
| 2108 idx_vec.sort (true); | |
| 2109 | |
| 5275 | 2110 octave_idx_type num_to_delete = idx_vec.length (lhs_numel); |
| 4821 | 2111 |
| 2112 if (num_to_delete > 0) | |
| 4517 | 2113 { |
| 5275 | 2114 octave_idx_type new_numel = lhs_numel - num_to_delete; |
| 4821 | 2115 |
| 2116 T *new_data = new T[new_numel]; | |
| 2117 | |
| 5275 | 2118 Array<octave_idx_type> lhs_ra_idx (ndims (), 0); |
| 2119 | |
| 2120 octave_idx_type ii = 0; | |
| 2121 octave_idx_type iidx = 0; | |
| 2122 | |
| 2123 for (octave_idx_type i = 0; i < lhs_numel; i++) | |
| 4755 | 2124 { |
| 4821 | 2125 if (iidx < num_to_delete && i == idx_vec.elem (iidx)) |
| 2126 { | |
| 2127 iidx++; | |
| 2128 } | |
| 2129 else | |
| 2130 { | |
| 6884 | 2131 new_data[ii++] = xelem (lhs_ra_idx); |
| 4821 | 2132 } |
| 2133 | |
| 2134 increment_index (lhs_ra_idx, lhs_dims); | |
| 2135 } | |
| 2136 | |
| 2137 if (--(Array<T>::rep)->count <= 0) | |
| 2138 delete Array<T>::rep; | |
| 2139 | |
| 2140 Array<T>::rep = new typename Array<T>::ArrayRep (new_data, new_numel); | |
| 2141 | |
| 2142 dimensions.resize (2); | |
| 2143 | |
| 2144 if (lhs_dims.length () == 2 && lhs_dims(1) == 1) | |
| 2145 { | |
| 2146 dimensions(0) = new_numel; | |
| 2147 dimensions(1) = 1; | |
| 4755 | 2148 } |
| 2149 else | |
| 2150 { | |
| 4821 | 2151 dimensions(0) = 1; |
| 2152 dimensions(1) = new_numel; | |
| 4755 | 2153 } |
| 4517 | 2154 } |
| 2155 } | |
| 4755 | 2156 else if (num_ones (idx_is_colon) < n_idx) |
| 2157 { | |
| 2158 (*current_liboctave_error_handler) | |
| 2159 ("a null assignment can have only one non-colon index"); | |
| 2160 } | |
| 4517 | 2161 } |
| 2162 } | |
| 2163 | |
| 2164 template <class T> | |
| 2165 Array<T> | |
| 6881 | 2166 Array<T>::value (void) const |
| 4517 | 2167 { |
| 2168 Array<T> retval; | |
| 2169 | |
| 2170 int n_idx = index_count (); | |
| 2171 | |
| 2172 if (n_idx == 2) | |
| 2173 { | |
| 2174 idx_vector *tmp = get_idx (); | |
| 2175 | |
| 2176 idx_vector idx_i = tmp[0]; | |
| 2177 idx_vector idx_j = tmp[1]; | |
| 2178 | |
| 2179 retval = index (idx_i, idx_j); | |
| 2180 } | |
| 2181 else if (n_idx == 1) | |
| 2182 { | |
| 2183 retval = index (idx[0]); | |
| 2184 } | |
| 2185 else | |
| 2186 (*current_liboctave_error_handler) | |
| 2187 ("Array<T>::value: invalid number of indices specified"); | |
| 2188 | |
| 2189 clear_index (); | |
| 2190 | |
| 2191 return retval; | |
| 2192 } | |
| 2193 | |
| 2194 template <class T> | |
| 2195 Array<T> | |
| 2196 Array<T>::index (idx_vector& idx_arg, int resize_ok, const T& rfv) const | |
| 2197 { | |
| 2198 Array<T> retval; | |
| 2199 | |
| 5081 | 2200 dim_vector dv = idx_arg.orig_dimensions (); |
| 2201 | |
| 2202 if (dv.length () > 2 || ndims () > 2) | |
| 2203 retval = indexN (idx_arg, resize_ok, rfv); | |
| 2204 else | |
| 4517 | 2205 { |
| 5081 | 2206 switch (ndims ()) |
| 2207 { | |
| 2208 case 1: | |
| 2209 retval = index1 (idx_arg, resize_ok, rfv); | |
| 2210 break; | |
| 2211 | |
| 2212 case 2: | |
| 2213 retval = index2 (idx_arg, resize_ok, rfv); | |
| 2214 break; | |
| 2215 | |
| 2216 default: | |
| 2217 (*current_liboctave_error_handler) | |
| 2218 ("invalid array (internal error)"); | |
| 2219 break; | |
| 2220 } | |
| 4517 | 2221 } |
| 2222 | |
| 2223 return retval; | |
| 2224 } | |
| 2225 | |
| 2226 template <class T> | |
| 2227 Array<T> | |
| 2228 Array<T>::index1 (idx_vector& idx_arg, int resize_ok, const T& rfv) const | |
| 2229 { | |
| 2230 Array<T> retval; | |
| 2231 | |
| 5275 | 2232 octave_idx_type len = length (); |
| 2233 | |
| 2234 octave_idx_type n = idx_arg.freeze (len, "vector", resize_ok); | |
| 4517 | 2235 |
| 2236 if (idx_arg) | |
| 2237 { | |
| 2238 if (idx_arg.is_colon_equiv (len)) | |
| 2239 { | |
| 2240 retval = *this; | |
| 2241 } | |
| 2242 else if (n == 0) | |
| 2243 { | |
| 2244 retval.resize_no_fill (0); | |
| 2245 } | |
| 2246 else | |
| 2247 { | |
| 2248 retval.resize_no_fill (n); | |
| 2249 | |
| 5275 | 2250 for (octave_idx_type i = 0; i < n; i++) |
| 4517 | 2251 { |
| 5275 | 2252 octave_idx_type ii = idx_arg.elem (i); |
| 4517 | 2253 if (ii >= len) |
| 2254 retval.elem (i) = rfv; | |
| 2255 else | |
| 2256 retval.elem (i) = elem (ii); | |
| 2257 } | |
| 2258 } | |
| 2259 } | |
| 2260 | |
| 2261 // idx_vector::freeze() printed an error message for us. | |
| 2262 | |
| 2263 return retval; | |
| 2264 } | |
| 2265 | |
| 2266 template <class T> | |
| 2267 Array<T> | |
| 2268 Array<T>::index2 (idx_vector& idx_arg, int resize_ok, const T& rfv) const | |
| 2269 { | |
| 2270 Array<T> retval; | |
| 2271 | |
| 4548 | 2272 assert (ndims () == 2); |
| 2273 | |
| 5275 | 2274 octave_idx_type nr = dim1 (); |
| 2275 octave_idx_type nc = dim2 (); | |
| 2276 | |
| 2277 octave_idx_type orig_len = nr * nc; | |
| 4517 | 2278 |
| 4832 | 2279 dim_vector idx_orig_dims = idx_arg.orig_dimensions (); |
| 2280 | |
| 5275 | 2281 octave_idx_type idx_orig_rows = idx_arg.orig_rows (); |
| 2282 octave_idx_type idx_orig_columns = idx_arg.orig_columns (); | |
| 4517 | 2283 |
| 2284 if (idx_arg.is_colon ()) | |
| 2285 { | |
| 2286 // Fast magic colon processing. | |
| 2287 | |
| 5275 | 2288 octave_idx_type result_nr = nr * nc; |
| 2289 octave_idx_type result_nc = 1; | |
| 4517 | 2290 |
| 2291 retval = Array<T> (*this, dim_vector (result_nr, result_nc)); | |
| 2292 } | |
| 2293 else if (nr == 1 && nc == 1) | |
| 2294 { | |
| 2295 Array<T> tmp = Array<T>::index1 (idx_arg, resize_ok); | |
| 2296 | |
| 5275 | 2297 octave_idx_type len = tmp.length (); |
| 4828 | 2298 |
|
7573
755bf7ecc29b
eliminate one_zero stuff from idx_vector
John W. Eaton <jwe@octave.org>
parents:
7480
diff
changeset
|
2299 if (len >= idx_orig_dims.numel ()) |
| 4832 | 2300 retval = Array<T> (tmp, idx_orig_dims); |
| 4517 | 2301 } |
| 2302 else if (nr == 1 || nc == 1) | |
| 2303 { | |
| 2304 // If indexing a vector with a matrix, return value has same | |
| 2305 // shape as the index. Otherwise, it has same orientation as | |
| 2306 // indexed object. | |
| 2307 | |
| 4828 | 2308 Array<T> tmp = Array<T>::index1 (idx_arg, resize_ok); |
| 4517 | 2309 |
| 5275 | 2310 octave_idx_type len = tmp.length (); |
| 4517 | 2311 |
|
7573
755bf7ecc29b
eliminate one_zero stuff from idx_vector
John W. Eaton <jwe@octave.org>
parents:
7480
diff
changeset
|
2312 if (idx_orig_rows == 1 || idx_orig_columns == 1) |
| 4517 | 2313 { |
| 4827 | 2314 if (nr == 1) |
| 2315 retval = Array<T> (tmp, dim_vector (1, len)); | |
| 4517 | 2316 else |
| 4827 | 2317 retval = Array<T> (tmp, dim_vector (len, 1)); |
| 4517 | 2318 } |
| 4876 | 2319 else if (len >= idx_orig_dims.numel ()) |
| 4832 | 2320 retval = Array<T> (tmp, idx_orig_dims); |
| 4517 | 2321 } |
| 2322 else | |
| 2323 { | |
|
7573
755bf7ecc29b
eliminate one_zero stuff from idx_vector
John W. Eaton <jwe@octave.org>
parents:
7480
diff
changeset
|
2324 (*current_liboctave_warning_with_id_handler) |
|
755bf7ecc29b
eliminate one_zero stuff from idx_vector
John W. Eaton <jwe@octave.org>
parents:
7480
diff
changeset
|
2325 ("Octave:fortran-indexing", "single index used for matrix"); |
| 4517 | 2326 |
| 2327 // This code is only for indexing matrices. The vector | |
| 2328 // cases are handled above. | |
| 2329 | |
| 2330 idx_arg.freeze (nr * nc, "matrix", resize_ok); | |
| 2331 | |
| 2332 if (idx_arg) | |
| 2333 { | |
| 5275 | 2334 octave_idx_type result_nr = idx_orig_rows; |
| 2335 octave_idx_type result_nc = idx_orig_columns; | |
| 4517 | 2336 |
| 2337 retval.resize_no_fill (result_nr, result_nc); | |
| 2338 | |
| 5275 | 2339 octave_idx_type k = 0; |
| 2340 for (octave_idx_type j = 0; j < result_nc; j++) | |
| 4517 | 2341 { |
| 5275 | 2342 for (octave_idx_type i = 0; i < result_nr; i++) |
| 4517 | 2343 { |
| 5275 | 2344 octave_idx_type ii = idx_arg.elem (k++); |
| 4517 | 2345 if (ii >= orig_len) |
| 2346 retval.elem (i, j) = rfv; | |
| 2347 else | |
| 2348 { | |
| 5275 | 2349 octave_idx_type fr = ii % nr; |
| 2350 octave_idx_type fc = (ii - fr) / nr; | |
| 4517 | 2351 retval.elem (i, j) = elem (fr, fc); |
| 2352 } | |
| 2353 } | |
| 2354 } | |
| 2355 } | |
| 2356 // idx_vector::freeze() printed an error message for us. | |
| 2357 } | |
| 2358 | |
| 2359 return retval; | |
| 2360 } | |
| 2361 | |
| 2362 template <class T> | |
| 2363 Array<T> | |
| 4530 | 2364 Array<T>::indexN (idx_vector& ra_idx, int resize_ok, const T& rfv) const |
| 2365 { | |
| 2366 Array<T> retval; | |
| 2367 | |
| 5519 | 2368 dim_vector dv = dims (); |
| 2369 | |
| 2370 int n_dims = dv.length (); | |
| 2371 | |
| 2372 octave_idx_type orig_len = dv.numel (); | |
| 4530 | 2373 |
| 4757 | 2374 dim_vector idx_orig_dims = ra_idx.orig_dimensions (); |
| 4530 | 2375 |
| 2376 if (ra_idx.is_colon ()) | |
| 2377 { | |
| 4651 | 2378 // Fast magic colon processing. |
| 2379 | |
| 2380 retval = Array<T> (*this, dim_vector (orig_len, 1)); | |
| 4530 | 2381 } |
| 4651 | 2382 else |
| 4530 | 2383 { |
| 5519 | 2384 bool vec_equiv = vector_equivalent (dv); |
| 2385 | |
|
7573
755bf7ecc29b
eliminate one_zero stuff from idx_vector
John W. Eaton <jwe@octave.org>
parents:
7480
diff
changeset
|
2386 if (! (vec_equiv || ra_idx.is_colon ())) |
| 5781 | 2387 (*current_liboctave_warning_with_id_handler) |
| 2388 ("Octave:fortran-indexing", "single index used for N-d array"); | |
| 4530 | 2389 |
| 5519 | 2390 octave_idx_type frozen_len |
| 2391 = ra_idx.freeze (orig_len, "nd-array", resize_ok); | |
| 4530 | 2392 |
| 2393 if (ra_idx) | |
| 4757 | 2394 { |
| 5519 | 2395 dim_vector result_dims; |
| 2396 | |
| 7321 | 2397 if (vec_equiv && ! orig_len == 1) |
| 5519 | 2398 { |
| 2399 result_dims = dv; | |
| 2400 | |
| 2401 for (int i = 0; i < n_dims; i++) | |
| 2402 { | |
| 2403 if (result_dims(i) != 1) | |
| 2404 { | |
| 2405 // All but this dim should be one. | |
| 2406 result_dims(i) = frozen_len; | |
| 2407 break; | |
| 2408 } | |
| 2409 } | |
| 2410 } | |
| 2411 else | |
| 2412 result_dims = idx_orig_dims; | |
| 4530 | 2413 |
| 4673 | 2414 result_dims.chop_trailing_singletons (); |
| 2415 | |
| 4530 | 2416 retval.resize (result_dims); |
| 2417 | |
| 5275 | 2418 octave_idx_type n = result_dims.numel (); |
| 4530 | 2419 |
| 5275 | 2420 octave_idx_type k = 0; |
| 2421 | |
| 2422 for (octave_idx_type i = 0; i < n; i++) | |
| 4530 | 2423 { |
| 5275 | 2424 octave_idx_type ii = ra_idx.elem (k++); |
| 4530 | 2425 |
| 2426 if (ii >= orig_len) | |
| 5535 | 2427 retval.elem (i) = rfv; |
| 4530 | 2428 else |
| 5535 | 2429 retval.elem (i) = elem (ii); |
| 4530 | 2430 } |
| 2431 } | |
| 2432 } | |
| 2433 | |
| 2434 return retval; | |
| 2435 } | |
| 2436 | |
| 2437 template <class T> | |
| 2438 Array<T> | |
| 4517 | 2439 Array<T>::index (idx_vector& idx_i, idx_vector& idx_j, int resize_ok, |
| 2440 const T& rfv) const | |
| 2441 { | |
| 2442 Array<T> retval; | |
| 2443 | |
| 7189 | 2444 if (ndims () != 2) |
| 2445 { | |
| 2446 Array<idx_vector> ra_idx (2); | |
| 2447 ra_idx(0) = idx_i; | |
| 2448 ra_idx(1) = idx_j; | |
| 2449 return index (ra_idx, resize_ok, rfv); | |
| 2450 } | |
| 4548 | 2451 |
| 5275 | 2452 octave_idx_type nr = dim1 (); |
| 2453 octave_idx_type nc = dim2 (); | |
| 2454 | |
| 2455 octave_idx_type n = idx_i.freeze (nr, "row", resize_ok); | |
| 2456 octave_idx_type m = idx_j.freeze (nc, "column", resize_ok); | |
| 4517 | 2457 |
| 2458 if (idx_i && idx_j) | |
| 2459 { | |
| 2460 if (idx_i.orig_empty () || idx_j.orig_empty () || n == 0 || m == 0) | |
| 2461 { | |
| 2462 retval.resize_no_fill (n, m); | |
| 2463 } | |
| 2464 else if (idx_i.is_colon_equiv (nr) && idx_j.is_colon_equiv (nc)) | |
| 2465 { | |
| 2466 retval = *this; | |
| 2467 } | |
| 2468 else | |
| 2469 { | |
| 2470 retval.resize_no_fill (n, m); | |
| 2471 | |
| 5275 | 2472 for (octave_idx_type j = 0; j < m; j++) |
| 4517 | 2473 { |
| 5275 | 2474 octave_idx_type jj = idx_j.elem (j); |
| 2475 for (octave_idx_type i = 0; i < n; i++) | |
| 4517 | 2476 { |
| 5275 | 2477 octave_idx_type ii = idx_i.elem (i); |
| 4517 | 2478 if (ii >= nr || jj >= nc) |
| 2479 retval.elem (i, j) = rfv; | |
| 2480 else | |
| 2481 retval.elem (i, j) = elem (ii, jj); | |
| 2482 } | |
| 2483 } | |
| 2484 } | |
| 2485 } | |
| 2486 | |
| 2487 // idx_vector::freeze() printed an error message for us. | |
| 2488 | |
| 2489 return retval; | |
| 2490 } | |
| 2491 | |
| 2492 template <class T> | |
| 2493 Array<T> | |
| 5992 | 2494 Array<T>::index (Array<idx_vector>& ra_idx, int resize_ok, const T& rfv) const |
| 4517 | 2495 { |
| 4530 | 2496 // This function handles all calls with more than one idx. |
| 2497 // For (3x3x3), the call can be A(2,5), A(2,:,:), A(3,2,3) etc. | |
| 2498 | |
| 4517 | 2499 Array<T> retval; |
| 2500 | |
| 2501 int n_dims = dimensions.length (); | |
| 2502 | |
| 4737 | 2503 // Remove trailing singletons in ra_idx, but leave at least ndims |
| 2504 // elements. | |
| 2505 | |
| 5275 | 2506 octave_idx_type ra_idx_len = ra_idx.length (); |
| 4737 | 2507 |
| 4887 | 2508 bool trim_trailing_singletons = true; |
| 5275 | 2509 for (octave_idx_type j = ra_idx_len; j > n_dims; j--) |
| 4737 | 2510 { |
| 4887 | 2511 idx_vector iidx = ra_idx (ra_idx_len-1); |
| 2512 if (iidx.capacity () == 1 && trim_trailing_singletons) | |
| 4737 | 2513 ra_idx_len--; |
| 2514 else | |
| 4887 | 2515 trim_trailing_singletons = false; |
| 2516 | |
| 5992 | 2517 if (! resize_ok) |
| 2518 { | |
| 2519 for (octave_idx_type i = 0; i < iidx.capacity (); i++) | |
| 2520 if (iidx (i) != 0) | |
| 2521 { | |
| 2522 (*current_liboctave_error_handler) | |
| 2523 ("index exceeds N-d array dimensions"); | |
| 2524 | |
| 2525 return retval; | |
| 2526 } | |
| 2527 } | |
| 4737 | 2528 } |
| 2529 | |
| 2530 ra_idx.resize (ra_idx_len); | |
| 2531 | |
| 4887 | 2532 dim_vector new_dims = dims (); |
| 2533 dim_vector frozen_lengths; | |
| 2534 | |
|
7597
6b2a99e44ff2
shortened empty indexing fix
David Bateman <dbateman@free.fr>
parents:
7573
diff
changeset
|
2535 if (!ra_idx (ra_idx_len - 1).orig_empty () && ra_idx_len < n_dims) |
| 4887 | 2536 frozen_lengths = short_freeze (ra_idx, dimensions, resize_ok); |
| 2537 else | |
| 4517 | 2538 { |
| 4887 | 2539 new_dims.resize (ra_idx_len, 1); |
| 2540 frozen_lengths = freeze (ra_idx, new_dims, resize_ok); | |
| 4530 | 2541 } |
| 2542 | |
| 4887 | 2543 if (all_ok (ra_idx)) |
| 4530 | 2544 { |
| 4887 | 2545 if (any_orig_empty (ra_idx) || frozen_lengths.any_zero ()) |
| 2546 { | |
| 2547 frozen_lengths.chop_trailing_singletons (); | |
| 2548 | |
| 2549 retval.resize (frozen_lengths); | |
| 2550 } | |
| 2551 else if (frozen_lengths.length () == n_dims | |
| 2552 && all_colon_equiv (ra_idx, dimensions)) | |
| 2553 { | |
| 2554 retval = *this; | |
| 2555 } | |
| 2556 else | |
| 4517 | 2557 { |
| 4887 | 2558 dim_vector frozen_lengths_for_resize = frozen_lengths; |
| 2559 | |
| 2560 frozen_lengths_for_resize.chop_trailing_singletons (); | |
| 2561 | |
| 2562 retval.resize (frozen_lengths_for_resize); | |
| 2563 | |
| 5275 | 2564 octave_idx_type n = retval.length (); |
| 2565 | |
| 2566 Array<octave_idx_type> result_idx (ra_idx.length (), 0); | |
| 2567 | |
| 2568 Array<octave_idx_type> elt_idx; | |
| 2569 | |
| 2570 for (octave_idx_type i = 0; i < n; i++) | |
| 4530 | 2571 { |
| 4887 | 2572 elt_idx = get_elt_idx (ra_idx, result_idx); |
| 2573 | |
| 5275 | 2574 octave_idx_type numelem_elt = get_scalar_idx (elt_idx, new_dims); |
| 4887 | 2575 |
| 5992 | 2576 if (numelem_elt >= length () || numelem_elt < 0) |
| 2577 retval.elem (i) = rfv; | |
| 4887 | 2578 else |
| 2579 retval.elem (i) = elem (numelem_elt); | |
| 2580 | |
| 2581 increment_index (result_idx, frozen_lengths); | |
| 2582 | |
| 4517 | 2583 } |
| 2584 } | |
| 2585 } | |
| 2586 | |
| 2587 return retval; | |
| 2588 } | |
| 2589 | |
| 7433 | 2590 template <class T> |
| 2591 bool | |
| 2592 ascending_compare (T a, T b) | |
| 2593 { | |
| 2594 return (a < b); | |
| 2595 } | |
| 2596 | |
| 2597 template <class T> | |
| 2598 bool | |
| 2599 descending_compare (T a, T b) | |
| 2600 { | |
| 2601 return (a > b); | |
| 2602 } | |
| 2603 | |
| 2604 template <class T> | |
| 2605 bool | |
| 2606 ascending_compare (vec_index<T> *a, vec_index<T> *b) | |
| 2607 { | |
| 2608 return (a->vec < b->vec); | |
| 2609 } | |
| 2610 | |
| 2611 template <class T> | |
| 2612 bool | |
| 2613 descending_compare (vec_index<T> *a, vec_index<T> *b) | |
| 2614 { | |
| 2615 return (a->vec > b->vec); | |
| 2616 } | |
| 2617 | |
| 2618 template <class T> | |
| 2619 Array<T> | |
| 2620 Array<T>::sort (octave_idx_type dim, sortmode mode) const | |
| 2621 { | |
| 2622 Array<T> m = *this; | |
| 2623 | |
| 2624 dim_vector dv = m.dims (); | |
| 2625 | |
| 2626 if (m.length () < 1) | |
| 2627 return m; | |
| 2628 | |
| 2629 octave_idx_type ns = dv(dim); | |
| 2630 octave_idx_type iter = dv.numel () / ns; | |
| 2631 octave_idx_type stride = 1; | |
| 2632 for (int i = 0; i < dim; i++) | |
| 2633 stride *= dv(i); | |
| 2634 | |
| 2635 T *v = m.fortran_vec (); | |
| 2636 octave_sort<T> lsort; | |
| 2637 | |
| 2638 if (mode == ASCENDING) | |
| 2639 lsort.set_compare (ascending_compare); | |
| 2640 else if (mode == DESCENDING) | |
| 2641 lsort.set_compare (descending_compare); | |
|
7463
2467639bd8c0
eliminate UNDEFINED sort mode
John W. Eaton <jwe@octave.org>
parents:
7443
diff
changeset
|
2642 else |
|
2467639bd8c0
eliminate UNDEFINED sort mode
John W. Eaton <jwe@octave.org>
parents:
7443
diff
changeset
|
2643 abort (); |
| 7433 | 2644 |
| 2645 if (stride == 1) | |
| 2646 { | |
| 2647 for (octave_idx_type j = 0; j < iter; j++) | |
| 2648 { | |
| 2649 lsort.sort (v, ns); | |
| 2650 v += ns; | |
| 2651 } | |
| 2652 } | |
| 2653 else | |
| 2654 { | |
| 2655 // Don't use OCTAVE_LOCAL_BUFFER here as it doesn't work with bool | |
| 2656 // on some compilers. | |
| 2657 Array<T> vi (ns); | |
| 2658 T *pvi = vi.fortran_vec (); | |
| 2659 | |
| 2660 for (octave_idx_type j = 0; j < iter; j++) | |
| 2661 { | |
| 2662 octave_idx_type offset = j; | |
| 2663 octave_idx_type offset2 = 0; | |
| 2664 while (offset >= stride) | |
| 2665 { | |
| 2666 offset -= stride; | |
| 2667 offset2++; | |
| 2668 } | |
| 2669 offset += offset2 * stride * ns; | |
| 2670 | |
| 2671 for (octave_idx_type i = 0; i < ns; i++) | |
| 2672 pvi[i] = v[i*stride + offset]; | |
| 2673 | |
| 2674 lsort.sort (pvi, ns); | |
| 2675 | |
| 2676 for (octave_idx_type i = 0; i < ns; i++) | |
| 2677 v[i*stride + offset] = pvi[i]; | |
| 2678 } | |
| 2679 } | |
| 2680 | |
| 2681 return m; | |
| 2682 } | |
| 2683 | |
| 2684 template <class T> | |
| 2685 Array<T> | |
| 2686 Array<T>::sort (Array<octave_idx_type> &sidx, octave_idx_type dim, | |
| 2687 sortmode mode) const | |
| 2688 { | |
| 2689 Array<T> m = *this; | |
| 2690 | |
| 2691 dim_vector dv = m.dims (); | |
| 2692 | |
| 2693 if (m.length () < 1) | |
| 2694 { | |
| 2695 sidx = Array<octave_idx_type> (dv); | |
| 2696 return m; | |
| 2697 } | |
| 2698 | |
| 2699 octave_idx_type ns = dv(dim); | |
| 2700 octave_idx_type iter = dv.numel () / ns; | |
| 2701 octave_idx_type stride = 1; | |
| 2702 for (int i = 0; i < dim; i++) | |
| 2703 stride *= dv(i); | |
| 2704 | |
| 2705 T *v = m.fortran_vec (); | |
| 2706 octave_sort<vec_index<T> *> indexed_sort; | |
| 2707 | |
| 2708 if (mode == ASCENDING) | |
| 2709 indexed_sort.set_compare (ascending_compare); | |
| 2710 else if (mode == DESCENDING) | |
| 2711 indexed_sort.set_compare (descending_compare); | |
|
7463
2467639bd8c0
eliminate UNDEFINED sort mode
John W. Eaton <jwe@octave.org>
parents:
7443
diff
changeset
|
2712 else |
|
2467639bd8c0
eliminate UNDEFINED sort mode
John W. Eaton <jwe@octave.org>
parents:
7443
diff
changeset
|
2713 abort (); |
| 7433 | 2714 |
| 2715 OCTAVE_LOCAL_BUFFER (vec_index<T> *, vi, ns); | |
| 2716 OCTAVE_LOCAL_BUFFER (vec_index<T>, vix, ns); | |
| 2717 | |
| 2718 for (octave_idx_type i = 0; i < ns; i++) | |
| 2719 vi[i] = &vix[i]; | |
| 2720 | |
| 2721 sidx = Array<octave_idx_type> (dv); | |
| 2722 | |
| 2723 if (stride == 1) | |
| 2724 { | |
| 2725 for (octave_idx_type j = 0; j < iter; j++) | |
| 2726 { | |
| 2727 octave_idx_type offset = j * ns; | |
| 2728 | |
| 2729 for (octave_idx_type i = 0; i < ns; i++) | |
| 2730 { | |
| 2731 vi[i]->vec = v[i]; | |
| 2732 vi[i]->indx = i; | |
| 2733 } | |
| 2734 | |
| 2735 indexed_sort.sort (vi, ns); | |
| 2736 | |
| 2737 for (octave_idx_type i = 0; i < ns; i++) | |
| 2738 { | |
| 2739 v[i] = vi[i]->vec; | |
| 2740 sidx(i + offset) = vi[i]->indx; | |
| 2741 } | |
| 2742 v += ns; | |
| 2743 } | |
| 2744 } | |
| 2745 else | |
| 2746 { | |
| 2747 for (octave_idx_type j = 0; j < iter; j++) | |
| 2748 { | |
| 2749 octave_idx_type offset = j; | |
| 2750 octave_idx_type offset2 = 0; | |
| 2751 while (offset >= stride) | |
| 2752 { | |
| 2753 offset -= stride; | |
| 2754 offset2++; | |
| 2755 } | |
| 2756 offset += offset2 * stride * ns; | |
| 2757 | |
| 2758 for (octave_idx_type i = 0; i < ns; i++) | |
| 2759 { | |
| 2760 vi[i]->vec = v[i*stride + offset]; | |
| 2761 vi[i]->indx = i; | |
| 2762 } | |
| 2763 | |
| 2764 indexed_sort.sort (vi, ns); | |
| 2765 | |
| 2766 for (octave_idx_type i = 0; i < ns; i++) | |
| 2767 { | |
| 2768 v[i*stride+offset] = vi[i]->vec; | |
| 2769 sidx(i*stride+offset) = vi[i]->indx; | |
| 2770 } | |
| 2771 } | |
| 2772 } | |
| 2773 | |
| 2774 return m; | |
| 2775 } | |
| 2776 | |
| 7443 | 2777 #if defined (HAVE_IEEE754_DATA_FORMAT) |
| 2778 | |
| 2779 template <> | |
| 7480 | 2780 bool ascending_compare (double, double); |
| 7443 | 2781 template <> |
| 7480 | 2782 bool ascending_compare (vec_index<double>*, vec_index<double>*); |
| 7443 | 2783 template <> |
| 7480 | 2784 bool descending_compare (double, double); |
| 7443 | 2785 template <> |
| 7480 | 2786 bool descending_compare (vec_index<double>*, vec_index<double>*); |
| 7443 | 2787 |
| 2788 template <> | |
| 2789 Array<double> Array<double>::sort (octave_idx_type dim, sortmode mode) const; | |
| 2790 template <> | |
| 2791 Array<double> Array<double>::sort (Array<octave_idx_type> &sidx, | |
| 2792 octave_idx_type dim, sortmode mode) const; | |
| 2793 | |
| 2794 #endif | |
| 2795 | |
|
7620
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2796 template <class T> |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2797 Array<T> |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2798 Array<T>::diag (octave_idx_type k) const |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2799 { |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2800 dim_vector dv = dims (); |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2801 octave_idx_type nd = dv.length (); |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2802 Array<T> d; |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2803 |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2804 if (nd > 2) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2805 (*current_liboctave_error_handler) ("Matrix must be 2-dimensional"); |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2806 else |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2807 { |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2808 octave_idx_type nnr = dv (0); |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2809 octave_idx_type nnc = dv (1); |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2810 |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2811 if (nnr == 0 || nnc == 0) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2812 ; // do nothing |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2813 else if (nnr != 1 && nnc != 1) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2814 { |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2815 if (k > 0) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2816 nnc -= k; |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2817 else if (k < 0) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2818 nnr += k; |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2819 |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2820 if (nnr > 0 && nnc > 0) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2821 { |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2822 octave_idx_type ndiag = (nnr < nnc) ? nnr : nnc; |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2823 |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2824 d.resize (dim_vector (ndiag, 1)); |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2825 |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2826 if (k > 0) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2827 { |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2828 for (octave_idx_type i = 0; i < ndiag; i++) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2829 d.xelem (i) = elem (i, i+k); |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2830 } |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2831 else if (k < 0) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2832 { |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2833 for (octave_idx_type i = 0; i < ndiag; i++) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2834 d.xelem (i) = elem (i-k, i); |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2835 } |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2836 else |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2837 { |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2838 for (octave_idx_type i = 0; i < ndiag; i++) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2839 d.xelem (i) = elem (i, i); |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2840 } |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2841 } |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2842 else |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2843 (*current_liboctave_error_handler) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2844 ("diag: requested diagonal out of range"); |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2845 } |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2846 else if (nnr != 0 && nnc != 0) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2847 { |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2848 octave_idx_type roff = 0; |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2849 octave_idx_type coff = 0; |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2850 if (k > 0) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2851 { |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2852 roff = 0; |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2853 coff = k; |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2854 } |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2855 else if (k < 0) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2856 { |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2857 roff = -k; |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2858 coff = 0; |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2859 } |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2860 |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2861 if (nnr == 1) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2862 { |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2863 octave_idx_type n = nnc + std::abs (k); |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2864 d = Array<T> (dim_vector (n, n), resize_fill_value (T ())); |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2865 |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2866 for (octave_idx_type i = 0; i < nnc; i++) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2867 d.xelem (i+roff, i+coff) = elem (0, i); |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2868 } |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2869 else |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2870 { |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2871 octave_idx_type n = nnr + std::abs (k); |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2872 d = Array<T> (dim_vector (n, n), resize_fill_value (T ())); |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2873 |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2874 for (octave_idx_type i = 0; i < nnr; i++) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2875 d.xelem (i+roff, i+coff) = elem (i, 0); |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2876 } |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2877 } |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2878 } |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2879 |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2880 return d; |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2881 } |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2882 |
| 5775 | 2883 // FIXME -- this is a mess. |
| 4517 | 2884 |
| 2885 template <class LT, class RT> | |
| 2886 int | |
| 2887 assign (Array<LT>& lhs, const Array<RT>& rhs, const LT& rfv) | |
| 2888 { | |
| 6388 | 2889 int n_idx = lhs.index_count (); |
| 2890 | |
| 2891 // kluge... | |
| 2892 if (lhs.ndims () == 0) | |
| 2893 lhs.resize_no_fill (0, 0); | |
| 2894 | |
| 2895 return (lhs.ndims () == 2 | |
| 2896 && (n_idx == 1 | |
| 2897 || (n_idx < 3 | |
| 2898 && rhs.ndims () == 2 | |
| 2899 && rhs.rows () == 0 && rhs.columns () == 0))) | |
| 2900 ? assign2 (lhs, rhs, rfv) : assignN (lhs, rhs, rfv); | |
| 4517 | 2901 } |
| 2902 | |
| 2903 template <class LT, class RT> | |
| 2904 int | |
| 2905 assign1 (Array<LT>& lhs, const Array<RT>& rhs, const LT& rfv) | |
| 2906 { | |
| 2907 int retval = 1; | |
| 2908 | |
| 2909 idx_vector *tmp = lhs.get_idx (); | |
| 2910 | |
| 2911 idx_vector lhs_idx = tmp[0]; | |
| 2912 | |
| 5275 | 2913 octave_idx_type lhs_len = lhs.length (); |
| 2914 octave_idx_type rhs_len = rhs.length (); | |
| 2915 | |
| 5781 | 2916 octave_idx_type n = lhs_idx.freeze (lhs_len, "vector", true); |
| 4517 | 2917 |
| 2918 if (n != 0) | |
| 2919 { | |
| 6389 | 2920 dim_vector lhs_dims = lhs.dims (); |
| 2921 | |
| 6922 | 2922 if (lhs_len != 0 |
| 2923 || lhs_dims.all_zero () | |
| 2924 || (lhs_dims.length () == 2 && lhs_dims(0) < 2)) | |
| 4517 | 2925 { |
| 6392 | 2926 if (rhs_len == n || rhs_len == 1) |
| 2927 { | |
| 6884 | 2928 lhs.make_unique (); |
| 2929 | |
| 6392 | 2930 octave_idx_type max_idx = lhs_idx.max () + 1; |
| 2931 if (max_idx > lhs_len) | |
| 2932 lhs.resize_and_fill (max_idx, rfv); | |
| 2933 } | |
| 2934 | |
| 2935 if (rhs_len == n) | |
| 2936 { | |
| 6884 | 2937 lhs.make_unique (); |
| 2938 | |
| 2939 if (lhs_idx.is_colon ()) | |
| 6392 | 2940 { |
| 6884 | 2941 for (octave_idx_type i = 0; i < n; i++) |
| 2942 lhs.xelem (i) = rhs.elem (i); | |
| 2943 } | |
| 2944 else | |
| 2945 { | |
| 2946 for (octave_idx_type i = 0; i < n; i++) | |
| 2947 { | |
| 2948 octave_idx_type ii = lhs_idx.elem (i); | |
| 2949 lhs.xelem (ii) = rhs.elem (i); | |
| 2950 } | |
| 6392 | 2951 } |
| 2952 } | |
| 2953 else if (rhs_len == 1) | |
| 2954 { | |
| 6884 | 2955 lhs.make_unique (); |
| 2956 | |
| 6392 | 2957 RT scalar = rhs.elem (0); |
| 2958 | |
| 6884 | 2959 if (lhs_idx.is_colon ()) |
| 6392 | 2960 { |
| 6884 | 2961 for (octave_idx_type i = 0; i < n; i++) |
| 2962 lhs.xelem (i) = scalar; | |
| 2963 } | |
| 2964 else | |
| 2965 { | |
| 2966 for (octave_idx_type i = 0; i < n; i++) | |
| 2967 { | |
| 2968 octave_idx_type ii = lhs_idx.elem (i); | |
| 2969 lhs.xelem (ii) = scalar; | |
| 2970 } | |
| 6392 | 2971 } |
| 2972 } | |
| 2973 else | |
| 2974 { | |
| 2975 (*current_liboctave_error_handler) | |
| 2976 ("A(I) = X: X must be a scalar or a vector with same length as I"); | |
| 2977 | |
| 2978 retval = 0; | |
| 2979 } | |
| 4517 | 2980 } |
| 6922 | 2981 else |
| 2982 { | |
| 2983 (*current_liboctave_error_handler) | |
| 2984 ("A(I) = X: unable to resize A"); | |
| 2985 | |
| 2986 retval = 0; | |
| 2987 } | |
| 4517 | 2988 } |
| 2989 else if (lhs_idx.is_colon ()) | |
| 2990 { | |
| 6384 | 2991 dim_vector lhs_dims = lhs.dims (); |
| 2992 | |
| 2993 if (lhs_dims.all_zero ()) | |
| 4517 | 2994 { |
| 6884 | 2995 lhs.make_unique (); |
| 2996 | |
| 4517 | 2997 lhs.resize_no_fill (rhs_len); |
| 2998 | |
| 5275 | 2999 for (octave_idx_type i = 0; i < rhs_len; i++) |
| 6884 | 3000 lhs.xelem (i) = rhs.elem (i); |
| 4517 | 3001 } |
| 6553 | 3002 else if (rhs_len != lhs_len) |
| 4517 | 3003 (*current_liboctave_error_handler) |
| 3004 ("A(:) = X: A must be the same size as X"); | |
| 3005 } | |
| 3006 else if (! (rhs_len == 1 || rhs_len == 0)) | |
| 3007 { | |
| 3008 (*current_liboctave_error_handler) | |
| 3009 ("A([]) = X: X must also be an empty matrix or a scalar"); | |
| 3010 | |
| 3011 retval = 0; | |
| 3012 } | |
| 3013 | |
| 3014 lhs.clear_index (); | |
| 3015 | |
| 3016 return retval; | |
| 3017 } | |
| 3018 | |
| 3019 #define MAYBE_RESIZE_LHS \ | |
| 3020 do \ | |
| 3021 { \ | |
| 5275 | 3022 octave_idx_type max_row_idx = idx_i_is_colon ? rhs_nr : idx_i.max () + 1; \ |
| 3023 octave_idx_type max_col_idx = idx_j_is_colon ? rhs_nc : idx_j.max () + 1; \ | |
| 4517 | 3024 \ |
| 5275 | 3025 octave_idx_type new_nr = max_row_idx > lhs_nr ? max_row_idx : lhs_nr; \ |
| 3026 octave_idx_type new_nc = max_col_idx > lhs_nc ? max_col_idx : lhs_nc; \ | |
| 4517 | 3027 \ |
| 3028 lhs.resize_and_fill (new_nr, new_nc, rfv); \ | |
| 3029 } \ | |
| 3030 while (0) | |
| 3031 | |
| 3032 template <class LT, class RT> | |
| 3033 int | |
| 3034 assign2 (Array<LT>& lhs, const Array<RT>& rhs, const LT& rfv) | |
| 3035 { | |
| 3036 int retval = 1; | |
| 3037 | |
| 3038 int n_idx = lhs.index_count (); | |
| 3039 | |
| 5275 | 3040 octave_idx_type lhs_nr = lhs.rows (); |
| 3041 octave_idx_type lhs_nc = lhs.cols (); | |
| 4517 | 3042 |
| 5047 | 3043 Array<RT> xrhs = rhs; |
| 3044 | |
| 5275 | 3045 octave_idx_type rhs_nr = xrhs.rows (); |
| 3046 octave_idx_type rhs_nc = xrhs.cols (); | |
| 5047 | 3047 |
| 3048 if (xrhs.ndims () > 2) | |
| 4707 | 3049 { |
| 5047 | 3050 xrhs = xrhs.squeeze (); |
| 3051 | |
| 3052 dim_vector dv_tmp = xrhs.dims (); | |
| 4709 | 3053 |
| 4708 | 3054 switch (dv_tmp.length ()) |
| 4707 | 3055 { |
| 4708 | 3056 case 1: |
| 5775 | 3057 // FIXME -- this case should be unnecessary, because |
| 5047 | 3058 // squeeze should always return an object with 2 dimensions. |
| 4708 | 3059 if (rhs_nr == 1) |
| 3060 rhs_nc = dv_tmp.elem (0); | |
| 3061 break; | |
| 4709 | 3062 |
| 4708 | 3063 case 2: |
| 4707 | 3064 rhs_nr = dv_tmp.elem (0); |
| 3065 rhs_nc = dv_tmp.elem (1); | |
| 4708 | 3066 break; |
| 3067 | |
| 3068 default: | |
| 3069 (*current_liboctave_error_handler) | |
| 3070 ("Array<T>::assign2: Dimension mismatch"); | |
| 4709 | 3071 return 0; |
| 4707 | 3072 } |
| 3073 } | |
| 4517 | 3074 |
| 6384 | 3075 bool rhs_is_scalar = rhs_nr == 1 && rhs_nc == 1; |
| 3076 | |
| 4517 | 3077 idx_vector *tmp = lhs.get_idx (); |
| 3078 | |
| 3079 idx_vector idx_i; | |
| 3080 idx_vector idx_j; | |
| 3081 | |
| 3082 if (n_idx > 1) | |
| 3083 idx_j = tmp[1]; | |
| 3084 | |
| 3085 if (n_idx > 0) | |
| 3086 idx_i = tmp[0]; | |
| 3087 | |
| 3088 if (n_idx == 2) | |
| 3089 { | |
| 5781 | 3090 octave_idx_type n = idx_i.freeze (lhs_nr, "row", true); |
| 3091 octave_idx_type m = idx_j.freeze (lhs_nc, "column", true); | |
| 4517 | 3092 |
| 3093 int idx_i_is_colon = idx_i.is_colon (); | |
| 3094 int idx_j_is_colon = idx_j.is_colon (); | |
| 3095 | |
| 6384 | 3096 if (lhs_nr == 0 && lhs_nc == 0) |
| 3097 { | |
| 3098 if (idx_i_is_colon) | |
| 3099 n = rhs_nr; | |
| 3100 | |
| 3101 if (idx_j_is_colon) | |
| 3102 m = rhs_nc; | |
| 3103 } | |
| 4517 | 3104 |
| 3105 if (idx_i && idx_j) | |
| 3106 { | |
| 3107 if (rhs_nr == 0 && rhs_nc == 0) | |
| 3108 { | |
| 3109 lhs.maybe_delete_elements (idx_i, idx_j); | |
| 3110 } | |
| 3111 else | |
| 3112 { | |
| 6384 | 3113 if (rhs_is_scalar && n >= 0 && m >= 0) |
| 4517 | 3114 { |
| 4534 | 3115 // No need to do anything if either of the indices |
| 3116 // are empty. | |
| 3117 | |
| 3118 if (n > 0 && m > 0) | |
| 4517 | 3119 { |
| 6884 | 3120 lhs.make_unique (); |
| 3121 | |
| 4534 | 3122 MAYBE_RESIZE_LHS; |
| 3123 | |
| 5047 | 3124 RT scalar = xrhs.elem (0, 0); |
| 4534 | 3125 |
| 5275 | 3126 for (octave_idx_type j = 0; j < m; j++) |
| 4517 | 3127 { |
| 5275 | 3128 octave_idx_type jj = idx_j.elem (j); |
| 3129 for (octave_idx_type i = 0; i < n; i++) | |
| 4534 | 3130 { |
| 5275 | 3131 octave_idx_type ii = idx_i.elem (i); |
| 6884 | 3132 lhs.xelem (ii, jj) = scalar; |
| 4534 | 3133 } |
| 4517 | 3134 } |
| 3135 } | |
| 3136 } | |
| 6072 | 3137 else if ((n == 1 || m == 1) |
| 3138 && (rhs_nr == 1 || rhs_nc == 1) | |
| 3139 && n * m == rhs_nr * rhs_nc) | |
| 3140 { | |
| 6884 | 3141 lhs.make_unique (); |
| 3142 | |
| 6384 | 3143 MAYBE_RESIZE_LHS; |
| 3144 | |
| 6072 | 3145 if (n > 0 && m > 0) |
| 3146 { | |
| 3147 octave_idx_type k = 0; | |
| 3148 | |
| 3149 for (octave_idx_type j = 0; j < m; j++) | |
| 3150 { | |
| 3151 octave_idx_type jj = idx_j.elem (j); | |
| 3152 for (octave_idx_type i = 0; i < n; i++) | |
| 3153 { | |
| 3154 octave_idx_type ii = idx_i.elem (i); | |
| 6884 | 3155 lhs.xelem (ii, jj) = xrhs.elem (k++); |
| 6072 | 3156 } |
| 3157 } | |
| 3158 } | |
| 3159 } | |
| 4517 | 3160 else if (n == rhs_nr && m == rhs_nc) |
| 3161 { | |
| 6884 | 3162 lhs.make_unique (); |
| 3163 | |
| 6384 | 3164 MAYBE_RESIZE_LHS; |
| 3165 | |
| 4517 | 3166 if (n > 0 && m > 0) |
| 3167 { | |
| 5275 | 3168 for (octave_idx_type j = 0; j < m; j++) |
| 4517 | 3169 { |
| 5275 | 3170 octave_idx_type jj = idx_j.elem (j); |
| 3171 for (octave_idx_type i = 0; i < n; i++) | |
| 4517 | 3172 { |
| 5275 | 3173 octave_idx_type ii = idx_i.elem (i); |
| 6884 | 3174 lhs.xelem (ii, jj) = xrhs.elem (i, j); |
| 4517 | 3175 } |
| 3176 } | |
| 3177 } | |
| 3178 } | |
| 3179 else if (n == 0 && m == 0) | |
| 3180 { | |
| 6384 | 3181 if (! (rhs_is_scalar || (rhs_nr == 0 || rhs_nc == 0))) |
| 4517 | 3182 { |
| 3183 (*current_liboctave_error_handler) | |
| 3184 ("A([], []) = X: X must be an empty matrix or a scalar"); | |
| 3185 | |
| 3186 retval = 0; | |
| 3187 } | |
| 3188 } | |
| 3189 else | |
| 3190 { | |
| 3191 (*current_liboctave_error_handler) | |
| 3192 ("A(I, J) = X: X must be a scalar or the number of elements in I must"); | |
| 3193 (*current_liboctave_error_handler) | |
| 3194 ("match the number of rows in X and the number of elements in J must"); | |
| 3195 (*current_liboctave_error_handler) | |
| 3196 ("match the number of columns in X"); | |
| 3197 | |
| 3198 retval = 0; | |
| 3199 } | |
| 3200 } | |
| 3201 } | |
| 3202 // idx_vector::freeze() printed an error message for us. | |
| 3203 } | |
| 3204 else if (n_idx == 1) | |
| 3205 { | |
| 3206 int lhs_is_empty = lhs_nr == 0 || lhs_nc == 0; | |
| 3207 | |
| 3208 if (lhs_is_empty || (lhs_nr == 1 && lhs_nc == 1)) | |
| 3209 { | |
| 5275 | 3210 octave_idx_type lhs_len = lhs.length (); |
| 3211 | |
| 6384 | 3212 idx_i.freeze (lhs_len, 0, true); |
| 4517 | 3213 |
| 3214 if (idx_i) | |
| 3215 { | |
| 3216 if (rhs_nr == 0 && rhs_nc == 0) | |
| 3217 { | |
| 6384 | 3218 lhs.maybe_delete_elements (idx_i); |
| 4517 | 3219 } |
| 3220 else | |
| 3221 { | |
| 5781 | 3222 if (lhs_is_empty |
| 3223 && idx_i.is_colon () | |
| 3224 && ! (rhs_nr == 1 || rhs_nc == 1)) | |
| 4517 | 3225 { |
| 5781 | 3226 (*current_liboctave_warning_with_id_handler) |
| 3227 ("Octave:fortran-indexing", | |
| 3228 "A(:) = X: X is not a vector or scalar"); | |
| 3229 } | |
| 3230 else | |
| 3231 { | |
| 3232 octave_idx_type idx_nr = idx_i.orig_rows (); | |
| 3233 octave_idx_type idx_nc = idx_i.orig_columns (); | |
| 3234 | |
| 3235 if (! (rhs_nr == idx_nr && rhs_nc == idx_nc)) | |
| 3236 (*current_liboctave_warning_with_id_handler) | |
| 3237 ("Octave:fortran-indexing", | |
| 3238 "A(I) = X: X does not have same shape as I"); | |
| 4517 | 3239 } |
| 3240 | |
| 5047 | 3241 if (assign1 (lhs, xrhs, rfv)) |
| 4517 | 3242 { |
| 5275 | 3243 octave_idx_type len = lhs.length (); |
| 4517 | 3244 |
| 3245 if (len > 0) | |
| 3246 { | |
| 3247 // The following behavior is much simplified | |
| 3248 // over previous versions of Octave. It | |
| 3249 // seems to be compatible with Matlab. | |
| 3250 | |
| 3251 lhs.dimensions = dim_vector (1, lhs.length ()); | |
| 3252 } | |
| 3253 } | |
| 3254 else | |
| 3255 retval = 0; | |
| 3256 } | |
| 3257 } | |
| 3258 // idx_vector::freeze() printed an error message for us. | |
| 3259 } | |
| 3260 else if (lhs_nr == 1) | |
| 3261 { | |
| 5781 | 3262 idx_i.freeze (lhs_nc, "vector", true); |
| 4517 | 3263 |
| 3264 if (idx_i) | |
| 3265 { | |
| 3266 if (rhs_nr == 0 && rhs_nc == 0) | |
| 3267 lhs.maybe_delete_elements (idx_i); | |
| 3268 else | |
| 3269 { | |
| 5047 | 3270 if (assign1 (lhs, xrhs, rfv)) |
| 4517 | 3271 lhs.dimensions = dim_vector (1, lhs.length ()); |
| 3272 else | |
| 3273 retval = 0; | |
| 3274 } | |
| 3275 } | |
| 3276 // idx_vector::freeze() printed an error message for us. | |
| 3277 } | |
| 3278 else if (lhs_nc == 1) | |
| 3279 { | |
| 5781 | 3280 idx_i.freeze (lhs_nr, "vector", true); |
| 4517 | 3281 |
| 3282 if (idx_i) | |
| 3283 { | |
| 3284 if (rhs_nr == 0 && rhs_nc == 0) | |
| 3285 lhs.maybe_delete_elements (idx_i); | |
| 3286 else | |
| 3287 { | |
| 5047 | 3288 if (assign1 (lhs, xrhs, rfv)) |
| 4517 | 3289 lhs.dimensions = dim_vector (lhs.length (), 1); |
| 3290 else | |
| 3291 retval = 0; | |
| 3292 } | |
| 3293 } | |
| 3294 // idx_vector::freeze() printed an error message for us. | |
| 3295 } | |
| 3296 else | |
| 3297 { | |
|
7573
755bf7ecc29b
eliminate one_zero stuff from idx_vector
John W. Eaton <jwe@octave.org>
parents:
7480
diff
changeset
|
3298 if (! idx_i.is_colon ()) |
| 5781 | 3299 (*current_liboctave_warning_with_id_handler) |
| 3300 ("Octave:fortran-indexing", "single index used for matrix"); | |
| 4517 | 3301 |
| 5275 | 3302 octave_idx_type len = idx_i.freeze (lhs_nr * lhs_nc, "matrix"); |
| 4517 | 3303 |
| 3304 if (idx_i) | |
| 3305 { | |
| 4756 | 3306 if (rhs_nr == 0 && rhs_nc == 0) |
| 3307 lhs.maybe_delete_elements (idx_i); | |
| 3308 else if (len == 0) | |
| 4517 | 3309 { |
| 6384 | 3310 if (! (rhs_is_scalar || (rhs_nr == 0 || rhs_nc == 0))) |
| 4517 | 3311 (*current_liboctave_error_handler) |
| 3312 ("A([]) = X: X must be an empty matrix or scalar"); | |
| 3313 } | |
| 3314 else if (len == rhs_nr * rhs_nc) | |
| 3315 { | |
| 6884 | 3316 lhs.make_unique (); |
| 3317 | |
| 3318 if (idx_i.is_colon ()) | |
| 4517 | 3319 { |
| 6884 | 3320 for (octave_idx_type i = 0; i < len; i++) |
| 3321 lhs.xelem (i) = xrhs.elem (i); | |
| 3322 } | |
| 3323 else | |
| 3324 { | |
| 3325 for (octave_idx_type i = 0; i < len; i++) | |
| 3326 { | |
| 3327 octave_idx_type ii = idx_i.elem (i); | |
| 3328 lhs.xelem (ii) = xrhs.elem (i); | |
| 3329 } | |
| 4517 | 3330 } |
| 3331 } | |
| 6384 | 3332 else if (rhs_is_scalar) |
| 4517 | 3333 { |
| 6884 | 3334 lhs.make_unique (); |
| 3335 | |
| 4517 | 3336 RT scalar = rhs.elem (0, 0); |
| 3337 | |
| 6884 | 3338 if (idx_i.is_colon ()) |
| 4517 | 3339 { |
| 6884 | 3340 for (octave_idx_type i = 0; i < len; i++) |
| 3341 lhs.xelem (i) = scalar; | |
| 3342 } | |
| 3343 else | |
| 3344 { | |
| 3345 for (octave_idx_type i = 0; i < len; i++) | |
| 3346 { | |
| 3347 octave_idx_type ii = idx_i.elem (i); | |
| 3348 lhs.xelem (ii) = scalar; | |
| 3349 } | |
| 4517 | 3350 } |
| 3351 } | |
| 3352 else | |
| 3353 { | |
| 3354 (*current_liboctave_error_handler) | |
| 3355 ("A(I) = X: X must be a scalar or a matrix with the same size as I"); | |
| 3356 | |
| 3357 retval = 0; | |
| 3358 } | |
| 3359 } | |
| 3360 // idx_vector::freeze() printed an error message for us. | |
| 3361 } | |
| 3362 } | |
| 3363 else | |
| 3364 { | |
| 3365 (*current_liboctave_error_handler) | |
| 3366 ("invalid number of indices for matrix expression"); | |
| 3367 | |
| 3368 retval = 0; | |
| 3369 } | |
| 3370 | |
| 3371 lhs.clear_index (); | |
| 3372 | |
| 3373 return retval; | |
| 3374 } | |
| 3375 | |
| 3376 template <class LT, class RT> | |
| 3377 int | |
| 3378 assignN (Array<LT>& lhs, const Array<RT>& rhs, const LT& rfv) | |
| 3379 { | |
| 3380 int retval = 1; | |
| 3381 | |
| 4746 | 3382 dim_vector rhs_dims = rhs.dims (); |
| 3383 | |
| 5275 | 3384 octave_idx_type rhs_dims_len = rhs_dims.length (); |
| 4746 | 3385 |
| 3386 bool rhs_is_scalar = is_scalar (rhs_dims); | |
| 3387 | |
| 4517 | 3388 int n_idx = lhs.index_count (); |
| 3389 | |
| 4745 | 3390 idx_vector *idx_vex = lhs.get_idx (); |
| 3391 | |
| 3392 Array<idx_vector> idx = conv_to_array (idx_vex, n_idx); | |
| 4517 | 3393 |
| 4743 | 3394 if (rhs_dims_len == 2 && rhs_dims(0) == 0 && rhs_dims(1) == 0) |
| 4517 | 3395 { |
| 3396 lhs.maybe_delete_elements (idx, rfv); | |
| 3397 } | |
| 5285 | 3398 else if (n_idx == 0) |
| 3399 { | |
| 3400 (*current_liboctave_error_handler) | |
| 3401 ("invalid number of indices for matrix expression"); | |
| 3402 | |
| 3403 retval = 0; | |
| 3404 } | |
| 4657 | 3405 else if (n_idx == 1) |
| 4517 | 3406 { |
| 4657 | 3407 idx_vector iidx = idx(0); |
| 6884 | 3408 int iidx_is_colon = iidx.is_colon (); |
| 3409 | |
|
7573
755bf7ecc29b
eliminate one_zero stuff from idx_vector
John W. Eaton <jwe@octave.org>
parents:
7480
diff
changeset
|
3410 if (! iidx_is_colon) |
| 5781 | 3411 (*current_liboctave_warning_with_id_handler) |
| 3412 ("Octave:fortran-indexing", "single index used for N-d array"); | |
| 4657 | 3413 |
| 5275 | 3414 octave_idx_type lhs_len = lhs.length (); |
| 3415 | |
| 3416 octave_idx_type len = iidx.freeze (lhs_len, "N-d arrray"); | |
| 4657 | 3417 |
| 3418 if (iidx) | |
| 4533 | 3419 { |
| 4657 | 3420 if (len == 0) |
| 4656 | 3421 { |
| 5039 | 3422 if (! (rhs_dims.all_ones () || rhs_dims.any_zero ())) |
| 4743 | 3423 { |
| 3424 (*current_liboctave_error_handler) | |
| 3425 ("A([]) = X: X must be an empty matrix or scalar"); | |
| 3426 | |
| 3427 retval = 0; | |
| 3428 } | |
| 4657 | 3429 } |
| 3430 else if (len == rhs.length ()) | |
| 3431 { | |
| 6884 | 3432 lhs.make_unique (); |
| 3433 | |
| 3434 if (iidx_is_colon) | |
| 4656 | 3435 { |
| 6884 | 3436 for (octave_idx_type i = 0; i < len; i++) |
| 3437 lhs.xelem (i) = rhs.elem (i); | |
| 3438 } | |
| 3439 else | |
| 3440 { | |
| 3441 for (octave_idx_type i = 0; i < len; i++) | |
| 3442 { | |
| 3443 octave_idx_type ii = iidx.elem (i); | |
| 3444 | |
| 3445 lhs.xelem (ii) = rhs.elem (i); | |
| 3446 } | |
| 4656 | 3447 } |
| 3448 } | |
| 4716 | 3449 else if (rhs_is_scalar) |
| 4657 | 3450 { |
| 3451 RT scalar = rhs.elem (0); | |
| 3452 | |
| 6884 | 3453 lhs.make_unique (); |
| 3454 | |
| 3455 if (iidx_is_colon) | |
| 4657 | 3456 { |
| 6884 | 3457 for (octave_idx_type i = 0; i < len; i++) |
| 3458 lhs.xelem (i) = scalar; | |
| 3459 } | |
| 3460 else | |
| 3461 { | |
| 3462 for (octave_idx_type i = 0; i < len; i++) | |
| 3463 { | |
| 3464 octave_idx_type ii = iidx.elem (i); | |
| 3465 | |
| 3466 lhs.xelem (ii) = scalar; | |
| 3467 } | |
| 4657 | 3468 } |
| 3469 } | |
| 3470 else | |
| 3471 { | |
| 3472 (*current_liboctave_error_handler) | |
| 4702 | 3473 ("A(I) = X: X must be a scalar or a matrix with the same size as I"); |
| 3474 | |
| 4657 | 3475 retval = 0; |
| 3476 } | |
| 3477 | |
| 4656 | 3478 // idx_vector::freeze() printed an error message for us. |
| 4533 | 3479 } |
| 4702 | 3480 } |
| 4743 | 3481 else |
| 4702 | 3482 { |
| 4746 | 3483 // Maybe expand to more dimensions. |
| 3484 | |
| 3485 dim_vector lhs_dims = lhs.dims (); | |
| 3486 | |
| 5275 | 3487 octave_idx_type lhs_dims_len = lhs_dims.length (); |
| 4746 | 3488 |
| 3489 dim_vector final_lhs_dims = lhs_dims; | |
| 3490 | |
| 3491 dim_vector frozen_len; | |
| 3492 | |
| 5275 | 3493 octave_idx_type orig_lhs_dims_len = lhs_dims_len; |
| 4747 | 3494 |
| 3495 bool orig_empty = lhs_dims.all_zero (); | |
| 3496 | |
| 3497 if (n_idx < lhs_dims_len) | |
| 4517 | 3498 { |
| 5052 | 3499 // Collapse dimensions beyond last index. Note that we |
| 3500 // delay resizing LHS until we know that the assignment will | |
| 3501 // succeed. | |
| 4747 | 3502 |
| 5781 | 3503 if (! (idx(n_idx-1).is_colon ())) |
| 3504 (*current_liboctave_warning_with_id_handler) | |
| 3505 ("Octave:fortran-indexing", | |
| 3506 "fewer indices than dimensions for N-d array"); | |
| 4747 | 3507 |
| 3508 for (int i = n_idx; i < lhs_dims_len; i++) | |
| 3509 lhs_dims(n_idx-1) *= lhs_dims(i); | |
| 3510 | |
| 3511 lhs_dims.resize (n_idx); | |
| 3512 | |
| 3513 lhs_dims_len = lhs_dims.length (); | |
| 3514 } | |
| 3515 | |
| 3516 // Resize. | |
| 3517 | |
| 3518 dim_vector new_dims; | |
| 3519 new_dims.resize (n_idx); | |
| 3520 | |
| 5264 | 3521 if (orig_empty) |
| 4747 | 3522 { |
|
7642
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3523 if (rhs_is_scalar) |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3524 { |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3525 for (int i = 0; i < n_idx; i++) |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3526 { |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3527 if (idx(i).is_colon ()) |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3528 new_dims(i) = 1; |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3529 else |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3530 new_dims(i) = idx(i).orig_empty () ? 0 : idx(i).max () + 1; |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3531 } |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3532 } |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3533 else if (is_vector (rhs_dims)) |
| 4746 | 3534 { |
|
7642
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3535 int ncolon = 0; |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3536 int fcolon = 0; |
|
7646
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3537 octave_idx_type new_dims_numel = 1; |
|
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3538 int new_dims_vec = 0; |
|
7642
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3539 for (int i = 0; i < n_idx; i++) |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3540 if (idx(i).is_colon ()) |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3541 { |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3542 ncolon ++; |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3543 if (ncolon == 1) |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3544 fcolon = i; |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3545 } |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3546 else |
|
7646
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3547 { |
|
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3548 octave_idx_type cap = idx(i).capacity (); |
|
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3549 new_dims_numel *= cap; |
|
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3550 if (cap != 1) |
|
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3551 new_dims_vec ++; |
|
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3552 } |
|
7642
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3553 |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3554 if (ncolon == n_idx) |
| 5264 | 3555 { |
|
7642
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3556 new_dims = rhs_dims; |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3557 new_dims.resize (n_idx); |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3558 for (int i = rhs_dims_len; i < n_idx; i++) |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3559 new_dims (i) = 1; |
| 5379 | 3560 } |
| 3561 else | |
| 3562 { | |
|
7642
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3563 octave_idx_type rhs_dims_numel = rhs_dims.numel (); |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3564 |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3565 for (int i = 0; i < n_idx; i++) |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3566 new_dims(i) = idx(i).orig_empty () ? 0 : idx(i).max () + 1; |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3567 |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3568 if (new_dims_numel != rhs_dims_numel && |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3569 ncolon > 0 && new_dims_numel == 1) |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3570 { |
|
7646
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3571 if (ncolon == rhs_dims_len) |
|
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3572 { |
|
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3573 int k = 0; |
|
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3574 for (int i = 0; i < n_idx; i++) |
|
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3575 if (idx(i).is_colon ()) |
|
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3576 new_dims (i) = rhs_dims (k++); |
|
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3577 } |
|
7642
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3578 else |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3579 new_dims (fcolon) = rhs_dims_numel; |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3580 } |
|
7646
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3581 else if (new_dims_numel != rhs_dims_numel || new_dims_vec > 1) |
| 5264 | 3582 { |
| 3583 (*current_liboctave_error_handler) | |
| 5379 | 3584 ("A(IDX-LIST) = RHS: mismatched index and RHS dimension"); |
| 5264 | 3585 return retval; |
| 3586 } | |
|
7642
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3587 } |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3588 } |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3589 else |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3590 { |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3591 int k = 0; |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3592 for (int i = 0; i < n_idx; i++) |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3593 { |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3594 if (idx(i).is_colon ()) |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3595 { |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3596 if (k < rhs_dims_len) |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3597 new_dims(i) = rhs_dims(k++); |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3598 else |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3599 new_dims(i) = 1; |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3600 } |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3601 else |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3602 { |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3603 octave_idx_type nelem = idx(i).capacity (); |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3604 |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3605 if (nelem >= 1 |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3606 && (k < rhs_dims_len && nelem == rhs_dims(k))) |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3607 k++; |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3608 else if (nelem != 1) |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3609 { |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3610 (*current_liboctave_error_handler) |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3611 ("A(IDX-LIST) = RHS: mismatched index and RHS dimension"); |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3612 return retval; |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3613 } |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3614 new_dims(i) = idx(i).orig_empty () ? 0 : |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3615 idx(i).max () + 1; |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3616 } |
| 5264 | 3617 } |
| 4746 | 3618 } |
| 5264 | 3619 } |
| 3620 else | |
| 3621 { | |
| 3622 for (int i = 0; i < n_idx; i++) | |
| 4746 | 3623 { |
| 4747 | 3624 // We didn't start out with all zero dimensions, so if |
| 3625 // index is a colon, it refers to the current LHS | |
| 3626 // dimension. Otherwise, it is OK to enlarge to a | |
| 5264 | 3627 // dimension given by the largest index, but if that |
| 4898 | 3628 // index is a colon the new dimension is singleton. |
| 4749 | 3629 |
| 3630 if (i < lhs_dims_len | |
| 6481 | 3631 && (idx(i).is_colon () |
| 3632 || idx(i).orig_empty () | |
| 3633 || idx(i).max () < lhs_dims(i))) | |
| 4749 | 3634 new_dims(i) = lhs_dims(i); |
| 3635 else if (! idx(i).is_colon ()) | |
| 3636 new_dims(i) = idx(i).max () + 1; | |
| 3637 else | |
| 4898 | 3638 new_dims(i) = 1; |
| 4745 | 3639 } |
| 4747 | 3640 } |
| 3641 | |
| 4749 | 3642 if (retval != 0) |
| 4747 | 3643 { |
| 4749 | 3644 if (! orig_empty |
| 3645 && n_idx < orig_lhs_dims_len | |
| 3646 && new_dims(n_idx-1) != lhs_dims(n_idx-1)) | |
| 4702 | 3647 { |
| 4749 | 3648 // We reshaped and the last dimension changed. This has to |
| 3649 // be an error, because we don't know how to undo that | |
| 3650 // later... | |
| 3651 | |
| 3652 (*current_liboctave_error_handler) | |
| 3653 ("array index %d (= %d) for assignment requires invalid resizing operation", | |
| 3654 n_idx, new_dims(n_idx-1)); | |
| 3655 | |
| 3656 retval = 0; | |
| 4743 | 3657 } |
| 3658 else | |
| 3659 { | |
| 5052 | 3660 // Determine final dimensions for LHS and reset the |
| 3661 // current size of the LHS. Note that we delay actually | |
| 3662 // resizing LHS until we know that the assignment will | |
| 3663 // succeed. | |
| 3664 | |
| 4749 | 3665 if (n_idx < orig_lhs_dims_len) |
| 4743 | 3666 { |
| 4749 | 3667 for (int i = 0; i < n_idx-1; i++) |
| 3668 final_lhs_dims(i) = new_dims(i); | |
| 4747 | 3669 } |
| 3670 else | |
| 4749 | 3671 final_lhs_dims = new_dims; |
| 3672 | |
| 5837 | 3673 lhs_dims_len = new_dims.length (); |
| 3674 | |
| 3675 frozen_len = freeze (idx, new_dims, true); | |
| 4749 | 3676 |
| 6141 | 3677 for (int i = 0; i < idx.length (); i++) |
| 3678 { | |
| 3679 if (! idx(i)) | |
| 3680 { | |
| 3681 retval = 0; | |
| 3682 lhs.clear_index (); | |
| 3683 return retval; | |
| 3684 } | |
| 3685 } | |
| 3686 | |
| 4749 | 3687 if (rhs_is_scalar) |
| 4747 | 3688 { |
| 6884 | 3689 lhs.make_unique (); |
| 3690 | |
| 5837 | 3691 if (n_idx < orig_lhs_dims_len) |
| 3692 lhs = lhs.reshape (lhs_dims); | |
| 3693 | |
| 5052 | 3694 lhs.resize_and_fill (new_dims, rfv); |
| 3695 | |
| 4747 | 3696 if (! final_lhs_dims.any_zero ()) |
| 3697 { | |
| 4749 | 3698 RT scalar = rhs.elem (0); |
| 3699 | |
| 6388 | 3700 if (n_idx == 1) |
| 3701 { | |
| 3702 idx_vector iidx = idx(0); | |
| 3703 | |
| 3704 octave_idx_type len = frozen_len(0); | |
| 3705 | |
| 6884 | 3706 if (iidx.is_colon ()) |
| 3707 { | |
| 3708 for (octave_idx_type i = 0; i < len; i++) | |
| 3709 lhs.xelem (i) = scalar; | |
| 3710 } | |
| 3711 else | |
| 6388 | 3712 { |
| 6884 | 3713 for (octave_idx_type i = 0; i < len; i++) |
| 3714 { | |
| 3715 octave_idx_type ii = iidx.elem (i); | |
| 3716 | |
| 3717 lhs.xelem (ii) = scalar; | |
| 3718 } | |
| 6388 | 3719 } |
| 3720 } | |
| 3721 else if (lhs_dims_len == 2 && n_idx == 2) | |
| 4747 | 3722 { |
| 6388 | 3723 idx_vector idx_i = idx(0); |
| 3724 idx_vector idx_j = idx(1); | |
| 3725 | |
| 3726 octave_idx_type i_len = frozen_len(0); | |
| 3727 octave_idx_type j_len = frozen_len(1); | |
| 3728 | |
| 6884 | 3729 if (idx_i.is_colon()) |
| 6388 | 3730 { |
| 6884 | 3731 for (octave_idx_type j = 0; j < j_len; j++) |
| 6388 | 3732 { |
| 6884 | 3733 octave_idx_type off = new_dims (0) * |
| 3734 idx_j.elem (j); | |
| 3735 for (octave_idx_type i = 0; i < i_len; i++) | |
| 3736 lhs.xelem (i + off) = scalar; | |
| 3737 } | |
| 3738 } | |
| 3739 else | |
| 3740 { | |
| 3741 for (octave_idx_type j = 0; j < j_len; j++) | |
| 3742 { | |
| 3743 octave_idx_type off = new_dims (0) * | |
| 3744 idx_j.elem (j); | |
| 3745 for (octave_idx_type i = 0; i < i_len; i++) | |
| 3746 { | |
| 3747 octave_idx_type ii = idx_i.elem (i); | |
| 3748 lhs.xelem (ii + off) = scalar; | |
| 3749 } | |
| 6388 | 3750 } |
| 3751 } | |
| 3752 } | |
| 3753 else | |
| 3754 { | |
| 3755 octave_idx_type n = Array<LT>::get_size (frozen_len); | |
| 3756 | |
| 3757 Array<octave_idx_type> result_idx (lhs_dims_len, 0); | |
| 3758 | |
| 3759 for (octave_idx_type i = 0; i < n; i++) | |
| 3760 { | |
| 3761 Array<octave_idx_type> elt_idx = get_elt_idx (idx, result_idx); | |
| 3762 | |
| 6884 | 3763 lhs.xelem (elt_idx) = scalar; |
| 6388 | 3764 |
| 3765 increment_index (result_idx, frozen_len); | |
| 3766 } | |
| 4747 | 3767 } |
| 3768 } | |
| 4743 | 3769 } |
| 4749 | 3770 else |
| 3771 { | |
| 3772 // RHS is matrix or higher dimension. | |
| 3773 | |
| 5275 | 3774 octave_idx_type n = Array<LT>::get_size (frozen_len); |
| 5264 | 3775 |
| 3776 if (n != rhs.numel ()) | |
| 4749 | 3777 { |
| 3778 (*current_liboctave_error_handler) | |
| 3779 ("A(IDX-LIST) = X: X must be a scalar or size of X must equal number of elements indexed by IDX-LIST"); | |
| 3780 | |
| 3781 retval = 0; | |
| 3782 } | |
| 3783 else | |
| 3784 { | |
| 6884 | 3785 lhs.make_unique (); |
| 3786 | |
| 5837 | 3787 if (n_idx < orig_lhs_dims_len) |
| 3788 lhs = lhs.reshape (lhs_dims); | |
| 3789 | |
| 5052 | 3790 lhs.resize_and_fill (new_dims, rfv); |
| 3791 | |
| 4749 | 3792 if (! final_lhs_dims.any_zero ()) |
| 3793 { | |
| 6388 | 3794 if (n_idx == 1) |
| 3795 { | |
| 3796 idx_vector iidx = idx(0); | |
| 3797 | |
| 3798 octave_idx_type len = frozen_len(0); | |
| 3799 | |
| 6884 | 3800 if (iidx.is_colon ()) |
| 3801 { | |
| 3802 for (octave_idx_type i = 0; i < len; i++) | |
| 3803 lhs.xelem (i) = rhs.elem (i); | |
| 3804 } | |
| 3805 else | |
| 6388 | 3806 { |
| 6884 | 3807 for (octave_idx_type i = 0; i < len; i++) |
| 3808 { | |
| 3809 octave_idx_type ii = iidx.elem (i); | |
| 3810 | |
| 3811 lhs.xelem (ii) = rhs.elem (i); | |
| 3812 } | |
| 6388 | 3813 } |
| 3814 } | |
| 3815 else if (lhs_dims_len == 2 && n_idx == 2) | |
| 4749 | 3816 { |
| 6388 | 3817 idx_vector idx_i = idx(0); |
| 3818 idx_vector idx_j = idx(1); | |
| 3819 | |
| 3820 octave_idx_type i_len = frozen_len(0); | |
| 3821 octave_idx_type j_len = frozen_len(1); | |
| 3822 octave_idx_type k = 0; | |
| 3823 | |
| 6884 | 3824 if (idx_i.is_colon()) |
| 6388 | 3825 { |
| 6884 | 3826 for (octave_idx_type j = 0; j < j_len; j++) |
| 6388 | 3827 { |
| 6884 | 3828 octave_idx_type off = new_dims (0) * |
| 3829 idx_j.elem (j); | |
| 3830 for (octave_idx_type i = 0; | |
| 3831 i < i_len; i++) | |
| 3832 lhs.xelem (i + off) = rhs.elem (k++); | |
| 6388 | 3833 } |
| 3834 } | |
| 6884 | 3835 else |
| 3836 { | |
| 3837 for (octave_idx_type j = 0; j < j_len; j++) | |
| 3838 { | |
| 3839 octave_idx_type off = new_dims (0) * | |
| 3840 idx_j.elem (j); | |
| 3841 for (octave_idx_type i = 0; i < i_len; i++) | |
| 3842 { | |
| 3843 octave_idx_type ii = idx_i.elem (i); | |
| 3844 lhs.xelem (ii + off) = rhs.elem (k++); | |
| 3845 } | |
| 3846 } | |
| 3847 } | |
| 3848 | |
| 6388 | 3849 } |
| 3850 else | |
| 3851 { | |
| 3852 n = Array<LT>::get_size (frozen_len); | |
| 3853 | |
| 3854 Array<octave_idx_type> result_idx (lhs_dims_len, 0); | |
| 3855 | |
| 3856 for (octave_idx_type i = 0; i < n; i++) | |
| 3857 { | |
| 3858 Array<octave_idx_type> elt_idx = get_elt_idx (idx, result_idx); | |
| 3859 | |
| 6884 | 3860 lhs.xelem (elt_idx) = rhs.elem (i); |
| 6388 | 3861 |
| 3862 increment_index (result_idx, frozen_len); | |
| 3863 } | |
| 4749 | 3864 } |
| 3865 } | |
| 3866 } | |
| 3867 } | |
| 4743 | 3868 } |
| 4517 | 3869 } |
| 4745 | 3870 |
| 5632 | 3871 lhs.clear_index (); |
| 3872 | |
| 5052 | 3873 if (retval != 0) |
| 5516 | 3874 lhs = lhs.reshape (final_lhs_dims); |
| 4517 | 3875 } |
| 3876 | |
| 5052 | 3877 if (retval != 0) |
| 3878 lhs.chop_trailing_singletons (); | |
| 4757 | 3879 |
| 4517 | 3880 lhs.clear_index (); |
| 3881 | |
| 3882 return retval; | |
| 3883 } | |
| 3884 | |
| 3885 template <class T> | |
| 3886 void | |
| 3933 | 3887 Array<T>::print_info (std::ostream& os, const std::string& prefix) const |
| 3888 { | |
| 3889 os << prefix << "rep address: " << rep << "\n" | |
| 3890 << prefix << "rep->len: " << rep->len << "\n" | |
| 3891 << prefix << "rep->data: " << static_cast<void *> (rep->data) << "\n" | |
| 3892 << prefix << "rep->count: " << rep->count << "\n"; | |
| 4513 | 3893 |
| 3894 // 2D info: | |
| 3895 // | |
| 4657 | 3896 // << pefix << "rows: " << rows () << "\n" |
| 4513 | 3897 // << prefix << "cols: " << cols () << "\n"; |
| 3933 | 3898 } |
| 3899 | |
| 237 | 3900 /* |
| 3901 ;;; Local Variables: *** | |
| 3902 ;;; mode: C++ *** | |
| 3903 ;;; End: *** | |
| 3904 */ |