Mercurial > hg > octave-lyh

comparison liboctave/CDiagMatrix.h @ 9237:3c1762c7e787

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add missing xxx_API decoration and remove misplaced ones
author Michael Goffioul <michael.goffioul@gmail.com>
date Thu, 21 May 2009 21:28:47 +0100
parents eb63fbe60fab
children 4c0cdbe0acca
comparison
equal deleted inserted replaced
9236:c02224afead6 9237:3c1762c7e787
33 #include "DET.h" 33 #include "DET.h"
34 34
35 #include "mx-defs.h" 35 #include "mx-defs.h"
36 36
37 class 37 class
38 OCTAVE_API
38 ComplexDiagMatrix : public MDiagArray2<Complex> 39 ComplexDiagMatrix : public MDiagArray2<Complex>
39 { 40 {
40 public: 41 public:
41 42
42 ComplexDiagMatrix (void) : MDiagArray2<Complex> () { } 43 ComplexDiagMatrix (void) : MDiagArray2<Complex> () { }
94 95
95 ComplexDiagMatrix hermitian (void) const { return MDiagArray2<Complex>::hermitian (std::conj); } 96 ComplexDiagMatrix hermitian (void) const { return MDiagArray2<Complex>::hermitian (std::conj); }
96 ComplexDiagMatrix transpose (void) const { return MDiagArray2<Complex>::transpose(); } 97 ComplexDiagMatrix transpose (void) const { return MDiagArray2<Complex>::transpose(); }
97 DiagMatrix abs (void) const; 98 DiagMatrix abs (void) const;
98 99
99 friend ComplexDiagMatrix conj (const ComplexDiagMatrix& a); 100 friend OCTAVE_API ComplexDiagMatrix conj (const ComplexDiagMatrix& a);
100 101
101 // resize is the destructive analog for this one 102 // resize is the destructive analog for this one
102 103
103 ComplexMatrix extract (octave_idx_type r1, octave_idx_type c1, octave_idx_type r2, octave_idx_type c2) const; 104 ComplexMatrix extract (octave_idx_type r1, octave_idx_type c1, octave_idx_type r2, octave_idx_type c2) const;
104 105
137 138
138 ComplexDiagMatrix (Complex *d, octave_idx_type nr, octave_idx_type nc) 139 ComplexDiagMatrix (Complex *d, octave_idx_type nr, octave_idx_type nc)
139 : MDiagArray2<Complex> (d, nr, nc) { } 140 : MDiagArray2<Complex> (d, nr, nc) { }
140 }; 141 };
141 142
142 ComplexDiagMatrix conj (const ComplexDiagMatrix& a); 143 OCTAVE_API ComplexDiagMatrix conj (const ComplexDiagMatrix& a);
143 144
144 // diagonal matrix by diagonal matrix -> diagonal matrix operations 145 // diagonal matrix by diagonal matrix -> diagonal matrix operations
145 146
146 ComplexDiagMatrix 147 OCTAVE_API ComplexDiagMatrix
147 operator * (const ComplexDiagMatrix& a, const ComplexDiagMatrix& b); 148 operator * (const ComplexDiagMatrix& a, const ComplexDiagMatrix& b);
148 149
149 ComplexDiagMatrix 150 OCTAVE_API ComplexDiagMatrix
150 operator * (const ComplexDiagMatrix& a, const DiagMatrix& b); 151 operator * (const ComplexDiagMatrix& a, const DiagMatrix& b);
151 152
152 ComplexDiagMatrix 153 OCTAVE_API ComplexDiagMatrix
153 operator * (const DiagMatrix& a, const ComplexDiagMatrix& b); 154 operator * (const DiagMatrix& a, const ComplexDiagMatrix& b);
154 155
155 MDIAGARRAY2_FORWARD_DEFS (MDiagArray2, ComplexDiagMatrix, Complex) 156 MDIAGARRAY2_FORWARD_DEFS (MDiagArray2, ComplexDiagMatrix, Complex)
156 157
157 #endif 158 #endif