Mercurial > octave
annotate liboctave/Sparse.h @ 10479:ded9beac7582
optimize sparse matrix assembly
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Wed, 31 Mar 2010 10:03:55 +0200 |
| parents | 0677c5d80b77 |
| children | 19e1e4470e01 |
| rev | line source |
|---|---|
| 5164 | 1 // Template sparse classes |
| 2 /* | |
| 3 | |
| 8920 | 4 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 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 #if !defined (octave_Sparse_h) | |
| 26 #define octave_Sparse_h 1 | |
| 27 | |
| 28 #include <cassert> | |
| 29 #include <cstddef> | |
| 30 | |
|
8950
d865363208d6
include <iosfwd> instead of <iostream> in header files
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
31 #include <iosfwd> |
| 5164 | 32 |
| 33 #include "Array.h" | |
| 34 #include "dim-vector.h" | |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
35 #include "lo-error.h" |
| 5164 | 36 #include "lo-utils.h" |
| 37 | |
| 7433 | 38 #include "oct-sort.h" |
|
10382
1766c133674c
Special case sparse index method for ranges and maybe_delete_elements method for sparse vectors
David Bateman <dbateman@free.fr>
parents:
10358
diff
changeset
|
39 #include "oct-mem.h" |
| 7433 | 40 |
| 5164 | 41 class idx_vector; |
| 42 | |
| 43 // Two dimensional sparse class. Handles the reference counting for | |
| 44 // all the derived classes. | |
| 45 | |
| 46 template <class T> | |
| 47 class | |
| 48 Sparse | |
| 49 { | |
|
8181
1ebcb9872ced
fix sparse-matrix bool/cmp op instantiation problem
John W. Eaton <jwe@octave.org>
parents:
7717
diff
changeset
|
50 public: |
|
1ebcb9872ced
fix sparse-matrix bool/cmp op instantiation problem
John W. Eaton <jwe@octave.org>
parents:
7717
diff
changeset
|
51 |
|
8918
f5408862892f
Consistently use element_type in the array classes.
Jason Riedy <jason@acm.org>
parents:
8181
diff
changeset
|
52 typedef T element_type; |
|
8181
1ebcb9872ced
fix sparse-matrix bool/cmp op instantiation problem
John W. Eaton <jwe@octave.org>
parents:
7717
diff
changeset
|
53 |
| 5164 | 54 protected: |
| 55 //-------------------------------------------------------------------- | |
| 56 // The real representation of all Sparse arrays. | |
| 57 //-------------------------------------------------------------------- | |
| 58 | |
| 6108 | 59 class OCTAVE_API SparseRep |
| 5164 | 60 { |
| 61 public: | |
| 62 | |
| 63 T *d; | |
| 5275 | 64 octave_idx_type *r; |
| 65 octave_idx_type *c; | |
| 5604 | 66 octave_idx_type nzmx; |
| 5275 | 67 octave_idx_type nrows; |
| 68 octave_idx_type ncols; | |
| 5164 | 69 int count; |
| 70 | |
| 5604 | 71 SparseRep (void) : d (0), r (0), c (new octave_idx_type [1]), nzmx (0), nrows (0), |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
72 ncols (0), count (1) { c[0] = 0; } |
| 5164 | 73 |
| 5604 | 74 SparseRep (octave_idx_type n) : d (0), r (0), c (new octave_idx_type [n+1]), nzmx (0), nrows (n), |
| 5164 | 75 ncols (n), count (1) |
| 76 { | |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
77 for (octave_idx_type i = 0; i < n + 1; i++) |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
78 c[i] = 0; |
| 5164 | 79 } |
| 80 | |
| 5604 | 81 SparseRep (octave_idx_type nr, octave_idx_type nc) : d (0), r (0), c (new octave_idx_type [nc+1]), nzmx (0), |
| 5164 | 82 nrows (nr), ncols (nc), count (1) |
| 83 { | |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
84 for (octave_idx_type i = 0; i < nc + 1; i++) |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
85 c[i] = 0; |
| 5164 | 86 } |
| 87 | |
| 5275 | 88 SparseRep (octave_idx_type nr, octave_idx_type nc, octave_idx_type nz) : d (new T [nz]), |
| 5604 | 89 r (new octave_idx_type [nz]), c (new octave_idx_type [nc+1]), nzmx (nz), nrows (nr), |
| 5164 | 90 ncols (nc), count (1) |
| 91 { | |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
92 for (octave_idx_type i = 0; i < nc + 1; i++) |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
93 c[i] = 0; |
| 5164 | 94 } |
| 95 | |
| 96 SparseRep (const SparseRep& a) | |
| 5604 | 97 : d (new T [a.nzmx]), r (new octave_idx_type [a.nzmx]), c (new octave_idx_type [a.ncols + 1]), |
| 98 nzmx (a.nzmx), nrows (a.nrows), ncols (a.ncols), count (1) | |
| 5164 | 99 { |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
100 for (octave_idx_type i = 0; i < nzmx; i++) |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
101 { |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
102 d[i] = a.d[i]; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
103 r[i] = a.r[i]; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
104 } |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
105 for (octave_idx_type i = 0; i < ncols + 1; i++) |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
106 c[i] = a.c[i]; |
| 5164 | 107 } |
| 108 | |
| 109 ~SparseRep (void) { delete [] d; delete [] r; delete [] c; } | |
| 110 | |
| 5604 | 111 octave_idx_type length (void) const { return nzmx; } |
| 5164 | 112 |
| 5604 | 113 octave_idx_type nnz (void) const { return c [ncols]; } |
| 5164 | 114 |
| 5275 | 115 T& elem (octave_idx_type _r, octave_idx_type _c); |
| 5164 | 116 |
| 5275 | 117 T celem (octave_idx_type _r, octave_idx_type _c) const; |
| 5164 | 118 |
| 5275 | 119 T& data (octave_idx_type i) { return d[i]; } |
| 5164 | 120 |
| 5275 | 121 T cdata (octave_idx_type i) const { return d[i]; } |
| 5164 | 122 |
| 5275 | 123 octave_idx_type& ridx (octave_idx_type i) { return r[i]; } |
| 5164 | 124 |
| 5275 | 125 octave_idx_type cridx (octave_idx_type i) const { return r[i]; } |
| 5164 | 126 |
| 5275 | 127 octave_idx_type& cidx (octave_idx_type i) { return c[i]; } |
| 5164 | 128 |
| 5275 | 129 octave_idx_type ccidx (octave_idx_type i) const { return c[i]; } |
| 5164 | 130 |
| 131 void maybe_compress (bool remove_zeros); | |
| 132 | |
| 5275 | 133 void change_length (octave_idx_type nz); |
| 5164 | 134 |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
135 bool indices_ok (void) const; |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
136 |
| 5164 | 137 private: |
| 138 | |
| 139 // No assignment! | |
| 140 | |
| 141 SparseRep& operator = (const SparseRep& a); | |
| 142 }; | |
| 143 | |
| 144 //-------------------------------------------------------------------- | |
| 145 | |
| 146 void make_unique (void) | |
| 147 { | |
| 148 if (rep->count > 1) | |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
149 { |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
150 --rep->count; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
151 rep = new SparseRep (*rep); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
152 } |
| 5164 | 153 } |
| 154 | |
| 155 public: | |
| 156 | |
| 157 // !!! WARNING !!! -- these should be protected, not public. You | |
| 158 // should not access these data members directly! | |
| 159 | |
| 160 typename Sparse<T>::SparseRep *rep; | |
| 161 | |
| 162 dim_vector dimensions; | |
| 163 | |
| 164 protected: | |
| 165 idx_vector *idx; | |
| 5275 | 166 octave_idx_type idx_count; |
| 5164 | 167 |
| 168 private: | |
| 169 | |
| 170 typename Sparse<T>::SparseRep *nil_rep (void) const | |
| 171 { | |
| 172 static typename Sparse<T>::SparseRep *nr | |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
173 = new typename Sparse<T>::SparseRep (); |
| 5164 | 174 |
| 175 nr->count++; | |
| 176 | |
| 177 return nr; | |
| 178 } | |
| 179 | |
| 180 public: | |
| 181 | |
| 182 Sparse (void) | |
| 183 : rep (nil_rep ()), dimensions (dim_vector(0,0)), | |
| 184 idx (0), idx_count (0) { } | |
| 185 | |
| 5275 | 186 explicit Sparse (octave_idx_type n) |
| 5164 | 187 : rep (new typename Sparse<T>::SparseRep (n)), |
| 188 dimensions (dim_vector (n, n)), idx (0), idx_count (0) { } | |
| 189 | |
| 5275 | 190 explicit Sparse (octave_idx_type nr, octave_idx_type nc) |
| 5164 | 191 : rep (new typename Sparse<T>::SparseRep (nr, nc)), |
| 192 dimensions (dim_vector (nr, nc)), idx (0), idx_count (0) { } | |
| 193 | |
| 5275 | 194 explicit Sparse (octave_idx_type nr, octave_idx_type nc, T val); |
| 5164 | 195 |
| 5275 | 196 Sparse (const dim_vector& dv, octave_idx_type nz) |
| 5164 | 197 : rep (new typename Sparse<T>::SparseRep (dv(0), dv(1), nz)), |
| 198 dimensions (dv), idx (0), idx_count (0) { } | |
| 199 | |
| 5275 | 200 Sparse (octave_idx_type nr, octave_idx_type nc, octave_idx_type nz) |
| 5164 | 201 : rep (new typename Sparse<T>::SparseRep (nr, nc, nz)), |
| 202 dimensions (dim_vector (nr, nc)), idx (0), idx_count (0) { } | |
| 203 | |
| 204 // Type conversion case. | |
| 205 template <class U> Sparse (const Sparse<U>& a); | |
| 206 | |
| 207 // No type conversion case. | |
| 208 Sparse (const Sparse<T>& a) | |
| 209 : rep (a.rep), dimensions (a.dimensions), idx (0), idx_count (0) | |
| 210 { | |
| 211 rep->count++; | |
| 212 } | |
| 213 | |
| 214 public: | |
| 215 | |
| 216 Sparse (const dim_vector& dv); | |
| 217 | |
| 218 Sparse (const Sparse<T>& a, const dim_vector& dv); | |
| 219 | |
| 5275 | 220 Sparse (const Array<T>& a, const Array<octave_idx_type>& r, const Array<octave_idx_type>& c, |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
221 octave_idx_type nr, octave_idx_type nc, bool sum_terms); |
| 5164 | 222 |
| 223 Sparse (const Array<T>& a, const Array<double>& r, const Array<double>& c, | |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
224 octave_idx_type nr, octave_idx_type nc, bool sum_terms); |
| 5164 | 225 |
|
10479
ded9beac7582
optimize sparse matrix assembly
Jaroslav Hajek <highegg@gmail.com>
parents:
10425
diff
changeset
|
226 Sparse (const Array<T>& a, const idx_vector& r, const idx_vector& c, |
|
ded9beac7582
optimize sparse matrix assembly
Jaroslav Hajek <highegg@gmail.com>
parents:
10425
diff
changeset
|
227 octave_idx_type nr = -1, octave_idx_type nc = -1, bool sum_terms = true); |
|
ded9beac7582
optimize sparse matrix assembly
Jaroslav Hajek <highegg@gmail.com>
parents:
10425
diff
changeset
|
228 |
| 5164 | 229 // Sparsify a normal matrix |
| 230 Sparse (const Array<T>& a); | |
| 231 | |
| 232 virtual ~Sparse (void); | |
| 233 | |
|
7717
ff918ee1a983
Delete idx in Sparse<T> and Array<T> operator =
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
234 Sparse<T>& operator = (const Sparse<T>& a); |
| 5164 | 235 |
| 5604 | 236 // Note that nzmax and capacity are the amount of storage for |
| 237 // non-zero elements, while nnz is the actual number of non-zero | |
| 238 // terms. | |
| 239 octave_idx_type nzmax (void) const { return rep->length (); } | |
| 240 octave_idx_type capacity (void) const { return nzmax (); } | |
| 241 octave_idx_type nnz (void) const { return rep->nnz (); } | |
| 5164 | 242 |
|
10425
0677c5d80b77
rewrite 1D sparse indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
10421
diff
changeset
|
243 // Querying the number of elements (incl. zeros) may overflow the index type, |
|
0677c5d80b77
rewrite 1D sparse indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
10421
diff
changeset
|
244 // so don't do it unless you really need it. |
| 5275 | 245 octave_idx_type numel (void) const |
| 5164 | 246 { |
|
10425
0677c5d80b77
rewrite 1D sparse indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
10421
diff
changeset
|
247 return dimensions.safe_numel (); |
| 5164 | 248 } |
| 249 | |
| 5275 | 250 octave_idx_type nelem (void) const { return capacity (); } |
| 251 octave_idx_type length (void) const { return numel (); } | |
| 5164 | 252 |
| 5275 | 253 octave_idx_type dim1 (void) const { return dimensions(0); } |
| 254 octave_idx_type dim2 (void) const { return dimensions(1); } | |
| 5164 | 255 |
| 5275 | 256 octave_idx_type rows (void) const { return dim1 (); } |
| 257 octave_idx_type cols (void) const { return dim2 (); } | |
| 258 octave_idx_type columns (void) const { return dim2 (); } | |
| 5164 | 259 |
| 5275 | 260 octave_idx_type get_row_index (octave_idx_type k) { return ridx (k); } |
| 261 octave_idx_type get_col_index (octave_idx_type k) | |
| 5164 | 262 { |
| 5275 | 263 octave_idx_type ret = 0; |
| 5164 | 264 while (cidx(ret+1) < k) |
| 265 ret++; | |
| 266 return ret; | |
| 267 } | |
|
10358
72fab01e5d68
improve some size_t queries
Jaroslav Hajek <highegg@gmail.com>
parents:
10352
diff
changeset
|
268 |
|
72fab01e5d68
improve some size_t queries
Jaroslav Hajek <highegg@gmail.com>
parents:
10352
diff
changeset
|
269 size_t byte_size (void) const |
|
72fab01e5d68
improve some size_t queries
Jaroslav Hajek <highegg@gmail.com>
parents:
10352
diff
changeset
|
270 { |
|
72fab01e5d68
improve some size_t queries
Jaroslav Hajek <highegg@gmail.com>
parents:
10352
diff
changeset
|
271 return (static_cast<size_t>(cols () + 1) * sizeof (octave_idx_type) |
|
72fab01e5d68
improve some size_t queries
Jaroslav Hajek <highegg@gmail.com>
parents:
10352
diff
changeset
|
272 + static_cast<size_t> (capacity ()) * (sizeof (T) + sizeof (octave_idx_type))); |
|
72fab01e5d68
improve some size_t queries
Jaroslav Hajek <highegg@gmail.com>
parents:
10352
diff
changeset
|
273 } |
| 5164 | 274 |
| 275 dim_vector dims (void) const { return dimensions; } | |
| 276 | |
| 277 Sparse<T> squeeze (void) const { return *this; } | |
| 278 | |
| 5275 | 279 octave_idx_type compute_index (const Array<octave_idx_type>& ra_idx) const; |
| 5164 | 280 |
| 5275 | 281 T range_error (const char *fcn, octave_idx_type n) const; |
| 282 T& range_error (const char *fcn, octave_idx_type n); | |
| 5164 | 283 |
| 5275 | 284 T range_error (const char *fcn, octave_idx_type i, octave_idx_type j) const; |
| 285 T& range_error (const char *fcn, octave_idx_type i, octave_idx_type j); | |
| 5164 | 286 |
| 5275 | 287 T range_error (const char *fcn, const Array<octave_idx_type>& ra_idx) const; |
| 288 T& range_error (const char *fcn, const Array<octave_idx_type>& ra_idx); | |
| 5164 | 289 |
| 290 // No checking, even for multiple references, ever. | |
| 291 | |
| 5275 | 292 T& xelem (octave_idx_type n) |
| 5164 | 293 { |
| 5275 | 294 octave_idx_type i = n % rows (), j = n / rows(); |
| 5164 | 295 return xelem (i, j); |
| 296 } | |
| 297 | |
| 5275 | 298 T xelem (octave_idx_type n) const |
| 5164 | 299 { |
| 5275 | 300 octave_idx_type i = n % rows (), j = n / rows(); |
| 5164 | 301 return xelem (i, j); |
| 302 } | |
| 303 | |
| 5275 | 304 T& xelem (octave_idx_type i, octave_idx_type j) { return rep->elem (i, j); } |
| 305 T xelem (octave_idx_type i, octave_idx_type j) const { return rep->celem (i, j); } | |
| 5164 | 306 |
| 5275 | 307 T& xelem (const Array<octave_idx_type>& ra_idx) |
| 5164 | 308 { return xelem (compute_index (ra_idx)); } |
| 309 | |
| 5275 | 310 T xelem (const Array<octave_idx_type>& ra_idx) const |
| 5164 | 311 { return xelem (compute_index (ra_idx)); } |
| 312 | |
| 5775 | 313 // FIXME -- would be nice to fix this so that we don't |
| 5164 | 314 // unnecessarily force a copy, but that is not so easy, and I see no |
| 315 // clean way to do it. | |
| 316 | |
| 5275 | 317 T& checkelem (octave_idx_type n) |
| 5164 | 318 { |
| 319 if (n < 0 || n >= numel ()) | |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
320 return range_error ("T& Sparse<T>::checkelem", n); |
| 5164 | 321 else |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
322 { |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
323 make_unique (); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
324 return xelem (n); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
325 } |
| 5164 | 326 } |
| 327 | |
| 5275 | 328 T& checkelem (octave_idx_type i, octave_idx_type j) |
| 5164 | 329 { |
| 330 if (i < 0 || j < 0 || i >= dim1 () || j >= dim2 ()) | |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
331 return range_error ("T& Sparse<T>::checkelem", i, j); |
| 5164 | 332 else |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
333 { |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
334 make_unique (); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
335 return xelem (i, j); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
336 } |
| 5164 | 337 } |
| 338 | |
| 5275 | 339 T& checkelem (const Array<octave_idx_type>& ra_idx) |
| 5164 | 340 { |
| 5275 | 341 octave_idx_type i = compute_index (ra_idx); |
| 5164 | 342 |
| 343 if (i < 0) | |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
344 return range_error ("T& Sparse<T>::checkelem", ra_idx); |
| 5164 | 345 else |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
346 return elem (i); |
| 5164 | 347 } |
| 348 | |
| 5275 | 349 T& elem (octave_idx_type n) |
| 5164 | 350 { |
| 351 make_unique (); | |
| 352 return xelem (n); | |
| 353 } | |
| 354 | |
| 5275 | 355 T& elem (octave_idx_type i, octave_idx_type j) |
| 5164 | 356 { |
| 357 make_unique (); | |
| 358 return xelem (i, j); | |
| 359 } | |
| 360 | |
| 5275 | 361 T& elem (const Array<octave_idx_type>& ra_idx) |
| 5164 | 362 { return Sparse<T>::elem (compute_index (ra_idx)); } |
| 363 | |
| 364 #if defined (BOUNDS_CHECKING) | |
| 5275 | 365 T& operator () (octave_idx_type n) { return checkelem (n); } |
| 366 T& operator () (octave_idx_type i, octave_idx_type j) { return checkelem (i, j); } | |
| 367 T& operator () (const Array<octave_idx_type>& ra_idx) { return checkelem (ra_idx); } | |
| 5164 | 368 #else |
| 5275 | 369 T& operator () (octave_idx_type n) { return elem (n); } |
| 370 T& operator () (octave_idx_type i, octave_idx_type j) { return elem (i, j); } | |
| 371 T& operator () (const Array<octave_idx_type>& ra_idx) { return elem (ra_idx); } | |
| 5164 | 372 #endif |
| 373 | |
| 5275 | 374 T checkelem (octave_idx_type n) const |
| 5164 | 375 { |
| 376 if (n < 0 || n >= numel ()) | |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
377 return range_error ("T Sparse<T>::checkelem", n); |
| 5164 | 378 else |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
379 return xelem (n); |
| 5164 | 380 } |
| 381 | |
| 5275 | 382 T checkelem (octave_idx_type i, octave_idx_type j) const |
| 5164 | 383 { |
| 384 if (i < 0 || j < 0 || i >= dim1 () || j >= dim2 ()) | |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
385 return range_error ("T Sparse<T>::checkelem", i, j); |
| 5164 | 386 else |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
387 return xelem (i, j); |
| 5164 | 388 } |
| 389 | |
| 5275 | 390 T checkelem (const Array<octave_idx_type>& ra_idx) const |
| 5164 | 391 { |
| 5275 | 392 octave_idx_type i = compute_index (ra_idx); |
| 5164 | 393 |
| 394 if (i < 0) | |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
395 return range_error ("T Sparse<T>::checkelem", ra_idx); |
| 5164 | 396 else |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
397 return Sparse<T>::elem (i); |
| 5164 | 398 } |
| 399 | |
| 5275 | 400 T elem (octave_idx_type n) const { return xelem (n); } |
| 5164 | 401 |
| 5275 | 402 T elem (octave_idx_type i, octave_idx_type j) const { return xelem (i, j); } |
| 5164 | 403 |
| 5275 | 404 T elem (const Array<octave_idx_type>& ra_idx) const |
| 5164 | 405 { return Sparse<T>::elem (compute_index (ra_idx)); } |
| 406 | |
| 407 #if defined (BOUNDS_CHECKING) | |
| 5275 | 408 T operator () (octave_idx_type n) const { return checkelem (n); } |
| 409 T operator () (octave_idx_type i, octave_idx_type j) const { return checkelem (i, j); } | |
| 410 T operator () (const Array<octave_idx_type>& ra_idx) const { return checkelem (ra_idx); } | |
| 5164 | 411 #else |
| 5275 | 412 T operator () (octave_idx_type n) const { return elem (n); } |
| 413 T operator () (octave_idx_type i, octave_idx_type j) const { return elem (i, j); } | |
| 414 T operator () (const Array<octave_idx_type>& ra_idx) const { return elem (ra_idx); } | |
| 5164 | 415 #endif |
| 416 | |
| 417 Sparse<T> maybe_compress (bool remove_zeros = false) | |
| 418 { rep->maybe_compress (remove_zeros); return (*this); } | |
| 419 | |
| 420 Sparse<T> reshape (const dim_vector& new_dims) const; | |
| 421 | |
| 5275 | 422 Sparse<T> permute (const Array<octave_idx_type>& vec, bool inv = false) const; |
| 5164 | 423 |
| 5275 | 424 Sparse<T> ipermute (const Array<octave_idx_type>& vec) const |
| 5164 | 425 { return permute (vec, true); } |
| 426 | |
|
10425
0677c5d80b77
rewrite 1D sparse indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
10421
diff
changeset
|
427 void resize1 (octave_idx_type n); |
| 5164 | 428 |
|
10425
0677c5d80b77
rewrite 1D sparse indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
10421
diff
changeset
|
429 void resize (octave_idx_type r, octave_idx_type c); |
|
0677c5d80b77
rewrite 1D sparse indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
10421
diff
changeset
|
430 |
|
0677c5d80b77
rewrite 1D sparse indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
10421
diff
changeset
|
431 void resize (const dim_vector& dv); |
| 5164 | 432 |
| 5275 | 433 void change_capacity (octave_idx_type nz) { rep->change_length (nz); } |
| 5164 | 434 |
| 5275 | 435 Sparse<T>& insert (const Sparse<T>& a, octave_idx_type r, octave_idx_type c); |
| 436 Sparse<T>& insert (const Sparse<T>& a, const Array<octave_idx_type>& idx); | |
| 5164 | 437 |
| 438 bool is_square (void) const { return (dim1 () == dim2 ()); } | |
| 439 | |
| 440 bool is_empty (void) const { return (rows () < 1 && cols () < 1); } | |
| 441 | |
| 442 Sparse<T> transpose (void) const; | |
| 443 | |
| 444 T* data (void) { make_unique (); return rep->d; } | |
| 5275 | 445 T& data (octave_idx_type i) { make_unique (); return rep->data (i); } |
| 5164 | 446 T* xdata (void) { return rep->d; } |
| 5275 | 447 T& xdata (octave_idx_type i) { return rep->data (i); } |
| 5164 | 448 |
| 5275 | 449 T data (octave_idx_type i) const { return rep->data (i); } |
| 5900 | 450 // FIXME -- shouldn't this be returning const T*? |
| 5164 | 451 T* data (void) const { return rep->d; } |
| 452 | |
| 5275 | 453 octave_idx_type* ridx (void) { make_unique (); return rep->r; } |
| 454 octave_idx_type& ridx (octave_idx_type i) { make_unique (); return rep->ridx (i); } | |
| 455 octave_idx_type* xridx (void) { return rep->r; } | |
| 456 octave_idx_type& xridx (octave_idx_type i) { return rep->ridx (i); } | |
| 5164 | 457 |
| 5275 | 458 octave_idx_type ridx (octave_idx_type i) const { return rep->cridx (i); } |
| 5900 | 459 // FIXME -- shouldn't this be returning const octave_idx_type*? |
| 5275 | 460 octave_idx_type* ridx (void) const { return rep->r; } |
| 5164 | 461 |
| 5275 | 462 octave_idx_type* cidx (void) { make_unique (); return rep->c; } |
| 463 octave_idx_type& cidx (octave_idx_type i) { make_unique (); return rep->cidx (i); } | |
| 464 octave_idx_type* xcidx (void) { return rep->c; } | |
| 465 octave_idx_type& xcidx (octave_idx_type i) { return rep->cidx (i); } | |
| 5164 | 466 |
| 5275 | 467 octave_idx_type cidx (octave_idx_type i) const { return rep->ccidx (i); } |
| 5900 | 468 // FIXME -- shouldn't this be returning const octave_idx_type*? |
| 5275 | 469 octave_idx_type* cidx (void) const { return rep->c; } |
| 5164 | 470 |
| 5275 | 471 octave_idx_type ndims (void) const { return dimensions.length (); } |
| 5164 | 472 |
| 473 void clear_index (void); | |
| 474 | |
| 475 void set_index (const idx_vector& i); | |
| 476 | |
| 5275 | 477 octave_idx_type index_count (void) const { return idx_count; } |
| 5164 | 478 |
| 479 idx_vector *get_idx (void) const { return idx; } | |
| 480 | |
| 481 void maybe_delete_elements (idx_vector& i); | |
| 482 | |
| 483 void maybe_delete_elements (idx_vector& i, idx_vector& j); | |
| 484 | |
| 485 void maybe_delete_elements (Array<idx_vector>& ra_idx); | |
| 486 | |
| 487 Sparse<T> value (void); | |
| 488 | |
|
10421
99e9bae2d81e
improve sparse indexing interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10382
diff
changeset
|
489 Sparse<T> index (const idx_vector& i, bool resize_ok = false) const; |
| 5164 | 490 |
|
10421
99e9bae2d81e
improve sparse indexing interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10382
diff
changeset
|
491 Sparse<T> index (const idx_vector& i, const idx_vector& j, bool resize_ok = false) const; |
| 5164 | 492 |
| 493 void print_info (std::ostream& os, const std::string& prefix) const; | |
| 494 | |
| 5900 | 495 // Unsafe. These functions exist to support the MEX interface. |
| 496 // You should not use them anywhere else. | |
| 497 void *mex_get_data (void) const { return const_cast<T *> (data ()); } | |
| 498 | |
| 499 octave_idx_type *mex_get_ir (void) const { return const_cast<octave_idx_type *> (ridx ()); } | |
| 500 | |
| 501 octave_idx_type *mex_get_jc (void) const { return const_cast<octave_idx_type *> (cidx ()); } | |
| 7433 | 502 |
|
7463
2467639bd8c0
eliminate UNDEFINED sort mode
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
503 Sparse<T> sort (octave_idx_type dim = 0, sortmode mode = ASCENDING) const; |
| 7433 | 504 Sparse<T> sort (Array<octave_idx_type> &sidx, octave_idx_type dim = 0, |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
505 sortmode mode = ASCENDING) const; |
|
7602
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
506 |
|
7620
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7602
diff
changeset
|
507 Sparse<T> diag (octave_idx_type k = 0) const; |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7602
diff
changeset
|
508 |
|
10425
0677c5d80b77
rewrite 1D sparse indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
10421
diff
changeset
|
509 Array<T> array_value (void) const; |
|
0677c5d80b77
rewrite 1D sparse indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
10421
diff
changeset
|
510 |
|
7602
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
511 template <class U, class F> |
|
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
512 Sparse<U> |
|
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
513 map (F fcn) const |
|
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
514 { |
|
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
515 Sparse<U> result; |
|
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
516 U f_zero = fcn (0.); |
|
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
517 |
|
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
518 if (f_zero != 0.) |
|
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
519 { |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
520 octave_idx_type nr = rows (); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
521 octave_idx_type nc = cols (); |
|
7602
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
522 |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
523 result = Sparse<U> (nr, nc, f_zero); |
|
7602
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
524 |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
525 for (octave_idx_type j = 0; j < nc; j++) |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
526 for (octave_idx_type i = cidx(j); i < cidx (j+1); i++) |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
527 { |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
528 octave_quit (); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
529 /* Use data instead of elem for better performance. */ |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
530 result.data (ridx (i) + j * nr) = fcn (data(i)); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
531 } |
|
7602
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
532 |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
533 result.maybe_compress (true); |
|
7602
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
534 } |
|
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
535 else |
|
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
536 { |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
537 octave_idx_type nz = nnz (); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
538 octave_idx_type nr = rows (); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
539 octave_idx_type nc = cols (); |
|
7602
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
540 |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
541 result = Sparse<U> (nr, nc, nz); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
542 octave_idx_type ii = 0; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
543 result.cidx (ii) = 0; |
|
7602
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
544 |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
545 for (octave_idx_type j = 0; j < nc; j++) |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
546 { |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
547 for (octave_idx_type i = cidx(j); i < cidx (j+1); i++) |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
548 { |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
549 U val = fcn (data (i)); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
550 if (val != 0.0) |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
551 { |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
552 result.data (ii) = val; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
553 result.ridx (ii++) = ridx (i); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
554 } |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
555 octave_quit (); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
556 } |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
557 result.cidx (j+1) = ii; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
558 } |
|
7602
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
559 |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
560 result.maybe_compress (false); |
|
7602
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
561 } |
|
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
562 |
|
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
563 return result; |
|
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
564 } |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
565 |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
566 // Overloads for function references. |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
567 template <class U> |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
568 Sparse<U> |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
569 map (U (&fcn) (T)) const |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
570 { return map<U, U (&) (T)> (fcn); } |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
571 |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
572 template <class U> |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
573 Sparse<U> |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
574 map (U (&fcn) (const T&)) const |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
575 { return map<U, U (&) (const T&)> (fcn); } |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
576 |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
577 bool indices_ok (void) const { return rep->indices_ok (); } |
| 5164 | 578 }; |
| 579 | |
| 580 // NOTE: these functions should be friends of the Sparse<T> class and | |
| 581 // Sparse<T>::dimensions should be protected, not public, but we can't | |
| 582 // do that because of bugs in gcc prior to 3.3. | |
| 583 | |
| 584 template <class LT, class RT> | |
| 585 /* friend */ int | |
| 586 assign (Sparse<LT>& lhs, const Sparse<RT>& rhs); | |
| 587 | |
| 588 template <class LT, class RT> | |
| 589 /* friend */ int | |
| 590 assign1 (Sparse<LT>& lhs, const Sparse<RT>& rhs); | |
| 591 | |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
592 template<typename T> |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
593 std::istream& |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
594 read_sparse_matrix (std::istream& is, Sparse<T>& a, |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
595 T (*read_fcn) (std::istream&)) |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
596 { |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
597 octave_idx_type nr = a.rows (); |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
598 octave_idx_type nc = a.cols (); |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
599 octave_idx_type nz = a.nzmax (); |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
600 |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
601 if (nr > 0 && nc > 0) |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
602 { |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
603 octave_idx_type itmp; |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
604 octave_idx_type jtmp; |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
605 octave_idx_type iold = 0; |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
606 octave_idx_type jold = 0; |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
607 octave_idx_type ii = 0; |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
608 T tmp; |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
609 |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
610 a.cidx (0) = 0; |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
611 for (octave_idx_type i = 0; i < nz; i++) |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
612 { |
|
9829
8fd88cc36fa4
fix loading sparse matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
613 itmp = 0; jtmp = 0; |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
614 is >> itmp; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
615 itmp--; |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
616 |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
617 is >> jtmp; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
618 jtmp--; |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
619 |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
620 if (itmp < 0 || itmp >= nr) |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
621 { |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
622 (*current_liboctave_error_handler) |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
623 ("invalid sparse matrix: row index = %d out of range", |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
624 itmp + 1); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
625 is.setstate (std::ios::failbit); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
626 goto done; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
627 } |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
628 |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
629 if (jtmp < 0 || jtmp >= nc) |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
630 { |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
631 (*current_liboctave_error_handler) |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
632 ("invalid sparse matrix: column index = %d out of range", |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
633 jtmp + 1); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
634 is.setstate (std::ios::failbit); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
635 goto done; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
636 } |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
637 |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
638 if (jtmp < jold) |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
639 { |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
640 (*current_liboctave_error_handler) |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
641 ("invalid sparse matrix: column indices must appear in ascending order"); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
642 is.setstate (std::ios::failbit); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
643 goto done; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
644 } |
|
9829
8fd88cc36fa4
fix loading sparse matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
645 else if (jtmp > jold) |
|
8fd88cc36fa4
fix loading sparse matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
646 { |
|
8fd88cc36fa4
fix loading sparse matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
647 for (octave_idx_type j = jold; j < jtmp; j++) |
|
8fd88cc36fa4
fix loading sparse matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
648 a.cidx(j+1) = ii; |
|
8fd88cc36fa4
fix loading sparse matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
649 } |
|
8fd88cc36fa4
fix loading sparse matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
650 else if (itmp < iold) |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
651 { |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
652 (*current_liboctave_error_handler) |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
653 ("invalid sparse matrix: row indices must appear in ascending order in each column"); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
654 is.setstate (std::ios::failbit); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
655 goto done; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
656 } |
|
9829
8fd88cc36fa4
fix loading sparse matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
657 |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
658 iold = itmp; |
|
9829
8fd88cc36fa4
fix loading sparse matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
659 jold = jtmp; |
|
8fd88cc36fa4
fix loading sparse matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
660 |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
661 tmp = read_fcn (is); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
662 |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
663 if (is) |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
664 { |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
665 a.data (ii) = tmp; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
666 a.ridx (ii++) = itmp; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
667 } |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
668 else |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
669 goto done; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
670 } |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
671 |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
672 for (octave_idx_type j = jold; j < nc; j++) |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
673 a.cidx(j+1) = ii; |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
674 } |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
675 |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
676 done: |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
677 |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
678 return is; |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
679 } |
|
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
680 |
| 6708 | 681 #define INSTANTIATE_SPARSE_ASSIGN(LT, RT, API) \ |
| 682 template API int assign (Sparse<LT>&, const Sparse<RT>&); \ | |
| 683 template API int assign1 (Sparse<LT>&, const Sparse<RT>&); | |
| 5164 | 684 |
| 6708 | 685 #define INSTANTIATE_SPARSE(T, API) \ |
| 686 template class API Sparse<T>; | |
| 5164 | 687 |
| 6708 | 688 #define INSTANTIATE_SPARSE_AND_ASSIGN(T, API) \ |
| 689 INSTANTIATE_SPARSE (T, API); \ | |
| 690 INSTANTIATE_SPARSE_ASSIGN (T, T, API) | |
| 5164 | 691 |
| 692 #endif |