Mercurial > hg > octave-lyh
annotate liboctave/Array.cc @ 8015:30629059b72d
Update the manual to reflect the changes in error output
| author | sh@sh-laptop |
|---|---|
| date | Wed, 06 Aug 2008 22:23:54 +0200 |
| parents | 762801c50b21 |
| children | f0fbf47c914c |
| 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> | |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1265 Array<T> |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1266 Array<T>::hermitian (T (*fcn) (const T&)) const |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1267 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1268 assert (ndims () == 2); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1269 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1270 octave_idx_type nr = dim1 (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1271 octave_idx_type nc = dim2 (); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1272 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1273 if (nr >= 8 && nc >= 8) |
|
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 Array<T> result (dim_vector (nc, nr)); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1276 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1277 // Blocked transpose to attempt to avoid cache misses. |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1278 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1279 // 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
|
1280 // on some compilers. |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1281 T buf[64]; |
|
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 octave_idx_type ii = 0, jj; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1284 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
|
1285 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1286 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
|
1287 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1288 // Copy to buffer |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1289 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
|
1290 j < jj + 8; j++, idxj += nr) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1291 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
|
1292 buf[k++] = xelem (i + idxj); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1293 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1294 // Copy from buffer |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1295 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
|
1296 i++, idxi += nc) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1297 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
|
1298 j++, k+=8) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1299 result.xelem (j + idxi) = fcn (buf[k]); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1300 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1301 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1302 if (ii < nr) |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1303 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
|
1304 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
|
1305 result.xelem (j, i) = fcn (xelem (i, j)); |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1306 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1307 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1308 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
|
1309 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
|
1310 result.xelem (j, i) = fcn (xelem (i, j)); |
|
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 return result; |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1313 } |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1314 else |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1315 { |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1316 Array<T> result (dim_vector (nc, nr)); |
|
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 = 0; 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 } |
|
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 /* |
|
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 %% 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
|
1329 %% and with four tiles. |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1330 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1331 %!shared m7, mt7, m8, mt8, m9, mt9 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1332 %! 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
|
1333 %! 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
|
1334 %! 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
|
1335 %! mt8 = mt8 = [mt7; 57:64]; |
|
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1336 %! 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
|
1337 %! mt9 = [mt8; 65:72]; |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1338 |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1339 %!assert(m7', mt7) |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1340 %!assert((1i*m7).', 1i * mt7) |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1341 %!assert((1i*m7)', conj (1i * mt7)) |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1342 %!assert(m8', mt8) |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1343 %!assert((1i*m8).', 1i * mt8) |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1344 %!assert((1i*m8)', conj (1i * mt8)) |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1345 %!assert(m9', mt9) |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1346 %!assert((1i*m9).', 1i * mt9) |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1347 %!assert((1i*m9)', conj (1i * mt9)) |
|
762801c50b21
Fix tests for transpose in Array.cc
David Bateman <dbateman@free.fr>
parents:
7789
diff
changeset
|
1348 %!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
|
1349 %!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
|
1350 %!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
|
1351 %!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
|
1352 %!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
|
1353 %!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
|
1354 %!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
|
1355 %!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
|
1356 %!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
|
1357 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1358 */ |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1359 |
|
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7717
diff
changeset
|
1360 template <class T> |
| 4513 | 1361 T * |
| 1362 Array<T>::fortran_vec (void) | |
| 1363 { | |
| 6881 | 1364 make_unique (); |
| 1365 | |
| 4513 | 1366 return rep->data; |
| 1367 } | |
| 1368 | |
| 1369 template <class T> | |
| 3933 | 1370 void |
| 4517 | 1371 Array<T>::maybe_delete_dims (void) |
| 1372 { | |
| 4587 | 1373 int nd = dimensions.length (); |
| 4517 | 1374 |
| 1375 dim_vector new_dims (1, 1); | |
| 1376 | |
| 1377 bool delete_dims = true; | |
| 1378 | |
| 4587 | 1379 for (int i = nd - 1; i >= 0; i--) |
| 4517 | 1380 { |
| 1381 if (delete_dims) | |
| 1382 { | |
| 1383 if (dimensions(i) != 1) | |
| 1384 { | |
| 1385 delete_dims = false; | |
| 1386 | |
| 1387 new_dims = dim_vector (i + 1, dimensions(i)); | |
| 1388 } | |
| 1389 } | |
| 1390 else | |
| 1391 new_dims(i) = dimensions(i); | |
| 1392 } | |
| 4530 | 1393 |
| 4587 | 1394 if (nd != new_dims.length ()) |
| 4517 | 1395 dimensions = new_dims; |
| 1396 } | |
| 1397 | |
| 1398 template <class T> | |
| 1399 void | |
| 6881 | 1400 Array<T>::clear_index (void) const |
| 4517 | 1401 { |
| 1402 delete [] idx; | |
| 1403 idx = 0; | |
| 1404 idx_count = 0; | |
| 1405 } | |
| 1406 | |
| 1407 template <class T> | |
| 1408 void | |
| 6881 | 1409 Array<T>::set_index (const idx_vector& idx_arg) const |
| 4517 | 1410 { |
| 1411 int nd = ndims (); | |
| 1412 | |
| 1413 if (! idx && nd > 0) | |
| 1414 idx = new idx_vector [nd]; | |
| 1415 | |
| 1416 if (idx_count < nd) | |
| 1417 { | |
| 1418 idx[idx_count++] = idx_arg; | |
| 1419 } | |
| 1420 else | |
| 1421 { | |
| 1422 idx_vector *new_idx = new idx_vector [idx_count+1]; | |
| 1423 | |
| 1424 for (int i = 0; i < idx_count; i++) | |
| 1425 new_idx[i] = idx[i]; | |
| 1426 | |
| 1427 new_idx[idx_count++] = idx_arg; | |
| 1428 | |
| 1429 delete [] idx; | |
| 1430 | |
| 1431 idx = new_idx; | |
| 1432 } | |
| 1433 } | |
| 1434 | |
| 1435 template <class T> | |
| 1436 void | |
| 1437 Array<T>::maybe_delete_elements (idx_vector& idx_arg) | |
| 1438 { | |
| 1439 switch (ndims ()) | |
| 1440 { | |
| 1441 case 1: | |
| 1442 maybe_delete_elements_1 (idx_arg); | |
| 1443 break; | |
| 1444 | |
| 1445 case 2: | |
| 1446 maybe_delete_elements_2 (idx_arg); | |
| 1447 break; | |
| 1448 | |
| 1449 default: | |
| 1450 (*current_liboctave_error_handler) | |
| 1451 ("Array<T>::maybe_delete_elements: invalid operation"); | |
| 1452 break; | |
| 1453 } | |
| 1454 } | |
| 1455 | |
| 1456 template <class T> | |
| 1457 void | |
| 1458 Array<T>::maybe_delete_elements_1 (idx_vector& idx_arg) | |
| 1459 { | |
| 5275 | 1460 octave_idx_type len = length (); |
| 4517 | 1461 |
| 1462 if (len == 0) | |
| 1463 return; | |
| 1464 | |
| 1465 if (idx_arg.is_colon_equiv (len, 1)) | |
| 1466 resize_no_fill (0); | |
| 1467 else | |
| 1468 { | |
| 1469 int num_to_delete = idx_arg.length (len); | |
| 1470 | |
| 1471 if (num_to_delete != 0) | |
| 1472 { | |
| 5275 | 1473 octave_idx_type new_len = len; |
| 1474 | |
| 1475 octave_idx_type iidx = 0; | |
| 1476 | |
| 1477 for (octave_idx_type i = 0; i < len; i++) | |
| 4517 | 1478 if (i == idx_arg.elem (iidx)) |
| 1479 { | |
| 1480 iidx++; | |
| 1481 new_len--; | |
| 1482 | |
| 1483 if (iidx == num_to_delete) | |
| 1484 break; | |
| 1485 } | |
| 1486 | |
| 1487 if (new_len > 0) | |
| 1488 { | |
| 1489 T *new_data = new T [new_len]; | |
| 1490 | |
| 5275 | 1491 octave_idx_type ii = 0; |
| 4517 | 1492 iidx = 0; |
| 5275 | 1493 for (octave_idx_type i = 0; i < len; i++) |
| 4517 | 1494 { |
| 1495 if (iidx < num_to_delete && i == idx_arg.elem (iidx)) | |
| 1496 iidx++; | |
| 1497 else | |
| 1498 { | |
| 6884 | 1499 new_data[ii] = xelem (i); |
| 4517 | 1500 ii++; |
| 1501 } | |
| 1502 } | |
| 1503 | |
| 1504 if (--rep->count <= 0) | |
| 1505 delete rep; | |
| 1506 | |
| 1507 rep = new typename Array<T>::ArrayRep (new_data, new_len); | |
| 1508 | |
| 1509 dimensions.resize (1); | |
| 1510 dimensions(0) = new_len; | |
| 1511 } | |
| 1512 else | |
| 1513 (*current_liboctave_error_handler) | |
| 1514 ("A(idx) = []: index out of range"); | |
| 1515 } | |
| 1516 } | |
| 1517 } | |
| 1518 | |
| 1519 template <class T> | |
| 1520 void | |
| 1521 Array<T>::maybe_delete_elements_2 (idx_vector& idx_arg) | |
| 1522 { | |
| 4548 | 1523 assert (ndims () == 2); |
| 1524 | |
| 5275 | 1525 octave_idx_type nr = dim1 (); |
| 1526 octave_idx_type nc = dim2 (); | |
| 4517 | 1527 |
| 5275 | 1528 octave_idx_type n; |
| 4517 | 1529 if (nr == 1) |
| 1530 n = nc; | |
| 1531 else if (nc == 1) | |
| 1532 n = nr; | |
| 1533 else | |
| 1534 { | |
| 4756 | 1535 // Reshape to row vector for Matlab compatibility. |
| 1536 | |
| 1537 n = nr * nc; | |
| 1538 nr = 1; | |
| 1539 nc = n; | |
| 4517 | 1540 } |
| 1541 | |
| 6525 | 1542 if (nr > 0 && nc > 0 && idx_arg.is_colon_equiv (n, 1)) |
| 4517 | 1543 { |
| 1544 // Either A(:) = [] or A(idx) = [] with idx enumerating all | |
| 1545 // elements, so we delete all elements and return [](0x0). To | |
| 1546 // preserve the orientation of the vector, you have to use | |
| 1547 // A(idx,:) = [] (delete rows) or A(:,idx) (delete columns). | |
| 1548 | |
| 1549 resize_no_fill (0, 0); | |
| 1550 return; | |
| 1551 } | |
| 1552 | |
| 1553 idx_arg.sort (true); | |
| 1554 | |
| 5275 | 1555 octave_idx_type num_to_delete = idx_arg.length (n); |
| 4517 | 1556 |
| 1557 if (num_to_delete != 0) | |
| 1558 { | |
| 5275 | 1559 octave_idx_type new_n = n; |
| 1560 | |
| 1561 octave_idx_type iidx = 0; | |
| 1562 | |
| 1563 for (octave_idx_type i = 0; i < n; i++) | |
| 4517 | 1564 if (i == idx_arg.elem (iidx)) |
| 1565 { | |
| 1566 iidx++; | |
| 1567 new_n--; | |
| 1568 | |
| 1569 if (iidx == num_to_delete) | |
| 1570 break; | |
| 1571 } | |
| 1572 | |
| 1573 if (new_n > 0) | |
| 1574 { | |
| 1575 T *new_data = new T [new_n]; | |
| 1576 | |
| 5275 | 1577 octave_idx_type ii = 0; |
| 4517 | 1578 iidx = 0; |
| 5275 | 1579 for (octave_idx_type i = 0; i < n; i++) |
| 4517 | 1580 { |
| 1581 if (iidx < num_to_delete && i == idx_arg.elem (iidx)) | |
| 1582 iidx++; | |
| 1583 else | |
| 1584 { | |
| 6884 | 1585 new_data[ii] = xelem (i); |
| 4517 | 1586 |
| 1587 ii++; | |
| 1588 } | |
| 1589 } | |
| 1590 | |
| 1591 if (--(Array<T>::rep)->count <= 0) | |
| 1592 delete Array<T>::rep; | |
| 1593 | |
| 1594 Array<T>::rep = new typename Array<T>::ArrayRep (new_data, new_n); | |
| 1595 | |
| 1596 dimensions.resize (2); | |
| 1597 | |
| 1598 if (nr == 1) | |
| 1599 { | |
| 1600 dimensions(0) = 1; | |
| 1601 dimensions(1) = new_n; | |
| 1602 } | |
| 1603 else | |
| 1604 { | |
| 1605 dimensions(0) = new_n; | |
| 1606 dimensions(1) = 1; | |
| 1607 } | |
| 1608 } | |
| 1609 else | |
| 1610 (*current_liboctave_error_handler) | |
| 1611 ("A(idx) = []: index out of range"); | |
| 1612 } | |
| 1613 } | |
| 1614 | |
| 1615 template <class T> | |
| 1616 void | |
| 1617 Array<T>::maybe_delete_elements (idx_vector& idx_i, idx_vector& idx_j) | |
| 1618 { | |
| 4548 | 1619 assert (ndims () == 2); |
| 1620 | |
| 5275 | 1621 octave_idx_type nr = dim1 (); |
| 1622 octave_idx_type nc = dim2 (); | |
| 4517 | 1623 |
| 1624 if (nr == 0 && nc == 0) | |
| 1625 return; | |
| 1626 | |
| 1627 if (idx_i.is_colon ()) | |
| 1628 { | |
| 1629 if (idx_j.is_colon ()) | |
| 1630 { | |
| 1631 // A(:,:) -- We are deleting columns and rows, so the result | |
| 1632 // is [](0x0). | |
| 1633 | |
| 1634 resize_no_fill (0, 0); | |
| 1635 return; | |
| 1636 } | |
| 1637 | |
| 1638 if (idx_j.is_colon_equiv (nc, 1)) | |
| 1639 { | |
| 1640 // A(:,j) -- We are deleting columns by enumerating them, | |
| 1641 // If we enumerate all of them, we should have zero columns | |
| 1642 // with the same number of rows that we started with. | |
| 1643 | |
| 1644 resize_no_fill (nr, 0); | |
| 1645 return; | |
| 1646 } | |
| 1647 } | |
| 1648 | |
| 1649 if (idx_j.is_colon () && idx_i.is_colon_equiv (nr, 1)) | |
| 1650 { | |
| 1651 // A(i,:) -- We are deleting rows by enumerating them. If we | |
| 1652 // enumerate all of them, we should have zero rows with the | |
| 1653 // same number of columns that we started with. | |
| 1654 | |
| 1655 resize_no_fill (0, nc); | |
| 1656 return; | |
| 1657 } | |
| 1658 | |
| 1659 if (idx_i.is_colon_equiv (nr, 1)) | |
| 1660 { | |
| 1661 if (idx_j.is_colon_equiv (nc, 1)) | |
| 1662 resize_no_fill (0, 0); | |
| 1663 else | |
| 1664 { | |
| 1665 idx_j.sort (true); | |
| 1666 | |
| 5275 | 1667 octave_idx_type num_to_delete = idx_j.length (nc); |
| 4517 | 1668 |
| 1669 if (num_to_delete != 0) | |
| 1670 { | |
| 1671 if (nr == 1 && num_to_delete == nc) | |
| 1672 resize_no_fill (0, 0); | |
| 1673 else | |
| 1674 { | |
| 5275 | 1675 octave_idx_type new_nc = nc; |
| 1676 | |
| 1677 octave_idx_type iidx = 0; | |
| 1678 | |
| 1679 for (octave_idx_type j = 0; j < nc; j++) | |
| 4517 | 1680 if (j == idx_j.elem (iidx)) |
| 1681 { | |
| 1682 iidx++; | |
| 1683 new_nc--; | |
| 1684 | |
| 1685 if (iidx == num_to_delete) | |
| 1686 break; | |
| 1687 } | |
| 1688 | |
| 1689 if (new_nc > 0) | |
| 1690 { | |
| 1691 T *new_data = new T [nr * new_nc]; | |
| 1692 | |
| 5275 | 1693 octave_idx_type jj = 0; |
| 4517 | 1694 iidx = 0; |
| 5275 | 1695 for (octave_idx_type j = 0; j < nc; j++) |
| 4517 | 1696 { |
| 1697 if (iidx < num_to_delete && j == idx_j.elem (iidx)) | |
| 1698 iidx++; | |
| 1699 else | |
| 1700 { | |
| 5275 | 1701 for (octave_idx_type i = 0; i < nr; i++) |
| 6884 | 1702 new_data[nr*jj+i] = xelem (i, j); |
| 4517 | 1703 jj++; |
| 1704 } | |
| 1705 } | |
| 1706 | |
| 1707 if (--(Array<T>::rep)->count <= 0) | |
| 1708 delete Array<T>::rep; | |
| 1709 | |
| 1710 Array<T>::rep = new typename Array<T>::ArrayRep (new_data, nr * new_nc); | |
| 1711 | |
| 1712 dimensions.resize (2); | |
| 1713 dimensions(1) = new_nc; | |
| 1714 } | |
| 1715 else | |
| 1716 (*current_liboctave_error_handler) | |
| 1717 ("A(idx) = []: index out of range"); | |
| 1718 } | |
| 1719 } | |
| 1720 } | |
| 1721 } | |
| 1722 else if (idx_j.is_colon_equiv (nc, 1)) | |
| 1723 { | |
| 1724 if (idx_i.is_colon_equiv (nr, 1)) | |
| 1725 resize_no_fill (0, 0); | |
| 1726 else | |
| 1727 { | |
| 1728 idx_i.sort (true); | |
| 1729 | |
| 5275 | 1730 octave_idx_type num_to_delete = idx_i.length (nr); |
| 4517 | 1731 |
| 1732 if (num_to_delete != 0) | |
| 1733 { | |
| 1734 if (nc == 1 && num_to_delete == nr) | |
| 1735 resize_no_fill (0, 0); | |
| 1736 else | |
| 1737 { | |
| 5275 | 1738 octave_idx_type new_nr = nr; |
| 1739 | |
| 1740 octave_idx_type iidx = 0; | |
| 1741 | |
| 1742 for (octave_idx_type i = 0; i < nr; i++) | |
| 4517 | 1743 if (i == idx_i.elem (iidx)) |
| 1744 { | |
| 1745 iidx++; | |
| 1746 new_nr--; | |
| 1747 | |
| 1748 if (iidx == num_to_delete) | |
| 1749 break; | |
| 1750 } | |
| 1751 | |
| 1752 if (new_nr > 0) | |
| 1753 { | |
| 1754 T *new_data = new T [new_nr * nc]; | |
| 1755 | |
| 5275 | 1756 octave_idx_type ii = 0; |
| 4517 | 1757 iidx = 0; |
| 5275 | 1758 for (octave_idx_type i = 0; i < nr; i++) |
| 4517 | 1759 { |
| 1760 if (iidx < num_to_delete && i == idx_i.elem (iidx)) | |
| 1761 iidx++; | |
| 1762 else | |
| 1763 { | |
| 5275 | 1764 for (octave_idx_type j = 0; j < nc; j++) |
| 6884 | 1765 new_data[new_nr*j+ii] = xelem (i, j); |
| 4517 | 1766 ii++; |
| 1767 } | |
| 1768 } | |
| 1769 | |
| 1770 if (--(Array<T>::rep)->count <= 0) | |
| 1771 delete Array<T>::rep; | |
| 1772 | |
| 1773 Array<T>::rep = new typename Array<T>::ArrayRep (new_data, new_nr * nc); | |
| 1774 | |
| 1775 dimensions.resize (2); | |
| 1776 dimensions(0) = new_nr; | |
| 1777 } | |
| 1778 else | |
| 1779 (*current_liboctave_error_handler) | |
| 1780 ("A(idx) = []: index out of range"); | |
| 1781 } | |
| 1782 } | |
| 1783 } | |
| 1784 } | |
| 1785 } | |
| 1786 | |
| 1787 template <class T> | |
| 1788 void | |
| 1789 Array<T>::maybe_delete_elements (idx_vector&, idx_vector&, idx_vector&) | |
| 1790 { | |
| 1791 assert (0); | |
| 1792 } | |
| 1793 | |
| 1794 template <class T> | |
| 1795 void | |
| 4585 | 1796 Array<T>::maybe_delete_elements (Array<idx_vector>& ra_idx, const T& rfv) |
| 4517 | 1797 { |
| 5275 | 1798 octave_idx_type n_idx = ra_idx.length (); |
| 4517 | 1799 |
| 1800 dim_vector lhs_dims = dims (); | |
| 1801 | |
| 6388 | 1802 int n_lhs_dims = lhs_dims.length (); |
| 1803 | |
| 4821 | 1804 if (lhs_dims.all_zero ()) |
| 1805 return; | |
| 1806 | |
| 6384 | 1807 if (n_idx == 1 && ra_idx(0).is_colon ()) |
| 1808 { | |
| 1809 resize (dim_vector (0, 0), rfv); | |
| 1810 return; | |
| 1811 } | |
| 1812 | |
| 6388 | 1813 if (n_idx > n_lhs_dims) |
| 1814 { | |
| 1815 for (int i = n_idx; i < n_lhs_dims; i++) | |
| 1816 { | |
| 1817 // Ensure that extra indices are either colon or 1. | |
| 1818 | |
| 1819 if (! ra_idx(i).is_colon_equiv (1, 1)) | |
| 1820 { | |
| 1821 (*current_liboctave_error_handler) | |
| 1822 ("index exceeds array dimensions"); | |
| 1823 return; | |
| 1824 } | |
| 1825 } | |
| 1826 | |
| 1827 ra_idx.resize (n_lhs_dims); | |
| 1828 | |
| 1829 n_idx = n_lhs_dims; | |
| 1830 } | |
| 4757 | 1831 |
| 4740 | 1832 Array<int> idx_is_colon (n_idx, 0); |
| 1833 | |
| 1834 Array<int> idx_is_colon_equiv (n_idx, 0); | |
| 4517 | 1835 |
| 1836 // Initialization of colon arrays. | |
| 4757 | 1837 |
| 5275 | 1838 for (octave_idx_type i = 0; i < n_idx; i++) |
| 4517 | 1839 { |
| 4585 | 1840 idx_is_colon_equiv(i) = ra_idx(i).is_colon_equiv (lhs_dims(i), 1); |
| 1841 | |
| 1842 idx_is_colon(i) = ra_idx(i).is_colon (); | |
| 4517 | 1843 } |
| 1844 | |
| 4755 | 1845 bool idx_ok = true; |
| 1846 | |
| 1847 // Check for index out of bounds. | |
| 1848 | |
| 5275 | 1849 for (octave_idx_type i = 0 ; i < n_idx - 1; i++) |
| 4517 | 1850 { |
| 4755 | 1851 if (! (idx_is_colon(i) || idx_is_colon_equiv(i))) |
| 1852 { | |
| 1853 ra_idx(i).sort (true); | |
| 4757 | 1854 |
| 4755 | 1855 if (ra_idx(i).max () > lhs_dims(i)) |
| 1856 { | |
| 1857 (*current_liboctave_error_handler) | |
| 1858 ("index exceeds array dimensions"); | |
| 4757 | 1859 |
| 4755 | 1860 idx_ok = false; |
| 1861 break; | |
| 1862 } | |
| 1863 else if (ra_idx(i).min () < 0) // I believe this is checked elsewhere | |
| 1864 { | |
| 1865 (*current_liboctave_error_handler) | |
| 1866 ("index must be one or larger"); | |
| 1867 | |
| 1868 idx_ok = false; | |
| 1869 break; | |
| 1870 } | |
| 1871 } | |
| 4517 | 1872 } |
| 4757 | 1873 |
| 4755 | 1874 if (n_idx <= n_lhs_dims) |
| 4517 | 1875 { |
| 5275 | 1876 octave_idx_type last_idx = ra_idx(n_idx-1).max (); |
| 1877 | |
| 1878 octave_idx_type sum_el = lhs_dims(n_idx-1); | |
| 1879 | |
| 1880 for (octave_idx_type i = n_idx; i < n_lhs_dims; i++) | |
| 4755 | 1881 sum_el *= lhs_dims(i); |
| 1882 | |
| 1883 if (last_idx > sum_el - 1) | |
| 1884 { | |
| 1885 (*current_liboctave_error_handler) | |
| 1886 ("index exceeds array dimensions"); | |
| 1887 | |
| 1888 idx_ok = false; | |
| 1889 } | |
| 4757 | 1890 } |
| 4755 | 1891 |
| 1892 if (idx_ok) | |
| 1893 { | |
| 1894 if (n_idx > 1 | |
| 1895 && (all_ones (idx_is_colon) || all_ones (idx_is_colon_equiv))) | |
| 4517 | 1896 { |
| 4755 | 1897 // A(:,:,:) -- we are deleting elements in all dimensions, so |
| 1898 // the result is [](0x0x0). | |
| 1899 | |
| 1900 dim_vector zeros; | |
| 1901 zeros.resize (n_idx); | |
| 1902 | |
| 1903 for (int i = 0; i < n_idx; i++) | |
| 1904 zeros(i) = 0; | |
| 1905 | |
| 1906 resize (zeros, rfv); | |
| 4517 | 1907 } |
| 1908 | |
| 4755 | 1909 else if (n_idx > 1 |
| 1910 && num_ones (idx_is_colon) == n_idx - 1 | |
| 1911 && num_ones (idx_is_colon_equiv) == n_idx) | |
| 1912 { | |
| 1913 // A(:,:,j) -- we are deleting elements in one dimension by | |
| 1914 // enumerating them. | |
| 1915 // | |
| 1916 // If we enumerate all of the elements, we should have zero | |
| 1917 // elements in that dimension with the same number of elements | |
| 1918 // in the other dimensions that we started with. | |
| 1919 | |
| 1920 dim_vector temp_dims; | |
| 1921 temp_dims.resize (n_idx); | |
| 1922 | |
| 5275 | 1923 for (octave_idx_type i = 0; i < n_idx; i++) |
| 4755 | 1924 { |
| 1925 if (idx_is_colon (i)) | |
| 1926 temp_dims(i) = lhs_dims(i); | |
| 1927 else | |
| 1928 temp_dims(i) = 0; | |
| 1929 } | |
| 1930 | |
| 1931 resize (temp_dims); | |
| 1932 } | |
| 1933 else if (n_idx > 1 && num_ones (idx_is_colon) == n_idx - 1) | |
| 4741 | 1934 { |
| 4755 | 1935 // We have colons in all indices except for one. |
| 1936 // This index tells us which slice to delete | |
| 1937 | |
| 1938 if (n_idx < n_lhs_dims) | |
| 1939 { | |
| 1940 // Collapse dimensions beyond last index. | |
| 1941 | |
| 5781 | 1942 if (! (ra_idx(n_idx-1).is_colon ())) |
| 1943 (*current_liboctave_warning_with_id_handler) | |
| 1944 ("Octave:fortran-indexing", | |
| 1945 "fewer indices than dimensions for N-d array"); | |
| 4755 | 1946 |
| 5275 | 1947 for (octave_idx_type i = n_idx; i < n_lhs_dims; i++) |
| 4755 | 1948 lhs_dims(n_idx-1) *= lhs_dims(i); |
| 1949 | |
| 1950 lhs_dims.resize (n_idx); | |
| 1951 | |
| 1952 // Reshape *this. | |
| 1953 dimensions = lhs_dims; | |
| 1954 } | |
| 1955 | |
| 1956 int non_col = 0; | |
| 1957 | |
| 1958 // Find the non-colon column. | |
| 1959 | |
| 5275 | 1960 for (octave_idx_type i = 0; i < n_idx; i++) |
| 4755 | 1961 { |
| 1962 if (! idx_is_colon(i)) | |
| 1963 non_col = i; | |
| 1964 } | |
| 1965 | |
| 1966 // The length of the non-colon dimension. | |
| 1967 | |
| 5275 | 1968 octave_idx_type non_col_dim = lhs_dims (non_col); |
| 1969 | |
| 1970 octave_idx_type num_to_delete = ra_idx(non_col).length (lhs_dims (non_col)); | |
| 4755 | 1971 |
| 1972 if (num_to_delete > 0) | |
| 1973 { | |
| 1974 int temp = lhs_dims.num_ones (); | |
| 1975 | |
| 1976 if (non_col_dim == 1) | |
| 1977 temp--; | |
| 1978 | |
| 1979 if (temp == n_idx - 1 && num_to_delete == non_col_dim) | |
| 1980 { | |
| 1981 // We have A with (1x1x4), where A(1,:,1:4) | |
| 1982 // Delete all (0x0x0) | |
| 1983 | |
| 1984 dim_vector zero_dims (n_idx, 0); | |
| 1985 | |
| 1986 resize (zero_dims, rfv); | |
| 1987 } | |
| 1988 else | |
| 1989 { | |
| 1990 // New length of non-colon dimension | |
| 1991 // (calculated in the next for loop) | |
| 1992 | |
| 5275 | 1993 octave_idx_type new_dim = non_col_dim; |
| 1994 | |
| 1995 octave_idx_type iidx = 0; | |
| 1996 | |
| 1997 for (octave_idx_type j = 0; j < non_col_dim; j++) | |
| 4755 | 1998 if (j == ra_idx(non_col).elem (iidx)) |
| 1999 { | |
| 2000 iidx++; | |
| 2001 | |
| 2002 new_dim--; | |
| 2003 | |
| 2004 if (iidx == num_to_delete) | |
| 2005 break; | |
| 2006 } | |
| 2007 | |
| 2008 // Creating the new nd array after deletions. | |
| 2009 | |
| 2010 if (new_dim > 0) | |
| 2011 { | |
| 2012 // Calculate number of elements in new array. | |
| 2013 | |
| 5275 | 2014 octave_idx_type num_new_elem=1; |
| 4755 | 2015 |
| 2016 for (int i = 0; i < n_idx; i++) | |
| 2017 { | |
| 2018 if (i == non_col) | |
| 2019 num_new_elem *= new_dim; | |
| 2020 | |
| 2021 else | |
| 2022 num_new_elem *= lhs_dims(i); | |
| 2023 } | |
| 2024 | |
| 2025 T *new_data = new T [num_new_elem]; | |
| 2026 | |
| 5275 | 2027 Array<octave_idx_type> result_idx (n_lhs_dims, 0); |
| 4755 | 2028 |
| 2029 dim_vector new_lhs_dim = lhs_dims; | |
| 2030 | |
| 2031 new_lhs_dim(non_col) = new_dim; | |
| 2032 | |
| 5275 | 2033 octave_idx_type num_elem = 1; |
| 2034 | |
| 2035 octave_idx_type numidx = 0; | |
| 2036 | |
| 2037 octave_idx_type n = length (); | |
| 4755 | 2038 |
| 2039 for (int i = 0; i < n_lhs_dims; i++) | |
| 2040 if (i != non_col) | |
| 2041 num_elem *= lhs_dims(i); | |
| 2042 | |
| 2043 num_elem *= ra_idx(non_col).capacity (); | |
| 2044 | |
| 5275 | 2045 for (octave_idx_type i = 0; i < n; i++) |
| 4755 | 2046 { |
| 2047 if (numidx < num_elem | |
| 2048 && is_in (result_idx(non_col), ra_idx(non_col))) | |
| 2049 numidx++; | |
| 2050 | |
| 2051 else | |
| 2052 { | |
| 5275 | 2053 Array<octave_idx_type> temp_result_idx = result_idx; |
| 2054 | |
| 2055 octave_idx_type num_lgt = how_many_lgt (result_idx(non_col), | |
| 4755 | 2056 ra_idx(non_col)); |
| 2057 | |
| 2058 temp_result_idx(non_col) -= num_lgt; | |
| 2059 | |
| 5275 | 2060 octave_idx_type kidx |
| 4755 | 2061 = ::compute_index (temp_result_idx, new_lhs_dim); |
| 2062 | |
| 6884 | 2063 new_data[kidx] = xelem (result_idx); |
| 4755 | 2064 } |
| 2065 | |
| 2066 increment_index (result_idx, lhs_dims); | |
| 2067 } | |
| 2068 | |
| 2069 if (--rep->count <= 0) | |
| 2070 delete rep; | |
| 2071 | |
| 2072 rep = new typename Array<T>::ArrayRep (new_data, | |
| 2073 num_new_elem); | |
| 2074 | |
| 2075 dimensions = new_lhs_dim; | |
| 2076 } | |
| 2077 } | |
| 2078 } | |
| 4517 | 2079 } |
| 4755 | 2080 else if (n_idx == 1) |
| 4517 | 2081 { |
| 4821 | 2082 // This handle cases where we only have one index (not |
| 2083 // colon). The index denotes which elements we should | |
| 2084 // delete in the array which can be of any dimension. We | |
| 2085 // return a column vector, except for the case where we are | |
| 2086 // operating on a row vector. The elements are numerated | |
| 2087 // column by column. | |
| 4755 | 2088 // |
| 2089 // A(3,3,3)=2; | |
| 2090 // A(3:5) = []; A(6)=[] | |
| 4757 | 2091 |
| 5275 | 2092 octave_idx_type lhs_numel = numel (); |
| 4757 | 2093 |
| 4821 | 2094 idx_vector idx_vec = ra_idx(0); |
| 2095 | |
| 5781 | 2096 idx_vec.freeze (lhs_numel, 0, true); |
| 4821 | 2097 |
| 2098 idx_vec.sort (true); | |
| 2099 | |
| 5275 | 2100 octave_idx_type num_to_delete = idx_vec.length (lhs_numel); |
| 4821 | 2101 |
| 2102 if (num_to_delete > 0) | |
| 4517 | 2103 { |
| 5275 | 2104 octave_idx_type new_numel = lhs_numel - num_to_delete; |
| 4821 | 2105 |
| 2106 T *new_data = new T[new_numel]; | |
| 2107 | |
| 5275 | 2108 Array<octave_idx_type> lhs_ra_idx (ndims (), 0); |
| 2109 | |
| 2110 octave_idx_type ii = 0; | |
| 2111 octave_idx_type iidx = 0; | |
| 2112 | |
| 2113 for (octave_idx_type i = 0; i < lhs_numel; i++) | |
| 4755 | 2114 { |
| 4821 | 2115 if (iidx < num_to_delete && i == idx_vec.elem (iidx)) |
| 2116 { | |
| 2117 iidx++; | |
| 2118 } | |
| 2119 else | |
| 2120 { | |
| 6884 | 2121 new_data[ii++] = xelem (lhs_ra_idx); |
| 4821 | 2122 } |
| 2123 | |
| 2124 increment_index (lhs_ra_idx, lhs_dims); | |
| 2125 } | |
| 2126 | |
| 2127 if (--(Array<T>::rep)->count <= 0) | |
| 2128 delete Array<T>::rep; | |
| 2129 | |
| 2130 Array<T>::rep = new typename Array<T>::ArrayRep (new_data, new_numel); | |
| 2131 | |
| 2132 dimensions.resize (2); | |
| 2133 | |
| 2134 if (lhs_dims.length () == 2 && lhs_dims(1) == 1) | |
| 2135 { | |
| 2136 dimensions(0) = new_numel; | |
| 2137 dimensions(1) = 1; | |
| 4755 | 2138 } |
| 2139 else | |
| 2140 { | |
| 4821 | 2141 dimensions(0) = 1; |
| 2142 dimensions(1) = new_numel; | |
| 4755 | 2143 } |
| 4517 | 2144 } |
| 2145 } | |
| 4755 | 2146 else if (num_ones (idx_is_colon) < n_idx) |
| 2147 { | |
| 2148 (*current_liboctave_error_handler) | |
| 2149 ("a null assignment can have only one non-colon index"); | |
| 2150 } | |
| 4517 | 2151 } |
| 2152 } | |
| 2153 | |
| 2154 template <class T> | |
| 2155 Array<T> | |
| 6881 | 2156 Array<T>::value (void) const |
| 4517 | 2157 { |
| 2158 Array<T> retval; | |
| 2159 | |
| 2160 int n_idx = index_count (); | |
| 2161 | |
| 2162 if (n_idx == 2) | |
| 2163 { | |
| 2164 idx_vector *tmp = get_idx (); | |
| 2165 | |
| 2166 idx_vector idx_i = tmp[0]; | |
| 2167 idx_vector idx_j = tmp[1]; | |
| 2168 | |
| 2169 retval = index (idx_i, idx_j); | |
| 2170 } | |
| 2171 else if (n_idx == 1) | |
| 2172 { | |
| 2173 retval = index (idx[0]); | |
| 2174 } | |
| 2175 else | |
| 2176 (*current_liboctave_error_handler) | |
| 2177 ("Array<T>::value: invalid number of indices specified"); | |
| 2178 | |
| 2179 clear_index (); | |
| 2180 | |
| 2181 return retval; | |
| 2182 } | |
| 2183 | |
| 2184 template <class T> | |
| 2185 Array<T> | |
| 2186 Array<T>::index (idx_vector& idx_arg, int resize_ok, const T& rfv) const | |
| 2187 { | |
| 2188 Array<T> retval; | |
| 2189 | |
| 5081 | 2190 dim_vector dv = idx_arg.orig_dimensions (); |
| 2191 | |
| 2192 if (dv.length () > 2 || ndims () > 2) | |
| 2193 retval = indexN (idx_arg, resize_ok, rfv); | |
| 2194 else | |
| 4517 | 2195 { |
| 5081 | 2196 switch (ndims ()) |
| 2197 { | |
| 2198 case 1: | |
| 2199 retval = index1 (idx_arg, resize_ok, rfv); | |
| 2200 break; | |
| 2201 | |
| 2202 case 2: | |
| 2203 retval = index2 (idx_arg, resize_ok, rfv); | |
| 2204 break; | |
| 2205 | |
| 2206 default: | |
| 2207 (*current_liboctave_error_handler) | |
| 2208 ("invalid array (internal error)"); | |
| 2209 break; | |
| 2210 } | |
| 4517 | 2211 } |
| 2212 | |
| 2213 return retval; | |
| 2214 } | |
| 2215 | |
| 2216 template <class T> | |
| 2217 Array<T> | |
| 2218 Array<T>::index1 (idx_vector& idx_arg, int resize_ok, const T& rfv) const | |
| 2219 { | |
| 2220 Array<T> retval; | |
| 2221 | |
| 5275 | 2222 octave_idx_type len = length (); |
| 2223 | |
| 2224 octave_idx_type n = idx_arg.freeze (len, "vector", resize_ok); | |
| 4517 | 2225 |
| 2226 if (idx_arg) | |
| 2227 { | |
| 2228 if (idx_arg.is_colon_equiv (len)) | |
| 2229 { | |
| 2230 retval = *this; | |
| 2231 } | |
| 2232 else if (n == 0) | |
| 2233 { | |
| 2234 retval.resize_no_fill (0); | |
| 2235 } | |
| 2236 else | |
| 2237 { | |
| 2238 retval.resize_no_fill (n); | |
| 2239 | |
| 5275 | 2240 for (octave_idx_type i = 0; i < n; i++) |
| 4517 | 2241 { |
| 5275 | 2242 octave_idx_type ii = idx_arg.elem (i); |
| 4517 | 2243 if (ii >= len) |
| 2244 retval.elem (i) = rfv; | |
| 2245 else | |
| 2246 retval.elem (i) = elem (ii); | |
| 2247 } | |
| 2248 } | |
| 2249 } | |
| 2250 | |
| 2251 // idx_vector::freeze() printed an error message for us. | |
| 2252 | |
| 2253 return retval; | |
| 2254 } | |
| 2255 | |
| 2256 template <class T> | |
| 2257 Array<T> | |
| 2258 Array<T>::index2 (idx_vector& idx_arg, int resize_ok, const T& rfv) const | |
| 2259 { | |
| 2260 Array<T> retval; | |
| 2261 | |
| 4548 | 2262 assert (ndims () == 2); |
| 2263 | |
| 5275 | 2264 octave_idx_type nr = dim1 (); |
| 2265 octave_idx_type nc = dim2 (); | |
| 2266 | |
| 2267 octave_idx_type orig_len = nr * nc; | |
| 4517 | 2268 |
| 4832 | 2269 dim_vector idx_orig_dims = idx_arg.orig_dimensions (); |
| 2270 | |
| 5275 | 2271 octave_idx_type idx_orig_rows = idx_arg.orig_rows (); |
| 2272 octave_idx_type idx_orig_columns = idx_arg.orig_columns (); | |
| 4517 | 2273 |
| 2274 if (idx_arg.is_colon ()) | |
| 2275 { | |
| 2276 // Fast magic colon processing. | |
| 2277 | |
| 5275 | 2278 octave_idx_type result_nr = nr * nc; |
| 2279 octave_idx_type result_nc = 1; | |
| 4517 | 2280 |
| 2281 retval = Array<T> (*this, dim_vector (result_nr, result_nc)); | |
| 2282 } | |
| 2283 else if (nr == 1 && nc == 1) | |
| 2284 { | |
| 2285 Array<T> tmp = Array<T>::index1 (idx_arg, resize_ok); | |
| 2286 | |
| 5275 | 2287 octave_idx_type len = tmp.length (); |
| 4828 | 2288 |
|
7573
755bf7ecc29b
eliminate one_zero stuff from idx_vector
John W. Eaton <jwe@octave.org>
parents:
7480
diff
changeset
|
2289 if (len >= idx_orig_dims.numel ()) |
| 4832 | 2290 retval = Array<T> (tmp, idx_orig_dims); |
| 4517 | 2291 } |
| 2292 else if (nr == 1 || nc == 1) | |
| 2293 { | |
| 2294 // If indexing a vector with a matrix, return value has same | |
| 2295 // shape as the index. Otherwise, it has same orientation as | |
| 2296 // indexed object. | |
| 2297 | |
| 4828 | 2298 Array<T> tmp = Array<T>::index1 (idx_arg, resize_ok); |
| 4517 | 2299 |
| 5275 | 2300 octave_idx_type len = tmp.length (); |
| 4517 | 2301 |
|
7573
755bf7ecc29b
eliminate one_zero stuff from idx_vector
John W. Eaton <jwe@octave.org>
parents:
7480
diff
changeset
|
2302 if (idx_orig_rows == 1 || idx_orig_columns == 1) |
| 4517 | 2303 { |
| 4827 | 2304 if (nr == 1) |
| 2305 retval = Array<T> (tmp, dim_vector (1, len)); | |
| 4517 | 2306 else |
| 4827 | 2307 retval = Array<T> (tmp, dim_vector (len, 1)); |
| 4517 | 2308 } |
| 4876 | 2309 else if (len >= idx_orig_dims.numel ()) |
| 4832 | 2310 retval = Array<T> (tmp, idx_orig_dims); |
| 4517 | 2311 } |
| 2312 else | |
| 2313 { | |
|
7573
755bf7ecc29b
eliminate one_zero stuff from idx_vector
John W. Eaton <jwe@octave.org>
parents:
7480
diff
changeset
|
2314 (*current_liboctave_warning_with_id_handler) |
|
755bf7ecc29b
eliminate one_zero stuff from idx_vector
John W. Eaton <jwe@octave.org>
parents:
7480
diff
changeset
|
2315 ("Octave:fortran-indexing", "single index used for matrix"); |
| 4517 | 2316 |
| 2317 // This code is only for indexing matrices. The vector | |
| 2318 // cases are handled above. | |
| 2319 | |
| 2320 idx_arg.freeze (nr * nc, "matrix", resize_ok); | |
| 2321 | |
| 2322 if (idx_arg) | |
| 2323 { | |
| 5275 | 2324 octave_idx_type result_nr = idx_orig_rows; |
| 2325 octave_idx_type result_nc = idx_orig_columns; | |
| 4517 | 2326 |
| 2327 retval.resize_no_fill (result_nr, result_nc); | |
| 2328 | |
| 5275 | 2329 octave_idx_type k = 0; |
| 2330 for (octave_idx_type j = 0; j < result_nc; j++) | |
| 4517 | 2331 { |
| 5275 | 2332 for (octave_idx_type i = 0; i < result_nr; i++) |
| 4517 | 2333 { |
| 5275 | 2334 octave_idx_type ii = idx_arg.elem (k++); |
| 4517 | 2335 if (ii >= orig_len) |
| 2336 retval.elem (i, j) = rfv; | |
| 2337 else | |
| 2338 { | |
| 5275 | 2339 octave_idx_type fr = ii % nr; |
| 2340 octave_idx_type fc = (ii - fr) / nr; | |
| 4517 | 2341 retval.elem (i, j) = elem (fr, fc); |
| 2342 } | |
| 2343 } | |
| 2344 } | |
| 2345 } | |
| 2346 // idx_vector::freeze() printed an error message for us. | |
| 2347 } | |
| 2348 | |
| 2349 return retval; | |
| 2350 } | |
| 2351 | |
| 2352 template <class T> | |
| 2353 Array<T> | |
| 4530 | 2354 Array<T>::indexN (idx_vector& ra_idx, int resize_ok, const T& rfv) const |
| 2355 { | |
| 2356 Array<T> retval; | |
| 2357 | |
| 5519 | 2358 dim_vector dv = dims (); |
| 2359 | |
| 2360 int n_dims = dv.length (); | |
| 2361 | |
| 2362 octave_idx_type orig_len = dv.numel (); | |
| 4530 | 2363 |
| 4757 | 2364 dim_vector idx_orig_dims = ra_idx.orig_dimensions (); |
| 4530 | 2365 |
| 2366 if (ra_idx.is_colon ()) | |
| 2367 { | |
| 4651 | 2368 // Fast magic colon processing. |
| 2369 | |
| 2370 retval = Array<T> (*this, dim_vector (orig_len, 1)); | |
| 4530 | 2371 } |
| 4651 | 2372 else |
| 4530 | 2373 { |
| 5519 | 2374 bool vec_equiv = vector_equivalent (dv); |
| 2375 | |
|
7573
755bf7ecc29b
eliminate one_zero stuff from idx_vector
John W. Eaton <jwe@octave.org>
parents:
7480
diff
changeset
|
2376 if (! (vec_equiv || ra_idx.is_colon ())) |
| 5781 | 2377 (*current_liboctave_warning_with_id_handler) |
| 2378 ("Octave:fortran-indexing", "single index used for N-d array"); | |
| 4530 | 2379 |
| 5519 | 2380 octave_idx_type frozen_len |
| 2381 = ra_idx.freeze (orig_len, "nd-array", resize_ok); | |
| 4530 | 2382 |
| 2383 if (ra_idx) | |
| 4757 | 2384 { |
| 5519 | 2385 dim_vector result_dims; |
| 2386 | |
| 7321 | 2387 if (vec_equiv && ! orig_len == 1) |
| 5519 | 2388 { |
| 2389 result_dims = dv; | |
| 2390 | |
| 2391 for (int i = 0; i < n_dims; i++) | |
| 2392 { | |
| 2393 if (result_dims(i) != 1) | |
| 2394 { | |
| 2395 // All but this dim should be one. | |
| 2396 result_dims(i) = frozen_len; | |
| 2397 break; | |
| 2398 } | |
| 2399 } | |
| 2400 } | |
| 2401 else | |
| 2402 result_dims = idx_orig_dims; | |
| 4530 | 2403 |
| 4673 | 2404 result_dims.chop_trailing_singletons (); |
| 2405 | |
| 4530 | 2406 retval.resize (result_dims); |
| 2407 | |
| 5275 | 2408 octave_idx_type n = result_dims.numel (); |
| 4530 | 2409 |
| 5275 | 2410 octave_idx_type k = 0; |
| 2411 | |
| 2412 for (octave_idx_type i = 0; i < n; i++) | |
| 4530 | 2413 { |
| 5275 | 2414 octave_idx_type ii = ra_idx.elem (k++); |
| 4530 | 2415 |
| 2416 if (ii >= orig_len) | |
| 5535 | 2417 retval.elem (i) = rfv; |
| 4530 | 2418 else |
| 5535 | 2419 retval.elem (i) = elem (ii); |
| 4530 | 2420 } |
| 2421 } | |
| 2422 } | |
| 2423 | |
| 2424 return retval; | |
| 2425 } | |
| 2426 | |
| 2427 template <class T> | |
| 2428 Array<T> | |
| 4517 | 2429 Array<T>::index (idx_vector& idx_i, idx_vector& idx_j, int resize_ok, |
| 2430 const T& rfv) const | |
| 2431 { | |
| 2432 Array<T> retval; | |
| 2433 | |
| 7189 | 2434 if (ndims () != 2) |
| 2435 { | |
| 2436 Array<idx_vector> ra_idx (2); | |
| 2437 ra_idx(0) = idx_i; | |
| 2438 ra_idx(1) = idx_j; | |
| 2439 return index (ra_idx, resize_ok, rfv); | |
| 2440 } | |
| 4548 | 2441 |
| 5275 | 2442 octave_idx_type nr = dim1 (); |
| 2443 octave_idx_type nc = dim2 (); | |
| 2444 | |
| 2445 octave_idx_type n = idx_i.freeze (nr, "row", resize_ok); | |
| 2446 octave_idx_type m = idx_j.freeze (nc, "column", resize_ok); | |
| 4517 | 2447 |
| 2448 if (idx_i && idx_j) | |
| 2449 { | |
| 2450 if (idx_i.orig_empty () || idx_j.orig_empty () || n == 0 || m == 0) | |
| 2451 { | |
| 2452 retval.resize_no_fill (n, m); | |
| 2453 } | |
| 2454 else if (idx_i.is_colon_equiv (nr) && idx_j.is_colon_equiv (nc)) | |
| 2455 { | |
| 2456 retval = *this; | |
| 2457 } | |
| 2458 else | |
| 2459 { | |
| 2460 retval.resize_no_fill (n, m); | |
| 2461 | |
| 5275 | 2462 for (octave_idx_type j = 0; j < m; j++) |
| 4517 | 2463 { |
| 5275 | 2464 octave_idx_type jj = idx_j.elem (j); |
| 2465 for (octave_idx_type i = 0; i < n; i++) | |
| 4517 | 2466 { |
| 5275 | 2467 octave_idx_type ii = idx_i.elem (i); |
| 4517 | 2468 if (ii >= nr || jj >= nc) |
| 2469 retval.elem (i, j) = rfv; | |
| 2470 else | |
| 2471 retval.elem (i, j) = elem (ii, jj); | |
| 2472 } | |
| 2473 } | |
| 2474 } | |
| 2475 } | |
| 2476 | |
| 2477 // idx_vector::freeze() printed an error message for us. | |
| 2478 | |
| 2479 return retval; | |
| 2480 } | |
| 2481 | |
| 2482 template <class T> | |
| 2483 Array<T> | |
| 5992 | 2484 Array<T>::index (Array<idx_vector>& ra_idx, int resize_ok, const T& rfv) const |
| 4517 | 2485 { |
| 4530 | 2486 // This function handles all calls with more than one idx. |
| 2487 // For (3x3x3), the call can be A(2,5), A(2,:,:), A(3,2,3) etc. | |
| 2488 | |
| 4517 | 2489 Array<T> retval; |
| 2490 | |
| 2491 int n_dims = dimensions.length (); | |
| 2492 | |
| 4737 | 2493 // Remove trailing singletons in ra_idx, but leave at least ndims |
| 2494 // elements. | |
| 2495 | |
| 5275 | 2496 octave_idx_type ra_idx_len = ra_idx.length (); |
| 4737 | 2497 |
| 4887 | 2498 bool trim_trailing_singletons = true; |
| 5275 | 2499 for (octave_idx_type j = ra_idx_len; j > n_dims; j--) |
| 4737 | 2500 { |
| 4887 | 2501 idx_vector iidx = ra_idx (ra_idx_len-1); |
| 2502 if (iidx.capacity () == 1 && trim_trailing_singletons) | |
| 4737 | 2503 ra_idx_len--; |
| 2504 else | |
| 4887 | 2505 trim_trailing_singletons = false; |
| 2506 | |
| 5992 | 2507 if (! resize_ok) |
| 2508 { | |
| 2509 for (octave_idx_type i = 0; i < iidx.capacity (); i++) | |
| 2510 if (iidx (i) != 0) | |
| 2511 { | |
| 2512 (*current_liboctave_error_handler) | |
| 2513 ("index exceeds N-d array dimensions"); | |
| 2514 | |
| 2515 return retval; | |
| 2516 } | |
| 2517 } | |
| 4737 | 2518 } |
| 2519 | |
| 2520 ra_idx.resize (ra_idx_len); | |
| 2521 | |
| 4887 | 2522 dim_vector new_dims = dims (); |
| 2523 dim_vector frozen_lengths; | |
| 2524 | |
|
7597
6b2a99e44ff2
shortened empty indexing fix
David Bateman <dbateman@free.fr>
parents:
7573
diff
changeset
|
2525 if (!ra_idx (ra_idx_len - 1).orig_empty () && ra_idx_len < n_dims) |
| 4887 | 2526 frozen_lengths = short_freeze (ra_idx, dimensions, resize_ok); |
| 2527 else | |
| 4517 | 2528 { |
| 4887 | 2529 new_dims.resize (ra_idx_len, 1); |
| 2530 frozen_lengths = freeze (ra_idx, new_dims, resize_ok); | |
| 4530 | 2531 } |
| 2532 | |
| 4887 | 2533 if (all_ok (ra_idx)) |
| 4530 | 2534 { |
| 4887 | 2535 if (any_orig_empty (ra_idx) || frozen_lengths.any_zero ()) |
| 2536 { | |
| 2537 frozen_lengths.chop_trailing_singletons (); | |
| 2538 | |
| 2539 retval.resize (frozen_lengths); | |
| 2540 } | |
| 2541 else if (frozen_lengths.length () == n_dims | |
| 2542 && all_colon_equiv (ra_idx, dimensions)) | |
| 2543 { | |
| 2544 retval = *this; | |
| 2545 } | |
| 2546 else | |
| 4517 | 2547 { |
| 4887 | 2548 dim_vector frozen_lengths_for_resize = frozen_lengths; |
| 2549 | |
| 2550 frozen_lengths_for_resize.chop_trailing_singletons (); | |
| 2551 | |
| 2552 retval.resize (frozen_lengths_for_resize); | |
| 2553 | |
| 5275 | 2554 octave_idx_type n = retval.length (); |
| 2555 | |
| 2556 Array<octave_idx_type> result_idx (ra_idx.length (), 0); | |
| 2557 | |
| 2558 Array<octave_idx_type> elt_idx; | |
| 2559 | |
| 2560 for (octave_idx_type i = 0; i < n; i++) | |
| 4530 | 2561 { |
| 4887 | 2562 elt_idx = get_elt_idx (ra_idx, result_idx); |
| 2563 | |
| 5275 | 2564 octave_idx_type numelem_elt = get_scalar_idx (elt_idx, new_dims); |
| 4887 | 2565 |
| 5992 | 2566 if (numelem_elt >= length () || numelem_elt < 0) |
| 2567 retval.elem (i) = rfv; | |
| 4887 | 2568 else |
| 2569 retval.elem (i) = elem (numelem_elt); | |
| 2570 | |
| 2571 increment_index (result_idx, frozen_lengths); | |
| 2572 | |
| 4517 | 2573 } |
| 2574 } | |
| 2575 } | |
| 2576 | |
| 2577 return retval; | |
| 2578 } | |
| 2579 | |
| 7433 | 2580 template <class T> |
| 2581 bool | |
| 2582 ascending_compare (T a, T b) | |
| 2583 { | |
| 2584 return (a < b); | |
| 2585 } | |
| 2586 | |
| 2587 template <class T> | |
| 2588 bool | |
| 2589 descending_compare (T a, T b) | |
| 2590 { | |
| 2591 return (a > b); | |
| 2592 } | |
| 2593 | |
| 2594 template <class T> | |
| 2595 bool | |
| 2596 ascending_compare (vec_index<T> *a, vec_index<T> *b) | |
| 2597 { | |
| 2598 return (a->vec < b->vec); | |
| 2599 } | |
| 2600 | |
| 2601 template <class T> | |
| 2602 bool | |
| 2603 descending_compare (vec_index<T> *a, vec_index<T> *b) | |
| 2604 { | |
| 2605 return (a->vec > b->vec); | |
| 2606 } | |
| 2607 | |
| 2608 template <class T> | |
| 2609 Array<T> | |
| 2610 Array<T>::sort (octave_idx_type dim, sortmode mode) const | |
| 2611 { | |
| 2612 Array<T> m = *this; | |
| 2613 | |
| 2614 dim_vector dv = m.dims (); | |
| 2615 | |
| 2616 if (m.length () < 1) | |
| 2617 return m; | |
| 2618 | |
| 2619 octave_idx_type ns = dv(dim); | |
| 2620 octave_idx_type iter = dv.numel () / ns; | |
| 2621 octave_idx_type stride = 1; | |
| 2622 for (int i = 0; i < dim; i++) | |
| 2623 stride *= dv(i); | |
| 2624 | |
| 2625 T *v = m.fortran_vec (); | |
| 2626 octave_sort<T> lsort; | |
| 2627 | |
| 2628 if (mode == ASCENDING) | |
| 2629 lsort.set_compare (ascending_compare); | |
| 2630 else if (mode == DESCENDING) | |
| 2631 lsort.set_compare (descending_compare); | |
|
7463
2467639bd8c0
eliminate UNDEFINED sort mode
John W. Eaton <jwe@octave.org>
parents:
7443
diff
changeset
|
2632 else |
|
2467639bd8c0
eliminate UNDEFINED sort mode
John W. Eaton <jwe@octave.org>
parents:
7443
diff
changeset
|
2633 abort (); |
| 7433 | 2634 |
| 2635 if (stride == 1) | |
| 2636 { | |
| 2637 for (octave_idx_type j = 0; j < iter; j++) | |
| 2638 { | |
| 2639 lsort.sort (v, ns); | |
| 2640 v += ns; | |
| 2641 } | |
| 2642 } | |
| 2643 else | |
| 2644 { | |
| 2645 // Don't use OCTAVE_LOCAL_BUFFER here as it doesn't work with bool | |
| 2646 // on some compilers. | |
| 2647 Array<T> vi (ns); | |
| 2648 T *pvi = vi.fortran_vec (); | |
| 2649 | |
| 2650 for (octave_idx_type j = 0; j < iter; j++) | |
| 2651 { | |
| 2652 octave_idx_type offset = j; | |
| 2653 octave_idx_type offset2 = 0; | |
| 2654 while (offset >= stride) | |
| 2655 { | |
| 2656 offset -= stride; | |
| 2657 offset2++; | |
| 2658 } | |
| 2659 offset += offset2 * stride * ns; | |
| 2660 | |
| 2661 for (octave_idx_type i = 0; i < ns; i++) | |
| 2662 pvi[i] = v[i*stride + offset]; | |
| 2663 | |
| 2664 lsort.sort (pvi, ns); | |
| 2665 | |
| 2666 for (octave_idx_type i = 0; i < ns; i++) | |
| 2667 v[i*stride + offset] = pvi[i]; | |
| 2668 } | |
| 2669 } | |
| 2670 | |
| 2671 return m; | |
| 2672 } | |
| 2673 | |
| 2674 template <class T> | |
| 2675 Array<T> | |
| 2676 Array<T>::sort (Array<octave_idx_type> &sidx, octave_idx_type dim, | |
| 2677 sortmode mode) const | |
| 2678 { | |
| 2679 Array<T> m = *this; | |
| 2680 | |
| 2681 dim_vector dv = m.dims (); | |
| 2682 | |
| 2683 if (m.length () < 1) | |
| 2684 { | |
| 2685 sidx = Array<octave_idx_type> (dv); | |
| 2686 return m; | |
| 2687 } | |
| 2688 | |
| 2689 octave_idx_type ns = dv(dim); | |
| 2690 octave_idx_type iter = dv.numel () / ns; | |
| 2691 octave_idx_type stride = 1; | |
| 2692 for (int i = 0; i < dim; i++) | |
| 2693 stride *= dv(i); | |
| 2694 | |
| 2695 T *v = m.fortran_vec (); | |
| 2696 octave_sort<vec_index<T> *> indexed_sort; | |
| 2697 | |
| 2698 if (mode == ASCENDING) | |
| 2699 indexed_sort.set_compare (ascending_compare); | |
| 2700 else if (mode == DESCENDING) | |
| 2701 indexed_sort.set_compare (descending_compare); | |
|
7463
2467639bd8c0
eliminate UNDEFINED sort mode
John W. Eaton <jwe@octave.org>
parents:
7443
diff
changeset
|
2702 else |
|
2467639bd8c0
eliminate UNDEFINED sort mode
John W. Eaton <jwe@octave.org>
parents:
7443
diff
changeset
|
2703 abort (); |
| 7433 | 2704 |
| 2705 OCTAVE_LOCAL_BUFFER (vec_index<T> *, vi, ns); | |
| 2706 OCTAVE_LOCAL_BUFFER (vec_index<T>, vix, ns); | |
| 2707 | |
| 2708 for (octave_idx_type i = 0; i < ns; i++) | |
| 2709 vi[i] = &vix[i]; | |
| 2710 | |
| 2711 sidx = Array<octave_idx_type> (dv); | |
| 2712 | |
| 2713 if (stride == 1) | |
| 2714 { | |
| 2715 for (octave_idx_type j = 0; j < iter; j++) | |
| 2716 { | |
| 2717 octave_idx_type offset = j * ns; | |
| 2718 | |
| 2719 for (octave_idx_type i = 0; i < ns; i++) | |
| 2720 { | |
| 2721 vi[i]->vec = v[i]; | |
| 2722 vi[i]->indx = i; | |
| 2723 } | |
| 2724 | |
| 2725 indexed_sort.sort (vi, ns); | |
| 2726 | |
| 2727 for (octave_idx_type i = 0; i < ns; i++) | |
| 2728 { | |
| 2729 v[i] = vi[i]->vec; | |
| 2730 sidx(i + offset) = vi[i]->indx; | |
| 2731 } | |
| 2732 v += ns; | |
| 2733 } | |
| 2734 } | |
| 2735 else | |
| 2736 { | |
| 2737 for (octave_idx_type j = 0; j < iter; j++) | |
| 2738 { | |
| 2739 octave_idx_type offset = j; | |
| 2740 octave_idx_type offset2 = 0; | |
| 2741 while (offset >= stride) | |
| 2742 { | |
| 2743 offset -= stride; | |
| 2744 offset2++; | |
| 2745 } | |
| 2746 offset += offset2 * stride * ns; | |
| 2747 | |
| 2748 for (octave_idx_type i = 0; i < ns; i++) | |
| 2749 { | |
| 2750 vi[i]->vec = v[i*stride + offset]; | |
| 2751 vi[i]->indx = i; | |
| 2752 } | |
| 2753 | |
| 2754 indexed_sort.sort (vi, ns); | |
| 2755 | |
| 2756 for (octave_idx_type i = 0; i < ns; i++) | |
| 2757 { | |
| 2758 v[i*stride+offset] = vi[i]->vec; | |
| 2759 sidx(i*stride+offset) = vi[i]->indx; | |
| 2760 } | |
| 2761 } | |
| 2762 } | |
| 2763 | |
| 2764 return m; | |
| 2765 } | |
| 2766 | |
| 7443 | 2767 #if defined (HAVE_IEEE754_DATA_FORMAT) |
| 2768 | |
| 2769 template <> | |
| 7480 | 2770 bool ascending_compare (double, double); |
| 7443 | 2771 template <> |
| 7480 | 2772 bool ascending_compare (vec_index<double>*, vec_index<double>*); |
| 7443 | 2773 template <> |
| 7480 | 2774 bool descending_compare (double, double); |
| 7443 | 2775 template <> |
| 7480 | 2776 bool descending_compare (vec_index<double>*, vec_index<double>*); |
| 7443 | 2777 |
| 2778 template <> | |
| 2779 Array<double> Array<double>::sort (octave_idx_type dim, sortmode mode) const; | |
| 2780 template <> | |
| 2781 Array<double> Array<double>::sort (Array<octave_idx_type> &sidx, | |
| 2782 octave_idx_type dim, sortmode mode) const; | |
| 2783 | |
| 2784 #endif | |
| 2785 | |
|
7620
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2786 template <class T> |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2787 Array<T> |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2788 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
|
2789 { |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2790 dim_vector dv = dims (); |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2791 octave_idx_type nd = dv.length (); |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2792 Array<T> d; |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2793 |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2794 if (nd > 2) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2795 (*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
|
2796 else |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2797 { |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2798 octave_idx_type nnr = dv (0); |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2799 octave_idx_type nnc = dv (1); |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2800 |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2801 if (nnr == 0 || nnc == 0) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2802 ; // do nothing |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2803 else if (nnr != 1 && nnc != 1) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2804 { |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2805 if (k > 0) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2806 nnc -= k; |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2807 else if (k < 0) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2808 nnr += k; |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2809 |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2810 if (nnr > 0 && nnc > 0) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2811 { |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2812 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
|
2813 |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2814 d.resize (dim_vector (ndiag, 1)); |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2815 |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2816 if (k > 0) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2817 { |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2818 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
|
2819 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
|
2820 } |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2821 else if (k < 0) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2822 { |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2823 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
|
2824 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
|
2825 } |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2826 else |
|
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); |
|
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 } |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2832 else |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2833 (*current_liboctave_error_handler) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2834 ("diag: requested diagonal out of range"); |
|
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 if (nnr != 0 && nnc != 0) |
|
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 octave_idx_type roff = 0; |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2839 octave_idx_type coff = 0; |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2840 if (k > 0) |
|
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 roff = 0; |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2843 coff = k; |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2844 } |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2845 else if (k < 0) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2846 { |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2847 roff = -k; |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2848 coff = 0; |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2849 } |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2850 |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2851 if (nnr == 1) |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2852 { |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2853 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
|
2854 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
|
2855 |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2856 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
|
2857 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
|
2858 } |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2859 else |
|
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 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
|
2862 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
|
2863 |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2864 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
|
2865 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
|
2866 } |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2867 } |
|
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 |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2870 return d; |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2871 } |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7605
diff
changeset
|
2872 |
| 5775 | 2873 // FIXME -- this is a mess. |
| 4517 | 2874 |
| 2875 template <class LT, class RT> | |
| 2876 int | |
| 2877 assign (Array<LT>& lhs, const Array<RT>& rhs, const LT& rfv) | |
| 2878 { | |
| 6388 | 2879 int n_idx = lhs.index_count (); |
| 2880 | |
| 2881 // kluge... | |
| 2882 if (lhs.ndims () == 0) | |
| 2883 lhs.resize_no_fill (0, 0); | |
| 2884 | |
| 2885 return (lhs.ndims () == 2 | |
| 2886 && (n_idx == 1 | |
| 2887 || (n_idx < 3 | |
| 2888 && rhs.ndims () == 2 | |
| 2889 && rhs.rows () == 0 && rhs.columns () == 0))) | |
| 2890 ? assign2 (lhs, rhs, rfv) : assignN (lhs, rhs, rfv); | |
| 4517 | 2891 } |
| 2892 | |
| 2893 template <class LT, class RT> | |
| 2894 int | |
| 2895 assign1 (Array<LT>& lhs, const Array<RT>& rhs, const LT& rfv) | |
| 2896 { | |
| 2897 int retval = 1; | |
| 2898 | |
| 2899 idx_vector *tmp = lhs.get_idx (); | |
| 2900 | |
| 2901 idx_vector lhs_idx = tmp[0]; | |
| 2902 | |
| 5275 | 2903 octave_idx_type lhs_len = lhs.length (); |
| 2904 octave_idx_type rhs_len = rhs.length (); | |
| 2905 | |
| 5781 | 2906 octave_idx_type n = lhs_idx.freeze (lhs_len, "vector", true); |
| 4517 | 2907 |
| 2908 if (n != 0) | |
| 2909 { | |
| 6389 | 2910 dim_vector lhs_dims = lhs.dims (); |
| 2911 | |
| 6922 | 2912 if (lhs_len != 0 |
| 2913 || lhs_dims.all_zero () | |
| 2914 || (lhs_dims.length () == 2 && lhs_dims(0) < 2)) | |
| 4517 | 2915 { |
| 6392 | 2916 if (rhs_len == n || rhs_len == 1) |
| 2917 { | |
| 6884 | 2918 lhs.make_unique (); |
| 2919 | |
| 6392 | 2920 octave_idx_type max_idx = lhs_idx.max () + 1; |
| 2921 if (max_idx > lhs_len) | |
| 2922 lhs.resize_and_fill (max_idx, rfv); | |
| 2923 } | |
| 2924 | |
| 2925 if (rhs_len == n) | |
| 2926 { | |
| 6884 | 2927 lhs.make_unique (); |
| 2928 | |
| 2929 if (lhs_idx.is_colon ()) | |
| 6392 | 2930 { |
| 6884 | 2931 for (octave_idx_type i = 0; i < n; i++) |
| 2932 lhs.xelem (i) = rhs.elem (i); | |
| 2933 } | |
| 2934 else | |
| 2935 { | |
| 2936 for (octave_idx_type i = 0; i < n; i++) | |
| 2937 { | |
| 2938 octave_idx_type ii = lhs_idx.elem (i); | |
| 2939 lhs.xelem (ii) = rhs.elem (i); | |
| 2940 } | |
| 6392 | 2941 } |
| 2942 } | |
| 2943 else if (rhs_len == 1) | |
| 2944 { | |
| 6884 | 2945 lhs.make_unique (); |
| 2946 | |
| 6392 | 2947 RT scalar = rhs.elem (0); |
| 2948 | |
| 6884 | 2949 if (lhs_idx.is_colon ()) |
| 6392 | 2950 { |
| 6884 | 2951 for (octave_idx_type i = 0; i < n; i++) |
| 2952 lhs.xelem (i) = scalar; | |
| 2953 } | |
| 2954 else | |
| 2955 { | |
| 2956 for (octave_idx_type i = 0; i < n; i++) | |
| 2957 { | |
| 2958 octave_idx_type ii = lhs_idx.elem (i); | |
| 2959 lhs.xelem (ii) = scalar; | |
| 2960 } | |
| 6392 | 2961 } |
| 2962 } | |
| 2963 else | |
| 2964 { | |
| 2965 (*current_liboctave_error_handler) | |
| 2966 ("A(I) = X: X must be a scalar or a vector with same length as I"); | |
| 2967 | |
| 2968 retval = 0; | |
| 2969 } | |
| 4517 | 2970 } |
| 6922 | 2971 else |
| 2972 { | |
| 2973 (*current_liboctave_error_handler) | |
| 2974 ("A(I) = X: unable to resize A"); | |
| 2975 | |
| 2976 retval = 0; | |
| 2977 } | |
| 4517 | 2978 } |
| 2979 else if (lhs_idx.is_colon ()) | |
| 2980 { | |
| 6384 | 2981 dim_vector lhs_dims = lhs.dims (); |
| 2982 | |
| 2983 if (lhs_dims.all_zero ()) | |
| 4517 | 2984 { |
| 6884 | 2985 lhs.make_unique (); |
| 2986 | |
| 4517 | 2987 lhs.resize_no_fill (rhs_len); |
| 2988 | |
| 5275 | 2989 for (octave_idx_type i = 0; i < rhs_len; i++) |
| 6884 | 2990 lhs.xelem (i) = rhs.elem (i); |
| 4517 | 2991 } |
| 6553 | 2992 else if (rhs_len != lhs_len) |
| 4517 | 2993 (*current_liboctave_error_handler) |
| 2994 ("A(:) = X: A must be the same size as X"); | |
| 2995 } | |
| 2996 else if (! (rhs_len == 1 || rhs_len == 0)) | |
| 2997 { | |
| 2998 (*current_liboctave_error_handler) | |
| 2999 ("A([]) = X: X must also be an empty matrix or a scalar"); | |
| 3000 | |
| 3001 retval = 0; | |
| 3002 } | |
| 3003 | |
| 3004 lhs.clear_index (); | |
| 3005 | |
| 3006 return retval; | |
| 3007 } | |
| 3008 | |
| 3009 #define MAYBE_RESIZE_LHS \ | |
| 3010 do \ | |
| 3011 { \ | |
| 5275 | 3012 octave_idx_type max_row_idx = idx_i_is_colon ? rhs_nr : idx_i.max () + 1; \ |
| 3013 octave_idx_type max_col_idx = idx_j_is_colon ? rhs_nc : idx_j.max () + 1; \ | |
| 4517 | 3014 \ |
| 5275 | 3015 octave_idx_type new_nr = max_row_idx > lhs_nr ? max_row_idx : lhs_nr; \ |
| 3016 octave_idx_type new_nc = max_col_idx > lhs_nc ? max_col_idx : lhs_nc; \ | |
| 4517 | 3017 \ |
| 3018 lhs.resize_and_fill (new_nr, new_nc, rfv); \ | |
| 3019 } \ | |
| 3020 while (0) | |
| 3021 | |
| 3022 template <class LT, class RT> | |
| 3023 int | |
| 3024 assign2 (Array<LT>& lhs, const Array<RT>& rhs, const LT& rfv) | |
| 3025 { | |
| 3026 int retval = 1; | |
| 3027 | |
| 3028 int n_idx = lhs.index_count (); | |
| 3029 | |
| 5275 | 3030 octave_idx_type lhs_nr = lhs.rows (); |
| 3031 octave_idx_type lhs_nc = lhs.cols (); | |
| 4517 | 3032 |
| 5047 | 3033 Array<RT> xrhs = rhs; |
| 3034 | |
| 5275 | 3035 octave_idx_type rhs_nr = xrhs.rows (); |
| 3036 octave_idx_type rhs_nc = xrhs.cols (); | |
| 5047 | 3037 |
| 3038 if (xrhs.ndims () > 2) | |
| 4707 | 3039 { |
| 5047 | 3040 xrhs = xrhs.squeeze (); |
| 3041 | |
| 3042 dim_vector dv_tmp = xrhs.dims (); | |
| 4709 | 3043 |
| 4708 | 3044 switch (dv_tmp.length ()) |
| 4707 | 3045 { |
| 4708 | 3046 case 1: |
| 5775 | 3047 // FIXME -- this case should be unnecessary, because |
| 5047 | 3048 // squeeze should always return an object with 2 dimensions. |
| 4708 | 3049 if (rhs_nr == 1) |
| 3050 rhs_nc = dv_tmp.elem (0); | |
| 3051 break; | |
| 4709 | 3052 |
| 4708 | 3053 case 2: |
| 4707 | 3054 rhs_nr = dv_tmp.elem (0); |
| 3055 rhs_nc = dv_tmp.elem (1); | |
| 4708 | 3056 break; |
| 3057 | |
| 3058 default: | |
| 3059 (*current_liboctave_error_handler) | |
| 3060 ("Array<T>::assign2: Dimension mismatch"); | |
| 4709 | 3061 return 0; |
| 4707 | 3062 } |
| 3063 } | |
| 4517 | 3064 |
| 6384 | 3065 bool rhs_is_scalar = rhs_nr == 1 && rhs_nc == 1; |
| 3066 | |
| 4517 | 3067 idx_vector *tmp = lhs.get_idx (); |
| 3068 | |
| 3069 idx_vector idx_i; | |
| 3070 idx_vector idx_j; | |
| 3071 | |
| 3072 if (n_idx > 1) | |
| 3073 idx_j = tmp[1]; | |
| 3074 | |
| 3075 if (n_idx > 0) | |
| 3076 idx_i = tmp[0]; | |
| 3077 | |
| 3078 if (n_idx == 2) | |
| 3079 { | |
| 5781 | 3080 octave_idx_type n = idx_i.freeze (lhs_nr, "row", true); |
| 3081 octave_idx_type m = idx_j.freeze (lhs_nc, "column", true); | |
| 4517 | 3082 |
| 3083 int idx_i_is_colon = idx_i.is_colon (); | |
| 3084 int idx_j_is_colon = idx_j.is_colon (); | |
| 3085 | |
| 6384 | 3086 if (lhs_nr == 0 && lhs_nc == 0) |
| 3087 { | |
| 3088 if (idx_i_is_colon) | |
| 3089 n = rhs_nr; | |
| 3090 | |
| 3091 if (idx_j_is_colon) | |
| 3092 m = rhs_nc; | |
| 3093 } | |
| 4517 | 3094 |
| 3095 if (idx_i && idx_j) | |
| 3096 { | |
| 3097 if (rhs_nr == 0 && rhs_nc == 0) | |
| 3098 { | |
| 3099 lhs.maybe_delete_elements (idx_i, idx_j); | |
| 3100 } | |
| 3101 else | |
| 3102 { | |
| 6384 | 3103 if (rhs_is_scalar && n >= 0 && m >= 0) |
| 4517 | 3104 { |
| 4534 | 3105 // No need to do anything if either of the indices |
| 3106 // are empty. | |
| 3107 | |
| 3108 if (n > 0 && m > 0) | |
| 4517 | 3109 { |
| 6884 | 3110 lhs.make_unique (); |
| 3111 | |
| 4534 | 3112 MAYBE_RESIZE_LHS; |
| 3113 | |
| 5047 | 3114 RT scalar = xrhs.elem (0, 0); |
| 4534 | 3115 |
| 5275 | 3116 for (octave_idx_type j = 0; j < m; j++) |
| 4517 | 3117 { |
| 5275 | 3118 octave_idx_type jj = idx_j.elem (j); |
| 3119 for (octave_idx_type i = 0; i < n; i++) | |
| 4534 | 3120 { |
| 5275 | 3121 octave_idx_type ii = idx_i.elem (i); |
| 6884 | 3122 lhs.xelem (ii, jj) = scalar; |
| 4534 | 3123 } |
| 4517 | 3124 } |
| 3125 } | |
| 3126 } | |
| 6072 | 3127 else if ((n == 1 || m == 1) |
| 3128 && (rhs_nr == 1 || rhs_nc == 1) | |
| 3129 && n * m == rhs_nr * rhs_nc) | |
| 3130 { | |
| 6884 | 3131 lhs.make_unique (); |
| 3132 | |
| 6384 | 3133 MAYBE_RESIZE_LHS; |
| 3134 | |
| 6072 | 3135 if (n > 0 && m > 0) |
| 3136 { | |
| 3137 octave_idx_type k = 0; | |
| 3138 | |
| 3139 for (octave_idx_type j = 0; j < m; j++) | |
| 3140 { | |
| 3141 octave_idx_type jj = idx_j.elem (j); | |
| 3142 for (octave_idx_type i = 0; i < n; i++) | |
| 3143 { | |
| 3144 octave_idx_type ii = idx_i.elem (i); | |
| 6884 | 3145 lhs.xelem (ii, jj) = xrhs.elem (k++); |
| 6072 | 3146 } |
| 3147 } | |
| 3148 } | |
| 3149 } | |
| 4517 | 3150 else if (n == rhs_nr && m == rhs_nc) |
| 3151 { | |
| 6884 | 3152 lhs.make_unique (); |
| 3153 | |
| 6384 | 3154 MAYBE_RESIZE_LHS; |
| 3155 | |
| 4517 | 3156 if (n > 0 && m > 0) |
| 3157 { | |
| 5275 | 3158 for (octave_idx_type j = 0; j < m; j++) |
| 4517 | 3159 { |
| 5275 | 3160 octave_idx_type jj = idx_j.elem (j); |
| 3161 for (octave_idx_type i = 0; i < n; i++) | |
| 4517 | 3162 { |
| 5275 | 3163 octave_idx_type ii = idx_i.elem (i); |
| 6884 | 3164 lhs.xelem (ii, jj) = xrhs.elem (i, j); |
| 4517 | 3165 } |
| 3166 } | |
| 3167 } | |
| 3168 } | |
| 3169 else if (n == 0 && m == 0) | |
| 3170 { | |
| 6384 | 3171 if (! (rhs_is_scalar || (rhs_nr == 0 || rhs_nc == 0))) |
| 4517 | 3172 { |
| 3173 (*current_liboctave_error_handler) | |
| 3174 ("A([], []) = X: X must be an empty matrix or a scalar"); | |
| 3175 | |
| 3176 retval = 0; | |
| 3177 } | |
| 3178 } | |
| 3179 else | |
| 3180 { | |
| 3181 (*current_liboctave_error_handler) | |
| 3182 ("A(I, J) = X: X must be a scalar or the number of elements in I must"); | |
| 3183 (*current_liboctave_error_handler) | |
| 3184 ("match the number of rows in X and the number of elements in J must"); | |
| 3185 (*current_liboctave_error_handler) | |
| 3186 ("match the number of columns in X"); | |
| 3187 | |
| 3188 retval = 0; | |
| 3189 } | |
| 3190 } | |
| 3191 } | |
| 3192 // idx_vector::freeze() printed an error message for us. | |
| 3193 } | |
| 3194 else if (n_idx == 1) | |
| 3195 { | |
| 3196 int lhs_is_empty = lhs_nr == 0 || lhs_nc == 0; | |
| 3197 | |
| 3198 if (lhs_is_empty || (lhs_nr == 1 && lhs_nc == 1)) | |
| 3199 { | |
| 5275 | 3200 octave_idx_type lhs_len = lhs.length (); |
| 3201 | |
| 6384 | 3202 idx_i.freeze (lhs_len, 0, true); |
| 4517 | 3203 |
| 3204 if (idx_i) | |
| 3205 { | |
| 3206 if (rhs_nr == 0 && rhs_nc == 0) | |
| 3207 { | |
| 6384 | 3208 lhs.maybe_delete_elements (idx_i); |
| 4517 | 3209 } |
| 3210 else | |
| 3211 { | |
| 5781 | 3212 if (lhs_is_empty |
| 3213 && idx_i.is_colon () | |
| 3214 && ! (rhs_nr == 1 || rhs_nc == 1)) | |
| 4517 | 3215 { |
| 5781 | 3216 (*current_liboctave_warning_with_id_handler) |
| 3217 ("Octave:fortran-indexing", | |
| 3218 "A(:) = X: X is not a vector or scalar"); | |
| 3219 } | |
| 3220 else | |
| 3221 { | |
| 3222 octave_idx_type idx_nr = idx_i.orig_rows (); | |
| 3223 octave_idx_type idx_nc = idx_i.orig_columns (); | |
| 3224 | |
| 3225 if (! (rhs_nr == idx_nr && rhs_nc == idx_nc)) | |
| 3226 (*current_liboctave_warning_with_id_handler) | |
| 3227 ("Octave:fortran-indexing", | |
| 3228 "A(I) = X: X does not have same shape as I"); | |
| 4517 | 3229 } |
| 3230 | |
| 5047 | 3231 if (assign1 (lhs, xrhs, rfv)) |
| 4517 | 3232 { |
| 5275 | 3233 octave_idx_type len = lhs.length (); |
| 4517 | 3234 |
| 3235 if (len > 0) | |
| 3236 { | |
| 3237 // The following behavior is much simplified | |
| 3238 // over previous versions of Octave. It | |
| 3239 // seems to be compatible with Matlab. | |
| 3240 | |
| 3241 lhs.dimensions = dim_vector (1, lhs.length ()); | |
| 3242 } | |
| 3243 } | |
| 3244 else | |
| 3245 retval = 0; | |
| 3246 } | |
| 3247 } | |
| 3248 // idx_vector::freeze() printed an error message for us. | |
| 3249 } | |
| 3250 else if (lhs_nr == 1) | |
| 3251 { | |
| 5781 | 3252 idx_i.freeze (lhs_nc, "vector", true); |
| 4517 | 3253 |
| 3254 if (idx_i) | |
| 3255 { | |
| 3256 if (rhs_nr == 0 && rhs_nc == 0) | |
| 3257 lhs.maybe_delete_elements (idx_i); | |
| 3258 else | |
| 3259 { | |
| 5047 | 3260 if (assign1 (lhs, xrhs, rfv)) |
| 4517 | 3261 lhs.dimensions = dim_vector (1, lhs.length ()); |
| 3262 else | |
| 3263 retval = 0; | |
| 3264 } | |
| 3265 } | |
| 3266 // idx_vector::freeze() printed an error message for us. | |
| 3267 } | |
| 3268 else if (lhs_nc == 1) | |
| 3269 { | |
| 5781 | 3270 idx_i.freeze (lhs_nr, "vector", true); |
| 4517 | 3271 |
| 3272 if (idx_i) | |
| 3273 { | |
| 3274 if (rhs_nr == 0 && rhs_nc == 0) | |
| 3275 lhs.maybe_delete_elements (idx_i); | |
| 3276 else | |
| 3277 { | |
| 5047 | 3278 if (assign1 (lhs, xrhs, rfv)) |
| 4517 | 3279 lhs.dimensions = dim_vector (lhs.length (), 1); |
| 3280 else | |
| 3281 retval = 0; | |
| 3282 } | |
| 3283 } | |
| 3284 // idx_vector::freeze() printed an error message for us. | |
| 3285 } | |
| 3286 else | |
| 3287 { | |
|
7573
755bf7ecc29b
eliminate one_zero stuff from idx_vector
John W. Eaton <jwe@octave.org>
parents:
7480
diff
changeset
|
3288 if (! idx_i.is_colon ()) |
| 5781 | 3289 (*current_liboctave_warning_with_id_handler) |
| 3290 ("Octave:fortran-indexing", "single index used for matrix"); | |
| 4517 | 3291 |
| 5275 | 3292 octave_idx_type len = idx_i.freeze (lhs_nr * lhs_nc, "matrix"); |
| 4517 | 3293 |
| 3294 if (idx_i) | |
| 3295 { | |
| 4756 | 3296 if (rhs_nr == 0 && rhs_nc == 0) |
| 3297 lhs.maybe_delete_elements (idx_i); | |
| 3298 else if (len == 0) | |
| 4517 | 3299 { |
| 6384 | 3300 if (! (rhs_is_scalar || (rhs_nr == 0 || rhs_nc == 0))) |
| 4517 | 3301 (*current_liboctave_error_handler) |
| 3302 ("A([]) = X: X must be an empty matrix or scalar"); | |
| 3303 } | |
| 3304 else if (len == rhs_nr * rhs_nc) | |
| 3305 { | |
| 6884 | 3306 lhs.make_unique (); |
| 3307 | |
| 3308 if (idx_i.is_colon ()) | |
| 4517 | 3309 { |
| 6884 | 3310 for (octave_idx_type i = 0; i < len; i++) |
| 3311 lhs.xelem (i) = xrhs.elem (i); | |
| 3312 } | |
| 3313 else | |
| 3314 { | |
| 3315 for (octave_idx_type i = 0; i < len; i++) | |
| 3316 { | |
| 3317 octave_idx_type ii = idx_i.elem (i); | |
| 3318 lhs.xelem (ii) = xrhs.elem (i); | |
| 3319 } | |
| 4517 | 3320 } |
| 3321 } | |
| 6384 | 3322 else if (rhs_is_scalar) |
| 4517 | 3323 { |
| 6884 | 3324 lhs.make_unique (); |
| 3325 | |
| 4517 | 3326 RT scalar = rhs.elem (0, 0); |
| 3327 | |
| 6884 | 3328 if (idx_i.is_colon ()) |
| 4517 | 3329 { |
| 6884 | 3330 for (octave_idx_type i = 0; i < len; i++) |
| 3331 lhs.xelem (i) = scalar; | |
| 3332 } | |
| 3333 else | |
| 3334 { | |
| 3335 for (octave_idx_type i = 0; i < len; i++) | |
| 3336 { | |
| 3337 octave_idx_type ii = idx_i.elem (i); | |
| 3338 lhs.xelem (ii) = scalar; | |
| 3339 } | |
| 4517 | 3340 } |
| 3341 } | |
| 3342 else | |
| 3343 { | |
| 3344 (*current_liboctave_error_handler) | |
| 3345 ("A(I) = X: X must be a scalar or a matrix with the same size as I"); | |
| 3346 | |
| 3347 retval = 0; | |
| 3348 } | |
| 3349 } | |
| 3350 // idx_vector::freeze() printed an error message for us. | |
| 3351 } | |
| 3352 } | |
| 3353 else | |
| 3354 { | |
| 3355 (*current_liboctave_error_handler) | |
| 3356 ("invalid number of indices for matrix expression"); | |
| 3357 | |
| 3358 retval = 0; | |
| 3359 } | |
| 3360 | |
| 3361 lhs.clear_index (); | |
| 3362 | |
| 3363 return retval; | |
| 3364 } | |
| 3365 | |
| 3366 template <class LT, class RT> | |
| 3367 int | |
| 3368 assignN (Array<LT>& lhs, const Array<RT>& rhs, const LT& rfv) | |
| 3369 { | |
| 3370 int retval = 1; | |
| 3371 | |
| 4746 | 3372 dim_vector rhs_dims = rhs.dims (); |
| 3373 | |
| 5275 | 3374 octave_idx_type rhs_dims_len = rhs_dims.length (); |
| 4746 | 3375 |
| 3376 bool rhs_is_scalar = is_scalar (rhs_dims); | |
| 3377 | |
| 4517 | 3378 int n_idx = lhs.index_count (); |
| 3379 | |
| 4745 | 3380 idx_vector *idx_vex = lhs.get_idx (); |
| 3381 | |
| 3382 Array<idx_vector> idx = conv_to_array (idx_vex, n_idx); | |
| 4517 | 3383 |
| 4743 | 3384 if (rhs_dims_len == 2 && rhs_dims(0) == 0 && rhs_dims(1) == 0) |
| 4517 | 3385 { |
| 3386 lhs.maybe_delete_elements (idx, rfv); | |
| 3387 } | |
| 5285 | 3388 else if (n_idx == 0) |
| 3389 { | |
| 3390 (*current_liboctave_error_handler) | |
| 3391 ("invalid number of indices for matrix expression"); | |
| 3392 | |
| 3393 retval = 0; | |
| 3394 } | |
| 4657 | 3395 else if (n_idx == 1) |
| 4517 | 3396 { |
| 4657 | 3397 idx_vector iidx = idx(0); |
| 6884 | 3398 int iidx_is_colon = iidx.is_colon (); |
| 3399 | |
|
7573
755bf7ecc29b
eliminate one_zero stuff from idx_vector
John W. Eaton <jwe@octave.org>
parents:
7480
diff
changeset
|
3400 if (! iidx_is_colon) |
| 5781 | 3401 (*current_liboctave_warning_with_id_handler) |
| 3402 ("Octave:fortran-indexing", "single index used for N-d array"); | |
| 4657 | 3403 |
| 5275 | 3404 octave_idx_type lhs_len = lhs.length (); |
| 3405 | |
| 3406 octave_idx_type len = iidx.freeze (lhs_len, "N-d arrray"); | |
| 4657 | 3407 |
| 3408 if (iidx) | |
| 4533 | 3409 { |
| 4657 | 3410 if (len == 0) |
| 4656 | 3411 { |
| 5039 | 3412 if (! (rhs_dims.all_ones () || rhs_dims.any_zero ())) |
| 4743 | 3413 { |
| 3414 (*current_liboctave_error_handler) | |
| 3415 ("A([]) = X: X must be an empty matrix or scalar"); | |
| 3416 | |
| 3417 retval = 0; | |
| 3418 } | |
| 4657 | 3419 } |
| 3420 else if (len == rhs.length ()) | |
| 3421 { | |
| 6884 | 3422 lhs.make_unique (); |
| 3423 | |
| 3424 if (iidx_is_colon) | |
| 4656 | 3425 { |
| 6884 | 3426 for (octave_idx_type i = 0; i < len; i++) |
| 3427 lhs.xelem (i) = rhs.elem (i); | |
| 3428 } | |
| 3429 else | |
| 3430 { | |
| 3431 for (octave_idx_type i = 0; i < len; i++) | |
| 3432 { | |
| 3433 octave_idx_type ii = iidx.elem (i); | |
| 3434 | |
| 3435 lhs.xelem (ii) = rhs.elem (i); | |
| 3436 } | |
| 4656 | 3437 } |
| 3438 } | |
| 4716 | 3439 else if (rhs_is_scalar) |
| 4657 | 3440 { |
| 3441 RT scalar = rhs.elem (0); | |
| 3442 | |
| 6884 | 3443 lhs.make_unique (); |
| 3444 | |
| 3445 if (iidx_is_colon) | |
| 4657 | 3446 { |
| 6884 | 3447 for (octave_idx_type i = 0; i < len; i++) |
| 3448 lhs.xelem (i) = scalar; | |
| 3449 } | |
| 3450 else | |
| 3451 { | |
| 3452 for (octave_idx_type i = 0; i < len; i++) | |
| 3453 { | |
| 3454 octave_idx_type ii = iidx.elem (i); | |
| 3455 | |
| 3456 lhs.xelem (ii) = scalar; | |
| 3457 } | |
| 4657 | 3458 } |
| 3459 } | |
| 3460 else | |
| 3461 { | |
| 3462 (*current_liboctave_error_handler) | |
| 4702 | 3463 ("A(I) = X: X must be a scalar or a matrix with the same size as I"); |
| 3464 | |
| 4657 | 3465 retval = 0; |
| 3466 } | |
| 3467 | |
| 4656 | 3468 // idx_vector::freeze() printed an error message for us. |
| 4533 | 3469 } |
| 4702 | 3470 } |
| 4743 | 3471 else |
| 4702 | 3472 { |
| 4746 | 3473 // Maybe expand to more dimensions. |
| 3474 | |
| 3475 dim_vector lhs_dims = lhs.dims (); | |
| 3476 | |
| 5275 | 3477 octave_idx_type lhs_dims_len = lhs_dims.length (); |
| 4746 | 3478 |
| 3479 dim_vector final_lhs_dims = lhs_dims; | |
| 3480 | |
| 3481 dim_vector frozen_len; | |
| 3482 | |
| 5275 | 3483 octave_idx_type orig_lhs_dims_len = lhs_dims_len; |
| 4747 | 3484 |
| 3485 bool orig_empty = lhs_dims.all_zero (); | |
| 3486 | |
| 3487 if (n_idx < lhs_dims_len) | |
| 4517 | 3488 { |
| 5052 | 3489 // Collapse dimensions beyond last index. Note that we |
| 3490 // delay resizing LHS until we know that the assignment will | |
| 3491 // succeed. | |
| 4747 | 3492 |
| 5781 | 3493 if (! (idx(n_idx-1).is_colon ())) |
| 3494 (*current_liboctave_warning_with_id_handler) | |
| 3495 ("Octave:fortran-indexing", | |
| 3496 "fewer indices than dimensions for N-d array"); | |
| 4747 | 3497 |
| 3498 for (int i = n_idx; i < lhs_dims_len; i++) | |
| 3499 lhs_dims(n_idx-1) *= lhs_dims(i); | |
| 3500 | |
| 3501 lhs_dims.resize (n_idx); | |
| 3502 | |
| 3503 lhs_dims_len = lhs_dims.length (); | |
| 3504 } | |
| 3505 | |
| 3506 // Resize. | |
| 3507 | |
| 3508 dim_vector new_dims; | |
| 3509 new_dims.resize (n_idx); | |
| 3510 | |
| 5264 | 3511 if (orig_empty) |
| 4747 | 3512 { |
|
7642
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3513 if (rhs_is_scalar) |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3514 { |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3515 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
|
3516 { |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3517 if (idx(i).is_colon ()) |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3518 new_dims(i) = 1; |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3519 else |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3520 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
|
3521 } |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3522 } |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3523 else if (is_vector (rhs_dims)) |
| 4746 | 3524 { |
|
7642
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3525 int ncolon = 0; |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3526 int fcolon = 0; |
|
7646
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3527 octave_idx_type new_dims_numel = 1; |
|
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3528 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
|
3529 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
|
3530 if (idx(i).is_colon ()) |
|
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 ncolon ++; |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3533 if (ncolon == 1) |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3534 fcolon = i; |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3535 } |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3536 else |
|
7646
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3537 { |
|
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3538 octave_idx_type cap = idx(i).capacity (); |
|
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3539 new_dims_numel *= cap; |
|
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3540 if (cap != 1) |
|
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3541 new_dims_vec ++; |
|
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3542 } |
|
7642
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3543 |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3544 if (ncolon == n_idx) |
| 5264 | 3545 { |
|
7642
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3546 new_dims = rhs_dims; |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3547 new_dims.resize (n_idx); |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3548 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
|
3549 new_dims (i) = 1; |
| 5379 | 3550 } |
| 3551 else | |
| 3552 { | |
|
7642
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3553 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
|
3554 |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3555 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
|
3556 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
|
3557 |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3558 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
|
3559 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
|
3560 { |
|
7646
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3561 if (ncolon == rhs_dims_len) |
|
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3562 { |
|
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3563 int k = 0; |
|
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3564 for (int i = 0; i < n_idx; i++) |
|
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3565 if (idx(i).is_colon ()) |
|
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3566 new_dims (i) = rhs_dims (k++); |
|
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3567 } |
|
7642
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3568 else |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3569 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
|
3570 } |
|
7646
ad16ea379d2f
additional fixes for Array::assignN
David Bateman <dbateman@free.fr>
parents:
7642
diff
changeset
|
3571 else if (new_dims_numel != rhs_dims_numel || new_dims_vec > 1) |
| 5264 | 3572 { |
| 3573 (*current_liboctave_error_handler) | |
| 5379 | 3574 ("A(IDX-LIST) = RHS: mismatched index and RHS dimension"); |
| 5264 | 3575 return retval; |
| 3576 } | |
|
7642
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3577 } |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3578 } |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3579 else |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3580 { |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3581 int k = 0; |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3582 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
|
3583 { |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3584 if (idx(i).is_colon ()) |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3585 { |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3586 if (k < rhs_dims_len) |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3587 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
|
3588 else |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3589 new_dims(i) = 1; |
|
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 else |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3592 { |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3593 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
|
3594 |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3595 if (nelem >= 1 |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3596 && (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
|
3597 k++; |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3598 else if (nelem != 1) |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3599 { |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3600 (*current_liboctave_error_handler) |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3601 ("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
|
3602 return retval; |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3603 } |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3604 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
|
3605 idx(i).max () + 1; |
|
9a4541c622b5
refactor Array::assignN dimensioning code for empty initial matrices
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
3606 } |
| 5264 | 3607 } |
| 4746 | 3608 } |
| 5264 | 3609 } |
| 3610 else | |
| 3611 { | |
| 3612 for (int i = 0; i < n_idx; i++) | |
| 4746 | 3613 { |
| 4747 | 3614 // We didn't start out with all zero dimensions, so if |
| 3615 // index is a colon, it refers to the current LHS | |
| 3616 // dimension. Otherwise, it is OK to enlarge to a | |
| 5264 | 3617 // dimension given by the largest index, but if that |
| 4898 | 3618 // index is a colon the new dimension is singleton. |
| 4749 | 3619 |
| 3620 if (i < lhs_dims_len | |
| 6481 | 3621 && (idx(i).is_colon () |
| 3622 || idx(i).orig_empty () | |
| 3623 || idx(i).max () < lhs_dims(i))) | |
| 4749 | 3624 new_dims(i) = lhs_dims(i); |
| 3625 else if (! idx(i).is_colon ()) | |
| 3626 new_dims(i) = idx(i).max () + 1; | |
| 3627 else | |
| 4898 | 3628 new_dims(i) = 1; |
| 4745 | 3629 } |
| 4747 | 3630 } |
| 3631 | |
| 4749 | 3632 if (retval != 0) |
| 4747 | 3633 { |
| 4749 | 3634 if (! orig_empty |
| 3635 && n_idx < orig_lhs_dims_len | |
| 3636 && new_dims(n_idx-1) != lhs_dims(n_idx-1)) | |
| 4702 | 3637 { |
| 4749 | 3638 // We reshaped and the last dimension changed. This has to |
| 3639 // be an error, because we don't know how to undo that | |
| 3640 // later... | |
| 3641 | |
| 3642 (*current_liboctave_error_handler) | |
| 3643 ("array index %d (= %d) for assignment requires invalid resizing operation", | |
| 3644 n_idx, new_dims(n_idx-1)); | |
| 3645 | |
| 3646 retval = 0; | |
| 4743 | 3647 } |
| 3648 else | |
| 3649 { | |
| 5052 | 3650 // Determine final dimensions for LHS and reset the |
| 3651 // current size of the LHS. Note that we delay actually | |
| 3652 // resizing LHS until we know that the assignment will | |
| 3653 // succeed. | |
| 3654 | |
| 4749 | 3655 if (n_idx < orig_lhs_dims_len) |
| 4743 | 3656 { |
| 4749 | 3657 for (int i = 0; i < n_idx-1; i++) |
| 3658 final_lhs_dims(i) = new_dims(i); | |
| 4747 | 3659 } |
| 3660 else | |
| 4749 | 3661 final_lhs_dims = new_dims; |
| 3662 | |
| 5837 | 3663 lhs_dims_len = new_dims.length (); |
| 3664 | |
| 3665 frozen_len = freeze (idx, new_dims, true); | |
| 4749 | 3666 |
| 6141 | 3667 for (int i = 0; i < idx.length (); i++) |
| 3668 { | |
| 3669 if (! idx(i)) | |
| 3670 { | |
| 3671 retval = 0; | |
| 3672 lhs.clear_index (); | |
| 3673 return retval; | |
| 3674 } | |
| 3675 } | |
| 3676 | |
| 4749 | 3677 if (rhs_is_scalar) |
| 4747 | 3678 { |
| 6884 | 3679 lhs.make_unique (); |
| 3680 | |
| 5837 | 3681 if (n_idx < orig_lhs_dims_len) |
| 3682 lhs = lhs.reshape (lhs_dims); | |
| 3683 | |
| 5052 | 3684 lhs.resize_and_fill (new_dims, rfv); |
| 3685 | |
| 4747 | 3686 if (! final_lhs_dims.any_zero ()) |
| 3687 { | |
| 4749 | 3688 RT scalar = rhs.elem (0); |
| 3689 | |
| 6388 | 3690 if (n_idx == 1) |
| 3691 { | |
| 3692 idx_vector iidx = idx(0); | |
| 3693 | |
| 3694 octave_idx_type len = frozen_len(0); | |
| 3695 | |
| 6884 | 3696 if (iidx.is_colon ()) |
| 3697 { | |
| 3698 for (octave_idx_type i = 0; i < len; i++) | |
| 3699 lhs.xelem (i) = scalar; | |
| 3700 } | |
| 3701 else | |
| 6388 | 3702 { |
| 6884 | 3703 for (octave_idx_type i = 0; i < len; i++) |
| 3704 { | |
| 3705 octave_idx_type ii = iidx.elem (i); | |
| 3706 | |
| 3707 lhs.xelem (ii) = scalar; | |
| 3708 } | |
| 6388 | 3709 } |
| 3710 } | |
| 3711 else if (lhs_dims_len == 2 && n_idx == 2) | |
| 4747 | 3712 { |
| 6388 | 3713 idx_vector idx_i = idx(0); |
| 3714 idx_vector idx_j = idx(1); | |
| 3715 | |
| 3716 octave_idx_type i_len = frozen_len(0); | |
| 3717 octave_idx_type j_len = frozen_len(1); | |
| 3718 | |
| 6884 | 3719 if (idx_i.is_colon()) |
| 6388 | 3720 { |
| 6884 | 3721 for (octave_idx_type j = 0; j < j_len; j++) |
| 6388 | 3722 { |
| 6884 | 3723 octave_idx_type off = new_dims (0) * |
| 3724 idx_j.elem (j); | |
| 3725 for (octave_idx_type i = 0; i < i_len; i++) | |
| 3726 lhs.xelem (i + off) = scalar; | |
| 3727 } | |
| 3728 } | |
| 3729 else | |
| 3730 { | |
| 3731 for (octave_idx_type j = 0; j < j_len; j++) | |
| 3732 { | |
| 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 { | |
| 3737 octave_idx_type ii = idx_i.elem (i); | |
| 3738 lhs.xelem (ii + off) = scalar; | |
| 3739 } | |
| 6388 | 3740 } |
| 3741 } | |
| 3742 } | |
| 3743 else | |
| 3744 { | |
| 3745 octave_idx_type n = Array<LT>::get_size (frozen_len); | |
| 3746 | |
| 3747 Array<octave_idx_type> result_idx (lhs_dims_len, 0); | |
| 3748 | |
| 3749 for (octave_idx_type i = 0; i < n; i++) | |
| 3750 { | |
| 3751 Array<octave_idx_type> elt_idx = get_elt_idx (idx, result_idx); | |
| 3752 | |
| 6884 | 3753 lhs.xelem (elt_idx) = scalar; |
| 6388 | 3754 |
| 3755 increment_index (result_idx, frozen_len); | |
| 3756 } | |
| 4747 | 3757 } |
| 3758 } | |
| 4743 | 3759 } |
| 4749 | 3760 else |
| 3761 { | |
| 3762 // RHS is matrix or higher dimension. | |
| 3763 | |
| 5275 | 3764 octave_idx_type n = Array<LT>::get_size (frozen_len); |
| 5264 | 3765 |
| 3766 if (n != rhs.numel ()) | |
| 4749 | 3767 { |
| 3768 (*current_liboctave_error_handler) | |
| 3769 ("A(IDX-LIST) = X: X must be a scalar or size of X must equal number of elements indexed by IDX-LIST"); | |
| 3770 | |
| 3771 retval = 0; | |
| 3772 } | |
| 3773 else | |
| 3774 { | |
| 6884 | 3775 lhs.make_unique (); |
| 3776 | |
| 5837 | 3777 if (n_idx < orig_lhs_dims_len) |
| 3778 lhs = lhs.reshape (lhs_dims); | |
| 3779 | |
| 5052 | 3780 lhs.resize_and_fill (new_dims, rfv); |
| 3781 | |
| 4749 | 3782 if (! final_lhs_dims.any_zero ()) |
| 3783 { | |
| 6388 | 3784 if (n_idx == 1) |
| 3785 { | |
| 3786 idx_vector iidx = idx(0); | |
| 3787 | |
| 3788 octave_idx_type len = frozen_len(0); | |
| 3789 | |
| 6884 | 3790 if (iidx.is_colon ()) |
| 3791 { | |
| 3792 for (octave_idx_type i = 0; i < len; i++) | |
| 3793 lhs.xelem (i) = rhs.elem (i); | |
| 3794 } | |
| 3795 else | |
| 6388 | 3796 { |
| 6884 | 3797 for (octave_idx_type i = 0; i < len; i++) |
| 3798 { | |
| 3799 octave_idx_type ii = iidx.elem (i); | |
| 3800 | |
| 3801 lhs.xelem (ii) = rhs.elem (i); | |
| 3802 } | |
| 6388 | 3803 } |
| 3804 } | |
| 3805 else if (lhs_dims_len == 2 && n_idx == 2) | |
| 4749 | 3806 { |
| 6388 | 3807 idx_vector idx_i = idx(0); |
| 3808 idx_vector idx_j = idx(1); | |
| 3809 | |
| 3810 octave_idx_type i_len = frozen_len(0); | |
| 3811 octave_idx_type j_len = frozen_len(1); | |
| 3812 octave_idx_type k = 0; | |
| 3813 | |
| 6884 | 3814 if (idx_i.is_colon()) |
| 6388 | 3815 { |
| 6884 | 3816 for (octave_idx_type j = 0; j < j_len; j++) |
| 6388 | 3817 { |
| 6884 | 3818 octave_idx_type off = new_dims (0) * |
| 3819 idx_j.elem (j); | |
| 3820 for (octave_idx_type i = 0; | |
| 3821 i < i_len; i++) | |
| 3822 lhs.xelem (i + off) = rhs.elem (k++); | |
| 6388 | 3823 } |
| 3824 } | |
| 6884 | 3825 else |
| 3826 { | |
| 3827 for (octave_idx_type j = 0; j < j_len; j++) | |
| 3828 { | |
| 3829 octave_idx_type off = new_dims (0) * | |
| 3830 idx_j.elem (j); | |
| 3831 for (octave_idx_type i = 0; i < i_len; i++) | |
| 3832 { | |
| 3833 octave_idx_type ii = idx_i.elem (i); | |
| 3834 lhs.xelem (ii + off) = rhs.elem (k++); | |
| 3835 } | |
| 3836 } | |
| 3837 } | |
| 3838 | |
| 6388 | 3839 } |
| 3840 else | |
| 3841 { | |
| 3842 n = Array<LT>::get_size (frozen_len); | |
| 3843 | |
| 3844 Array<octave_idx_type> result_idx (lhs_dims_len, 0); | |
| 3845 | |
| 3846 for (octave_idx_type i = 0; i < n; i++) | |
| 3847 { | |
| 3848 Array<octave_idx_type> elt_idx = get_elt_idx (idx, result_idx); | |
| 3849 | |
| 6884 | 3850 lhs.xelem (elt_idx) = rhs.elem (i); |
| 6388 | 3851 |
| 3852 increment_index (result_idx, frozen_len); | |
| 3853 } | |
| 4749 | 3854 } |
| 3855 } | |
| 3856 } | |
| 3857 } | |
| 4743 | 3858 } |
| 4517 | 3859 } |
| 4745 | 3860 |
| 5632 | 3861 lhs.clear_index (); |
| 3862 | |
| 5052 | 3863 if (retval != 0) |
| 5516 | 3864 lhs = lhs.reshape (final_lhs_dims); |
| 4517 | 3865 } |
| 3866 | |
| 5052 | 3867 if (retval != 0) |
| 3868 lhs.chop_trailing_singletons (); | |
| 4757 | 3869 |
| 4517 | 3870 lhs.clear_index (); |
| 3871 | |
| 3872 return retval; | |
| 3873 } | |
| 3874 | |
| 3875 template <class T> | |
| 3876 void | |
| 3933 | 3877 Array<T>::print_info (std::ostream& os, const std::string& prefix) const |
| 3878 { | |
| 3879 os << prefix << "rep address: " << rep << "\n" | |
| 3880 << prefix << "rep->len: " << rep->len << "\n" | |
| 3881 << prefix << "rep->data: " << static_cast<void *> (rep->data) << "\n" | |
| 3882 << prefix << "rep->count: " << rep->count << "\n"; | |
| 4513 | 3883 |
| 3884 // 2D info: | |
| 3885 // | |
| 4657 | 3886 // << pefix << "rows: " << rows () << "\n" |
| 4513 | 3887 // << prefix << "cols: " << cols () << "\n"; |
| 3933 | 3888 } |
| 3889 | |
| 237 | 3890 /* |
| 3891 ;;; Local Variables: *** | |
| 3892 ;;; mode: C++ *** | |
| 3893 ;;; End: *** | |
| 3894 */ |