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