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