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