Mercurial > hg > octave-lyh
annotate liboctave/Sparse.h @ 13030:b646413c3d0e
Make operators do smarter sparse conversions on permutation matrices.
* Sparse.cc (Sparse<T>::Sparse): New templated ctor, plus two instantiations.
* Sparse.h (Sparse<T>): Declare new ctor.
* MSparse.h (MSparse): Give this class a PermMatrix ctor.
* boolSparse.h (BoolSparseMatrix): Ditto.
* dSparse.cc: Refactor PermMatrix ctor, moved into common parent class.
* dSparse.h (SparseMatrix): Ditto.
* op-pm-sm.cc: Declare and install smarter permutation matrix operators.
* ov-perm.cc (octave_perm_matrix): Declare new virtual function override.
* ov-perm.cc (sparse_bool_matrix_value): Override this virtual function.
| author | Jordi Gutiérrez Hermoso <jordigh@gmail.com> |
|---|---|
| date | Tue, 30 Aug 2011 18:36:06 -0500 |
| parents | a21a3875ca83 |
| children | 43cc49c7abd1 |
| rev | line source |
|---|---|
| 5164 | 1 // Template sparse classes |
| 2 /* | |
| 3 | |
| 11523 | 4 Copyright (C) 2004-2011 David Bateman |
| 5 Copyright (C) 1998-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; |
|
13030
b646413c3d0e
Make operators do smarter sparse conversions on permutation matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12125
diff
changeset
|
44 class PermMatrix; |
| 5164 | 45 |
| 46 // Two dimensional sparse class. Handles the reference counting for | |
| 47 // all the derived classes. | |
| 48 | |
| 49 template <class T> | |
| 50 class | |
| 51 Sparse | |
| 52 { | |
|
8181
1ebcb9872ced
fix sparse-matrix bool/cmp op instantiation problem
John W. Eaton <jwe@octave.org>
parents:
7717
diff
changeset
|
53 public: |
|
1ebcb9872ced
fix sparse-matrix bool/cmp op instantiation problem
John W. Eaton <jwe@octave.org>
parents:
7717
diff
changeset
|
54 |
|
8918
f5408862892f
Consistently use element_type in the array classes.
Jason Riedy <jason@acm.org>
parents:
8181
diff
changeset
|
55 typedef T element_type; |
|
8181
1ebcb9872ced
fix sparse-matrix bool/cmp op instantiation problem
John W. Eaton <jwe@octave.org>
parents:
7717
diff
changeset
|
56 |
| 5164 | 57 protected: |
| 58 //-------------------------------------------------------------------- | |
| 59 // The real representation of all Sparse arrays. | |
| 60 //-------------------------------------------------------------------- | |
| 61 | |
| 6108 | 62 class OCTAVE_API SparseRep |
| 5164 | 63 { |
| 64 public: | |
| 65 | |
| 66 T *d; | |
| 5275 | 67 octave_idx_type *r; |
| 68 octave_idx_type *c; | |
| 5604 | 69 octave_idx_type nzmx; |
| 5275 | 70 octave_idx_type nrows; |
| 71 octave_idx_type ncols; | |
|
12125
a21a3875ca83
implement a common class for reference counts
Jaroslav Hajek <highegg@gmail.com>
parents:
11586
diff
changeset
|
72 octave_refcount<int> count; |
| 5164 | 73 |
| 5604 | 74 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
|
75 ncols (0), count (1) { c[0] = 0; } |
| 5164 | 76 |
| 5604 | 77 SparseRep (octave_idx_type n) : d (0), r (0), c (new octave_idx_type [n+1]), nzmx (0), nrows (n), |
| 5164 | 78 ncols (n), count (1) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
79 { |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
80 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
|
81 c[i] = 0; |
| 5164 | 82 } |
| 83 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
84 SparseRep (octave_idx_type nr, octave_idx_type nc) : d (0), r (0), c (new octave_idx_type [nc+1]), nzmx (0), |
| 5164 | 85 nrows (nr), ncols (nc), count (1) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
86 { |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
87 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
|
88 c[i] = 0; |
| 5164 | 89 } |
| 90 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
91 SparseRep (octave_idx_type nr, octave_idx_type nc, octave_idx_type nz) : d (new T [nz]), |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
92 r (new octave_idx_type [nz]), c (new octave_idx_type [nc+1]), nzmx (nz), nrows (nr), |
| 5164 | 93 ncols (nc), count (1) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
94 { |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
95 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
|
96 c[i] = 0; |
| 5164 | 97 } |
| 98 | |
| 99 SparseRep (const SparseRep& a) | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
100 : d (new T [a.nzmx]), r (new octave_idx_type [a.nzmx]), c (new octave_idx_type [a.ncols + 1]), |
| 5604 | 101 nzmx (a.nzmx), nrows (a.nrows), ncols (a.ncols), count (1) |
| 5164 | 102 { |
|
10514
40c58502a78b
improve conversion & copy ctors of sparse matrix
Jaroslav Hajek <highegg@gmail.com>
parents:
10512
diff
changeset
|
103 octave_idx_type nz = a.nnz (); |
|
40c58502a78b
improve conversion & copy ctors of sparse matrix
Jaroslav Hajek <highegg@gmail.com>
parents:
10512
diff
changeset
|
104 copy_or_memcpy (nz, a.d, d); |
|
40c58502a78b
improve conversion & copy ctors of sparse matrix
Jaroslav Hajek <highegg@gmail.com>
parents:
10512
diff
changeset
|
105 copy_or_memcpy (nz, a.r, r); |
|
40c58502a78b
improve conversion & copy ctors of sparse matrix
Jaroslav Hajek <highegg@gmail.com>
parents:
10512
diff
changeset
|
106 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
|
107 } |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
108 |
| 5164 | 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 private: | |
| 165 | |
| 166 typename Sparse<T>::SparseRep *nil_rep (void) const | |
| 167 { | |
| 168 static typename Sparse<T>::SparseRep *nr | |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
169 = new typename Sparse<T>::SparseRep (); |
| 5164 | 170 |
| 171 nr->count++; | |
| 172 | |
| 173 return nr; | |
| 174 } | |
| 175 | |
| 176 public: | |
| 177 | |
| 178 Sparse (void) | |
|
10512
aac9f4265048
rewrite sparse indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
10497
diff
changeset
|
179 : rep (nil_rep ()), dimensions (dim_vector(0,0)) { } |
| 5164 | 180 |
| 5275 | 181 explicit Sparse (octave_idx_type n) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
182 : rep (new typename Sparse<T>::SparseRep (n)), |
|
10512
aac9f4265048
rewrite sparse indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
10497
diff
changeset
|
183 dimensions (dim_vector (n, n)) { } |
| 5164 | 184 |
| 5275 | 185 explicit Sparse (octave_idx_type nr, octave_idx_type nc) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
186 : rep (new typename Sparse<T>::SparseRep (nr, nc)), |
|
10512
aac9f4265048
rewrite sparse indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
10497
diff
changeset
|
187 dimensions (dim_vector (nr, nc)) { } |
| 5164 | 188 |
| 5275 | 189 explicit Sparse (octave_idx_type nr, octave_idx_type nc, T val); |
| 5164 | 190 |
| 5275 | 191 Sparse (const dim_vector& dv, octave_idx_type nz) |
| 5164 | 192 : 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
|
193 dimensions (dv) { } |
| 5164 | 194 |
| 5275 | 195 Sparse (octave_idx_type nr, octave_idx_type nc, octave_idx_type nz) |
| 5164 | 196 : rep (new typename Sparse<T>::SparseRep (nr, nc, nz)), |
|
10512
aac9f4265048
rewrite sparse indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
10497
diff
changeset
|
197 dimensions (dim_vector (nr, nc)) { } |
| 5164 | 198 |
|
13030
b646413c3d0e
Make operators do smarter sparse conversions on permutation matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12125
diff
changeset
|
199 // Both SparseMatrix and SparseBoolMatrix need this ctor, and this |
|
b646413c3d0e
Make operators do smarter sparse conversions on permutation matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12125
diff
changeset
|
200 // is their only common ancestor. |
|
b646413c3d0e
Make operators do smarter sparse conversions on permutation matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12125
diff
changeset
|
201 explicit Sparse (const PermMatrix& a); |
|
b646413c3d0e
Make operators do smarter sparse conversions on permutation matrices.
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12125
diff
changeset
|
202 |
|
10514
40c58502a78b
improve conversion & copy ctors of sparse matrix
Jaroslav Hajek <highegg@gmail.com>
parents:
10512
diff
changeset
|
203 // Type conversion case. Preserves capacity (). |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
204 template <class U> |
|
10515
189274f6c7c4
omissions from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
10514
diff
changeset
|
205 Sparse (const Sparse<U>& a) |
|
189274f6c7c4
omissions from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
10514
diff
changeset
|
206 : rep (new typename Sparse<T>::SparseRep (a.rep->nrows, a.rep->ncols, a.rep->nzmx)), |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
207 dimensions (a.dimensions) |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
208 { |
|
10515
189274f6c7c4
omissions from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
10514
diff
changeset
|
209 octave_idx_type nz = a.nnz (); |
|
189274f6c7c4
omissions from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
10514
diff
changeset
|
210 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
|
211 copy_or_memcpy (nz, a.rep->r, rep->r); |
|
189274f6c7c4
omissions from last patch
Jaroslav Hajek <highegg@gmail.com>
parents:
10514
diff
changeset
|
212 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
|
213 } |
| 5164 | 214 |
| 215 // No type conversion case. | |
| 216 Sparse (const Sparse<T>& a) | |
|
10512
aac9f4265048
rewrite sparse indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
10497
diff
changeset
|
217 : rep (a.rep), dimensions (a.dimensions) |
| 5164 | 218 { |
| 219 rep->count++; | |
| 220 } | |
| 221 | |
| 222 public: | |
| 223 | |
| 224 Sparse (const dim_vector& dv); | |
| 225 | |
| 226 Sparse (const Sparse<T>& a, const dim_vector& dv); | |
| 227 | |
|
10479
ded9beac7582
optimize sparse matrix assembly
Jaroslav Hajek <highegg@gmail.com>
parents:
10425
diff
changeset
|
228 Sparse (const Array<T>& a, const idx_vector& r, const idx_vector& c, |
|
10527
b4d2080b6df7
Replace nzmax by nnz as needed
David Bateman <dbateman@free.fr>
parents:
10521
diff
changeset
|
229 octave_idx_type nr = -1, octave_idx_type nc = -1, |
|
b4d2080b6df7
Replace nzmax by nnz as needed
David Bateman <dbateman@free.fr>
parents:
10521
diff
changeset
|
230 bool sum_terms = true, octave_idx_type nzm = -1); |
|
10479
ded9beac7582
optimize sparse matrix assembly
Jaroslav Hajek <highegg@gmail.com>
parents:
10425
diff
changeset
|
231 |
| 5164 | 232 // Sparsify a normal matrix |
| 233 Sparse (const Array<T>& a); | |
| 234 | |
| 235 virtual ~Sparse (void); | |
| 236 | |
|
7717
ff918ee1a983
Delete idx in Sparse<T> and Array<T> operator =
David Bateman <dbateman@free.fr>
parents:
7620
diff
changeset
|
237 Sparse<T>& operator = (const Sparse<T>& a); |
| 5164 | 238 |
| 5604 | 239 // Note that nzmax and capacity are the amount of storage for |
| 240 // non-zero elements, while nnz is the actual number of non-zero | |
| 241 // terms. | |
| 242 octave_idx_type nzmax (void) const { return rep->length (); } | |
| 243 octave_idx_type capacity (void) const { return nzmax (); } | |
| 244 octave_idx_type nnz (void) const { return rep->nnz (); } | |
| 5164 | 245 |
|
10425
0677c5d80b77
rewrite 1D sparse indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
10421
diff
changeset
|
246 // 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
|
247 // so don't do it unless you really need it. |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
248 octave_idx_type numel (void) const |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
249 { |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
250 return dimensions.safe_numel (); |
| 5164 | 251 } |
| 252 | |
| 5275 | 253 octave_idx_type nelem (void) const { return capacity (); } |
| 254 octave_idx_type length (void) const { return numel (); } | |
| 5164 | 255 |
| 5275 | 256 octave_idx_type dim1 (void) const { return dimensions(0); } |
| 257 octave_idx_type dim2 (void) const { return dimensions(1); } | |
| 5164 | 258 |
| 5275 | 259 octave_idx_type rows (void) const { return dim1 (); } |
| 260 octave_idx_type cols (void) const { return dim2 (); } | |
| 261 octave_idx_type columns (void) const { return dim2 (); } | |
| 5164 | 262 |
| 5275 | 263 octave_idx_type get_row_index (octave_idx_type k) { return ridx (k); } |
| 264 octave_idx_type get_col_index (octave_idx_type k) | |
| 5164 | 265 { |
| 5275 | 266 octave_idx_type ret = 0; |
| 5164 | 267 while (cidx(ret+1) < k) |
| 268 ret++; | |
| 269 return ret; | |
| 270 } | |
|
10358
72fab01e5d68
improve some size_t queries
Jaroslav Hajek <highegg@gmail.com>
parents:
10352
diff
changeset
|
271 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
272 size_t byte_size (void) const |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
273 { |
|
10358
72fab01e5d68
improve some size_t queries
Jaroslav Hajek <highegg@gmail.com>
parents:
10352
diff
changeset
|
274 return (static_cast<size_t>(cols () + 1) * sizeof (octave_idx_type) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
275 + static_cast<size_t> (capacity ()) * (sizeof (T) + sizeof (octave_idx_type))); |
|
10358
72fab01e5d68
improve some size_t queries
Jaroslav Hajek <highegg@gmail.com>
parents:
10352
diff
changeset
|
276 } |
| 5164 | 277 |
| 278 dim_vector dims (void) const { return dimensions; } | |
| 279 | |
| 280 Sparse<T> squeeze (void) const { return *this; } | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
281 |
| 5275 | 282 octave_idx_type compute_index (const Array<octave_idx_type>& ra_idx) const; |
| 5164 | 283 |
| 5275 | 284 T range_error (const char *fcn, octave_idx_type n) const; |
| 285 T& range_error (const char *fcn, octave_idx_type n); | |
| 5164 | 286 |
| 5275 | 287 T range_error (const char *fcn, octave_idx_type i, octave_idx_type j) const; |
| 288 T& range_error (const char *fcn, octave_idx_type i, octave_idx_type j); | |
| 5164 | 289 |
| 5275 | 290 T range_error (const char *fcn, const Array<octave_idx_type>& ra_idx) const; |
| 291 T& range_error (const char *fcn, const Array<octave_idx_type>& ra_idx); | |
| 5164 | 292 |
| 293 // No checking, even for multiple references, ever. | |
| 294 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
295 T& xelem (octave_idx_type n) |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
296 { |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
297 octave_idx_type i = n % rows (), j = n / rows(); |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
298 return xelem (i, j); |
| 5164 | 299 } |
| 300 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
301 T xelem (octave_idx_type n) const |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
302 { |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
303 octave_idx_type i = n % rows (), j = n / rows(); |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
304 return xelem (i, j); |
| 5164 | 305 } |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
306 |
| 5275 | 307 T& xelem (octave_idx_type i, octave_idx_type j) { return rep->elem (i, j); } |
| 308 T xelem (octave_idx_type i, octave_idx_type j) const { return rep->celem (i, j); } | |
| 5164 | 309 |
| 5275 | 310 T& xelem (const Array<octave_idx_type>& ra_idx) |
| 5164 | 311 { return xelem (compute_index (ra_idx)); } |
| 312 | |
| 5275 | 313 T xelem (const Array<octave_idx_type>& ra_idx) const |
| 5164 | 314 { return xelem (compute_index (ra_idx)); } |
| 315 | |
| 5775 | 316 // FIXME -- would be nice to fix this so that we don't |
| 5164 | 317 // unnecessarily force a copy, but that is not so easy, and I see no |
| 318 // clean way to do it. | |
| 319 | |
| 5275 | 320 T& checkelem (octave_idx_type n) |
| 5164 | 321 { |
| 322 if (n < 0 || n >= numel ()) | |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
323 return range_error ("T& Sparse<T>::checkelem", n); |
| 5164 | 324 else |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
325 { |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
326 make_unique (); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
327 return xelem (n); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
328 } |
| 5164 | 329 } |
| 330 | |
| 5275 | 331 T& checkelem (octave_idx_type i, octave_idx_type j) |
| 5164 | 332 { |
| 333 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
|
334 return range_error ("T& Sparse<T>::checkelem", i, j); |
| 5164 | 335 else |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
336 { |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
337 make_unique (); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
338 return xelem (i, j); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
339 } |
| 5164 | 340 } |
| 341 | |
| 5275 | 342 T& checkelem (const Array<octave_idx_type>& ra_idx) |
| 5164 | 343 { |
| 5275 | 344 octave_idx_type i = compute_index (ra_idx); |
| 5164 | 345 |
| 346 if (i < 0) | |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
347 return range_error ("T& Sparse<T>::checkelem", ra_idx); |
| 5164 | 348 else |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
349 return elem (i); |
| 5164 | 350 } |
| 351 | |
| 5275 | 352 T& elem (octave_idx_type n) |
| 5164 | 353 { |
| 354 make_unique (); | |
| 355 return xelem (n); | |
| 356 } | |
| 357 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
358 T& elem (octave_idx_type i, octave_idx_type j) |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
359 { |
| 5164 | 360 make_unique (); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
361 return xelem (i, j); |
| 5164 | 362 } |
| 363 | |
| 5275 | 364 T& elem (const Array<octave_idx_type>& ra_idx) |
| 5164 | 365 { return Sparse<T>::elem (compute_index (ra_idx)); } |
| 366 | |
| 367 #if defined (BOUNDS_CHECKING) | |
| 5275 | 368 T& operator () (octave_idx_type n) { return checkelem (n); } |
| 369 T& operator () (octave_idx_type i, octave_idx_type j) { return checkelem (i, j); } | |
| 370 T& operator () (const Array<octave_idx_type>& ra_idx) { return checkelem (ra_idx); } | |
| 5164 | 371 #else |
| 5275 | 372 T& operator () (octave_idx_type n) { return elem (n); } |
| 373 T& operator () (octave_idx_type i, octave_idx_type j) { return elem (i, j); } | |
| 374 T& operator () (const Array<octave_idx_type>& ra_idx) { return elem (ra_idx); } | |
| 5164 | 375 #endif |
| 376 | |
| 5275 | 377 T checkelem (octave_idx_type n) const |
| 5164 | 378 { |
| 379 if (n < 0 || n >= numel ()) | |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
380 return range_error ("T Sparse<T>::checkelem", n); |
| 5164 | 381 else |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
382 return xelem (n); |
| 5164 | 383 } |
| 384 | |
| 5275 | 385 T checkelem (octave_idx_type i, octave_idx_type j) const |
| 5164 | 386 { |
| 387 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
|
388 return range_error ("T Sparse<T>::checkelem", i, j); |
| 5164 | 389 else |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
390 return xelem (i, j); |
| 5164 | 391 } |
| 392 | |
| 5275 | 393 T checkelem (const Array<octave_idx_type>& ra_idx) const |
| 5164 | 394 { |
| 5275 | 395 octave_idx_type i = compute_index (ra_idx); |
| 5164 | 396 |
| 397 if (i < 0) | |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
398 return range_error ("T Sparse<T>::checkelem", ra_idx); |
| 5164 | 399 else |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
400 return Sparse<T>::elem (i); |
| 5164 | 401 } |
| 402 | |
| 5275 | 403 T elem (octave_idx_type n) const { return xelem (n); } |
| 5164 | 404 |
| 5275 | 405 T elem (octave_idx_type i, octave_idx_type j) const { return xelem (i, j); } |
| 5164 | 406 |
| 5275 | 407 T elem (const Array<octave_idx_type>& ra_idx) const |
| 5164 | 408 { return Sparse<T>::elem (compute_index (ra_idx)); } |
| 409 | |
| 410 #if defined (BOUNDS_CHECKING) | |
| 5275 | 411 T operator () (octave_idx_type n) const { return checkelem (n); } |
| 412 T operator () (octave_idx_type i, octave_idx_type j) const { return checkelem (i, j); } | |
| 413 T operator () (const Array<octave_idx_type>& ra_idx) const { return checkelem (ra_idx); } | |
| 5164 | 414 #else |
| 5275 | 415 T operator () (octave_idx_type n) const { return elem (n); } |
| 416 T operator () (octave_idx_type i, octave_idx_type j) const { return elem (i, j); } | |
| 417 T operator () (const Array<octave_idx_type>& ra_idx) const { return elem (ra_idx); } | |
| 5164 | 418 #endif |
| 419 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
420 Sparse<T> maybe_compress (bool remove_zeros = false) |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
421 { |
|
10497
cb7ffe7288f0
improve & fix SparseRep reallocation and compression
Jaroslav Hajek <highegg@gmail.com>
parents:
10490
diff
changeset
|
422 if (remove_zeros) |
|
cb7ffe7288f0
improve & fix SparseRep reallocation and compression
Jaroslav Hajek <highegg@gmail.com>
parents:
10490
diff
changeset
|
423 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
|
424 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
425 rep->maybe_compress (remove_zeros); |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
426 return (*this); |
|
10497
cb7ffe7288f0
improve & fix SparseRep reallocation and compression
Jaroslav Hajek <highegg@gmail.com>
parents:
10490
diff
changeset
|
427 } |
| 5164 | 428 |
| 429 Sparse<T> reshape (const dim_vector& new_dims) const; | |
| 430 | |
| 5275 | 431 Sparse<T> permute (const Array<octave_idx_type>& vec, bool inv = false) const; |
| 5164 | 432 |
| 5275 | 433 Sparse<T> ipermute (const Array<octave_idx_type>& vec) const |
| 5164 | 434 { return permute (vec, true); } |
| 435 | |
|
10425
0677c5d80b77
rewrite 1D sparse indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
10421
diff
changeset
|
436 void resize1 (octave_idx_type n); |
| 5164 | 437 |
|
10425
0677c5d80b77
rewrite 1D sparse indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
10421
diff
changeset
|
438 void resize (octave_idx_type r, octave_idx_type c); |
|
0677c5d80b77
rewrite 1D sparse indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
10421
diff
changeset
|
439 |
|
0677c5d80b77
rewrite 1D sparse indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
10421
diff
changeset
|
440 void resize (const dim_vector& dv); |
| 5164 | 441 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
442 void change_capacity (octave_idx_type nz) |
|
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
443 { |
|
10497
cb7ffe7288f0
improve & fix SparseRep reallocation and compression
Jaroslav Hajek <highegg@gmail.com>
parents:
10490
diff
changeset
|
444 if (nz < nnz ()) |
|
cb7ffe7288f0
improve & fix SparseRep reallocation and compression
Jaroslav Hajek <highegg@gmail.com>
parents:
10490
diff
changeset
|
445 make_unique (); // Unshare now because elements will be truncated. |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
446 rep->change_length (nz); |
|
10497
cb7ffe7288f0
improve & fix SparseRep reallocation and compression
Jaroslav Hajek <highegg@gmail.com>
parents:
10490
diff
changeset
|
447 } |
| 5164 | 448 |
| 5275 | 449 Sparse<T>& insert (const Sparse<T>& a, octave_idx_type r, octave_idx_type c); |
| 450 Sparse<T>& insert (const Sparse<T>& a, const Array<octave_idx_type>& idx); | |
| 5164 | 451 |
| 452 bool is_square (void) const { return (dim1 () == dim2 ()); } | |
| 453 | |
| 454 bool is_empty (void) const { return (rows () < 1 && cols () < 1); } | |
| 455 | |
| 456 Sparse<T> transpose (void) const; | |
| 457 | |
| 458 T* data (void) { make_unique (); return rep->d; } | |
| 5275 | 459 T& data (octave_idx_type i) { make_unique (); return rep->data (i); } |
| 5164 | 460 T* xdata (void) { return rep->d; } |
| 5275 | 461 T& xdata (octave_idx_type i) { return rep->data (i); } |
| 5164 | 462 |
| 5275 | 463 T data (octave_idx_type i) const { return rep->data (i); } |
| 5900 | 464 // FIXME -- shouldn't this be returning const T*? |
| 5164 | 465 T* data (void) const { return rep->d; } |
| 466 | |
| 5275 | 467 octave_idx_type* ridx (void) { make_unique (); return rep->r; } |
| 468 octave_idx_type& ridx (octave_idx_type i) { make_unique (); return rep->ridx (i); } | |
| 469 octave_idx_type* xridx (void) { return rep->r; } | |
| 470 octave_idx_type& xridx (octave_idx_type i) { return rep->ridx (i); } | |
| 5164 | 471 |
| 5275 | 472 octave_idx_type ridx (octave_idx_type i) const { return rep->cridx (i); } |
| 5900 | 473 // FIXME -- shouldn't this be returning const octave_idx_type*? |
| 5275 | 474 octave_idx_type* ridx (void) const { return rep->r; } |
| 5164 | 475 |
| 5275 | 476 octave_idx_type* cidx (void) { make_unique (); return rep->c; } |
| 477 octave_idx_type& cidx (octave_idx_type i) { make_unique (); return rep->cidx (i); } | |
| 478 octave_idx_type* xcidx (void) { return rep->c; } | |
| 479 octave_idx_type& xcidx (octave_idx_type i) { return rep->cidx (i); } | |
| 5164 | 480 |
| 5275 | 481 octave_idx_type cidx (octave_idx_type i) const { return rep->ccidx (i); } |
| 5900 | 482 // FIXME -- shouldn't this be returning const octave_idx_type*? |
| 5275 | 483 octave_idx_type* cidx (void) const { return rep->c; } |
| 5164 | 484 |
| 5275 | 485 octave_idx_type ndims (void) const { return dimensions.length (); } |
| 5164 | 486 |
|
10490
fdccd69d26bd
rewrite sparse null assignment (part 2)
Jaroslav Hajek <highegg@gmail.com>
parents:
10480
diff
changeset
|
487 void delete_elements (const idx_vector& i); |
| 5164 | 488 |
|
10490
fdccd69d26bd
rewrite sparse null assignment (part 2)
Jaroslav Hajek <highegg@gmail.com>
parents:
10480
diff
changeset
|
489 void delete_elements (int dim, const idx_vector& i); |
| 5164 | 490 |
|
10490
fdccd69d26bd
rewrite sparse null assignment (part 2)
Jaroslav Hajek <highegg@gmail.com>
parents:
10480
diff
changeset
|
491 void delete_elements (const idx_vector& i, const idx_vector& j); |
| 5164 | 492 |
|
10421
99e9bae2d81e
improve sparse indexing interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10382
diff
changeset
|
493 Sparse<T> index (const idx_vector& i, bool resize_ok = false) const; |
| 5164 | 494 |
|
10421
99e9bae2d81e
improve sparse indexing interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10382
diff
changeset
|
495 Sparse<T> index (const idx_vector& i, const idx_vector& j, bool resize_ok = false) const; |
| 5164 | 496 |
|
10512
aac9f4265048
rewrite sparse indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
10497
diff
changeset
|
497 void assign (const idx_vector& i, const Sparse<T>& rhs); |
|
aac9f4265048
rewrite sparse indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
10497
diff
changeset
|
498 |
|
aac9f4265048
rewrite sparse indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
10497
diff
changeset
|
499 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
|
500 |
| 5164 | 501 void print_info (std::ostream& os, const std::string& prefix) const; |
| 502 | |
| 5900 | 503 // Unsafe. These functions exist to support the MEX interface. |
| 504 // You should not use them anywhere else. | |
| 505 void *mex_get_data (void) const { return const_cast<T *> (data ()); } | |
| 506 | |
| 507 octave_idx_type *mex_get_ir (void) const { return const_cast<octave_idx_type *> (ridx ()); } | |
| 508 | |
| 509 octave_idx_type *mex_get_jc (void) const { return const_cast<octave_idx_type *> (cidx ()); } | |
| 7433 | 510 |
|
7463
2467639bd8c0
eliminate UNDEFINED sort mode
John W. Eaton <jwe@octave.org>
parents:
7433
diff
changeset
|
511 Sparse<T> sort (octave_idx_type dim = 0, sortmode mode = ASCENDING) const; |
| 7433 | 512 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
|
513 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
|
514 |
|
7620
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7602
diff
changeset
|
515 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
|
516 |
|
10716
f7f26094021b
improve cat code design in data.cc, make horzcat/vertcat more Matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
10537
diff
changeset
|
517 // dim = -1 and dim = -2 are special; see Array<T>::cat description. |
|
10531
2dd8ea8bfd71
basic cat functionality in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10527
diff
changeset
|
518 static Sparse<T> |
|
2dd8ea8bfd71
basic cat functionality in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10527
diff
changeset
|
519 cat (int dim, octave_idx_type n, const Sparse<T> *sparse_list); |
|
2dd8ea8bfd71
basic cat functionality in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
10527
diff
changeset
|
520 |
|
10425
0677c5d80b77
rewrite 1D sparse indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
10421
diff
changeset
|
521 Array<T> array_value (void) const; |
|
0677c5d80b77
rewrite 1D sparse indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
10421
diff
changeset
|
522 |
|
7602
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
523 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
|
524 Sparse<U> |
|
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
525 map (F fcn) const |
|
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
526 { |
|
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
527 Sparse<U> result; |
|
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
528 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
|
529 |
|
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
530 if (f_zero != 0.) |
|
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
531 { |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
532 octave_idx_type nr = rows (); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
533 octave_idx_type nc = cols (); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
534 |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
535 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
|
536 |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
537 for (octave_idx_type j = 0; j < nc; j++) |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
538 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
|
539 { |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
540 octave_quit (); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
541 /* Use data instead of elem for better performance. */ |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
542 result.data (ridx (i) + j * nr) = fcn (data(i)); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
543 } |
|
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 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
|
546 } |
|
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
547 else |
|
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
548 { |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
549 octave_idx_type nz = nnz (); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
550 octave_idx_type nr = rows (); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
551 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
|
552 |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
553 result = Sparse<U> (nr, nc, nz); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
554 octave_idx_type ii = 0; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
555 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
|
556 |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
557 for (octave_idx_type j = 0; j < nc; j++) |
|
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 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
|
560 { |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
561 U val = fcn (data (i)); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
562 if (val != 0.0) |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
563 { |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
564 result.data (ii) = val; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
565 result.ridx (ii++) = ridx (i); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
566 } |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
567 octave_quit (); |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
568 } |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
569 result.cidx (j+1) = ii; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
570 } |
|
7602
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
571 |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
572 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
|
573 } |
|
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
574 |
|
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
575 return result; |
|
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7470
diff
changeset
|
576 } |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
577 |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
578 // Overloads for function references. |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
579 template <class U> |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
580 Sparse<U> |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
581 map (U (&fcn) (T)) const |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
582 { return map<U, U (&) (T)> (fcn); } |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
583 |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
584 template <class U> |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
585 Sparse<U> |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
586 map (U (&fcn) (const T&)) const |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
587 { return map<U, U (&) (const T&)> (fcn); } |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
9469
diff
changeset
|
588 |
|
9469
c6edba80dfae
sanity checks for loading sparse matrices
John W. Eaton <jwe@octave.org>
parents:
8950
diff
changeset
|
589 bool indices_ok (void) const { return rep->indices_ok (); } |
| 5164 | 590 }; |
| 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; |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
609 |
|
9469
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); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
662 |
|
10312
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 } |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
675 |
|
9469
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 |
| 5164 | 681 #endif |