Mercurial > hg > octave-lyh
annotate liboctave/MSparse.h @ 10785:c2041adcf234
remove unnecessary sparse indexing overloads
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Tue, 13 Jul 2010 12:08:08 +0200 |
| parents | b4d2080b6df7 |
| children | fd0a3ac60b0e |
| rev | line source |
|---|---|
| 5164 | 1 /* |
| 2 | |
| 8920 | 3 Copyright (C) 2004, 2005, 2007, 2008 David Bateman |
| 7016 | 4 Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Andy Adler |
| 5 | |
| 6 This file is part of Octave. | |
| 5164 | 7 |
| 8 Octave is free software; you can redistribute it and/or modify it | |
| 9 under the terms of the GNU General Public License as published by the | |
| 7016 | 10 Free Software Foundation; either version 3 of the License, or (at your |
| 11 option) any later version. | |
| 5164 | 12 |
| 13 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
| 7016 | 19 along with Octave; see the file COPYING. If not, see |
| 20 <http://www.gnu.org/licenses/>. | |
| 5164 | 21 |
| 22 */ | |
| 23 | |
| 24 #if !defined (octave_MSparse_h) | |
| 25 #define octave_MSparse_h 1 | |
| 26 | |
|
10350
12884915a8e4
merge MArray classes & improve Array interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10312
diff
changeset
|
27 #include "MArray.h" |
| 5164 | 28 |
| 29 #include "Sparse.h" | |
| 30 | |
| 31 // Two dimensional sparse array with math ops. | |
| 32 | |
| 33 // But first, some preprocessor abuse... | |
| 34 | |
| 35 #include "MSparse-defs.h" | |
| 36 | |
|
10350
12884915a8e4
merge MArray classes & improve Array interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10312
diff
changeset
|
37 SPARSE_OPS_FORWARD_DECLS (MSparse, MArray, ) |
| 5164 | 38 |
| 39 template <class T> | |
| 40 class | |
| 41 MSparse : public Sparse<T> | |
| 42 { | |
| 43 public: | |
| 44 | |
| 45 MSparse (void) : Sparse<T> () { } | |
| 46 | |
| 5275 | 47 MSparse (octave_idx_type n, octave_idx_type m) : Sparse<T> (n, m) { } |
| 5164 | 48 |
| 6823 | 49 MSparse (const dim_vector& dv, octave_idx_type nz = 0) : |
| 50 Sparse<T> (dv, nz) { } | |
| 51 | |
| 5164 | 52 MSparse (const MSparse<T>& a) : Sparse<T> (a) { } |
| 53 | |
| 54 MSparse (const MSparse<T>& a, const dim_vector& dv) : Sparse<T> (a, dv) { } | |
| 55 | |
| 56 MSparse (const Sparse<T>& a) : Sparse<T> (a) { } | |
| 57 | |
|
10516
f0266ee4aabe
optimize some special indexing & assignment cases
Jaroslav Hajek <highegg@gmail.com>
parents:
10480
diff
changeset
|
58 template <class U> |
|
f0266ee4aabe
optimize some special indexing & assignment cases
Jaroslav Hajek <highegg@gmail.com>
parents:
10480
diff
changeset
|
59 MSparse (const Sparse<U>& a) : Sparse<T> (a) { } |
|
f0266ee4aabe
optimize some special indexing & assignment cases
Jaroslav Hajek <highegg@gmail.com>
parents:
10480
diff
changeset
|
60 |
|
10479
ded9beac7582
optimize sparse matrix assembly
Jaroslav Hajek <highegg@gmail.com>
parents:
10421
diff
changeset
|
61 MSparse (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:
10516
diff
changeset
|
62 octave_idx_type nr = -1, octave_idx_type nc = -1, |
|
b4d2080b6df7
Replace nzmax by nnz as needed
David Bateman <dbateman@free.fr>
parents:
10516
diff
changeset
|
63 bool sum_terms = true, octave_idx_type nzm = -1) |
|
b4d2080b6df7
Replace nzmax by nnz as needed
David Bateman <dbateman@free.fr>
parents:
10516
diff
changeset
|
64 : Sparse<T> (a, r, c, nr, nc, sum_terms, nzm) { } |
|
10479
ded9beac7582
optimize sparse matrix assembly
Jaroslav Hajek <highegg@gmail.com>
parents:
10421
diff
changeset
|
65 |
| 5275 | 66 explicit MSparse (octave_idx_type r, octave_idx_type c, T val) : Sparse<T> (r, c, val) { } |
| 5164 | 67 |
| 5275 | 68 MSparse (octave_idx_type r, octave_idx_type c, octave_idx_type num_nz) : Sparse<T> (r, c, num_nz) { } |
| 5164 | 69 |
| 70 ~MSparse (void) { } | |
| 71 | |
| 72 MSparse<T>& operator = (const MSparse<T>& a) | |
| 73 { | |
| 74 Sparse<T>::operator = (a); | |
| 75 return *this; | |
| 76 } | |
| 77 | |
| 5275 | 78 MSparse<T>& insert (const Sparse<T>& a, octave_idx_type r, octave_idx_type c) |
| 5164 | 79 { |
| 80 Sparse<T>::insert (a, r, c); | |
| 81 return *this; | |
| 82 } | |
| 83 | |
| 6823 | 84 MSparse<T>& insert (const Sparse<T>& a, const Array<octave_idx_type>& indx) |
| 85 { | |
| 86 Sparse<T>::insert (a, indx); | |
| 87 return *this; | |
| 88 } | |
| 89 | |
| 5164 | 90 MSparse<T> transpose (void) const { return Sparse<T>::transpose (); } |
| 91 | |
| 92 MSparse<T> squeeze (void) const { return Sparse<T>::squeeze (); } | |
| 93 | |
| 94 MSparse<T> reshape (const dim_vector& new_dims) const | |
| 95 { return Sparse<T>::reshape (new_dims); } | |
| 96 | |
| 5275 | 97 MSparse<T> permute (const Array<octave_idx_type>& vec, bool inv = false) const |
| 5164 | 98 { return Sparse<T>::permute (vec, inv); } |
| 99 | |
| 5275 | 100 MSparse<T> ipermute (const Array<octave_idx_type>& vec) const |
| 5164 | 101 { return Sparse<T>::ipermute (vec); } |
| 102 | |
| 103 | |
|
7620
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7602
diff
changeset
|
104 MSparse<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
|
105 { |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7602
diff
changeset
|
106 return Sparse<T>::diag (k); |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7602
diff
changeset
|
107 } |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7602
diff
changeset
|
108 |
|
9812
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
109 // FIXME: should go away. |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
110 template <class U> |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
111 MSparse<U> |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
112 map (U (&fcn) (T)) const |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
113 { return Sparse<T>::template map<U> (fcn); } |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
114 |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
115 template <class U> |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
116 MSparse<U> |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
117 map (U (&fcn) (const T&)) const |
|
f80c566bc751
improve unary mapper system
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
118 { return Sparse<T>::template map<U> (fcn); } |
|
7602
7bfaa9611558
Rewrite sparse mappers in terms of a functor template function
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
119 |
| 5164 | 120 // Currently, the OPS functions don't need to be friends, but that |
| 121 // may change. | |
| 122 | |
|
10350
12884915a8e4
merge MArray classes & improve Array interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10312
diff
changeset
|
123 // SPARSE_OPS_FRIEND_DECLS (MSparse, MArray) |
| 5164 | 124 }; |
| 125 | |
| 126 #endif |