Mercurial > hg > octave-nkf
annotate liboctave/array/dMatrix.h @ 19511:3746b92739f7
Replace some duplicated code and count on methods implemented on base classes.
* liboctave/array/CMatrix.cc, liboctave/array/CMatrix.h,
liboctave/array/dMatrix.cc, liboctave/array/dMatrix.h,
liboctave/array/fCMatrix.cc, liboctave/array/fCMatrix.h,
liboctave/array/fMatrix.cc, liboctave/array/fMatrix.h: remove a lot of
duplicate code from Matrix type classes now that these classes inherit from
their NDArrays counterpart. These mostly include operator ! and =,
any_element_is_nan, any_element_is_inf_or_nan, all_elements_are_real,
all_integers, too_large_for_float, all, any, cumprod, cumsum, prod, sum,
sumsq, and abs. In some cases these need to still appear on the Matrix
definition to avoid slicing.
author | Carnë Draug <carandraug@octave.org> |
---|---|
date | Fri, 07 Nov 2014 10:41:18 +0000 |
parents | d0c73e23a505 |
children | 385499581a5e |
rev | line source |
---|---|
458 | 1 /* |
2 | |
17744
d63878346099
maint: Update copyright notices for release.
John W. Eaton <jwe@octave.org>
parents:
15271
diff
changeset
|
3 Copyright (C) 1994-2013 John W. Eaton |
458 | 4 |
5 This file is part of Octave. | |
6 | |
7 Octave is free software; you can redistribute it and/or modify it | |
8 under the terms of the GNU General Public License as published by the | |
7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
10 option) any later version. | |
458 | 11 |
12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
15 for more details. | |
16 | |
17 You should have received a copy of the GNU General Public License | |
7016 | 18 along with Octave; see the file COPYING. If not, see |
19 <http://www.gnu.org/licenses/>. | |
458 | 20 |
21 */ | |
22 | |
17822
ebb3ef964372
maint: Use common #define syntax "octave_filename_h" in h_files.
Rik <rik@octave.org>
parents:
17769
diff
changeset
|
23 #if !defined (octave_dMatrix_h) |
ebb3ef964372
maint: Use common #define syntax "octave_filename_h" in h_files.
Rik <rik@octave.org>
parents:
17769
diff
changeset
|
24 #define octave_dMatrix_h 1 |
458 | 25 |
19510
d0c73e23a505
Change inheritance tree so that <T>Matrix inherit from <T>NDArray.
Carnë Draug <carandraug@octave.org>
parents:
17822
diff
changeset
|
26 #include "dNDArray.h" |
10350
12884915a8e4
merge MArray classes & improve Array interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10312
diff
changeset
|
27 #include "MArray.h" |
1989 | 28 #include "MDiagArray2.h" |
5785 | 29 #include "MatrixType.h" |
458 | 30 |
31 #include "mx-defs.h" | |
8774
b756ce0002db
split implementation and interface in mx-op-defs and MArray-defs
Jaroslav Hajek <highegg@gmail.com>
parents:
8650
diff
changeset
|
32 #include "mx-op-decl.h" |
8335 | 33 #include "DET.h" |
458 | 34 |
3585 | 35 class |
6108 | 36 OCTAVE_API |
19510
d0c73e23a505
Change inheritance tree so that <T>Matrix inherit from <T>NDArray.
Carnë Draug <carandraug@octave.org>
parents:
17822
diff
changeset
|
37 Matrix : public NDArray |
458 | 38 { |
39 public: | |
40 | |
9656
b29504415a2e
provide NDArray->Matrix->Vector typedef mappers
Jaroslav Hajek <highegg@gmail.com>
parents:
9653
diff
changeset
|
41 typedef ColumnVector column_vector_type; |
b29504415a2e
provide NDArray->Matrix->Vector typedef mappers
Jaroslav Hajek <highegg@gmail.com>
parents:
9653
diff
changeset
|
42 typedef RowVector row_vector_type; |
b29504415a2e
provide NDArray->Matrix->Vector typedef mappers
Jaroslav Hajek <highegg@gmail.com>
parents:
9653
diff
changeset
|
43 |
7788 | 44 typedef void (*solve_singularity_handler) (double rcon); |
3480 | 45 |
19510
d0c73e23a505
Change inheritance tree so that <T>Matrix inherit from <T>NDArray.
Carnë Draug <carandraug@octave.org>
parents:
17822
diff
changeset
|
46 Matrix (void) : NDArray () { } |
3585 | 47 |
11570
57632dea2446
attempt better backward compatibility for Array constructors
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
48 Matrix (octave_idx_type r, octave_idx_type c) |
19510
d0c73e23a505
Change inheritance tree so that <T>Matrix inherit from <T>NDArray.
Carnë Draug <carandraug@octave.org>
parents:
17822
diff
changeset
|
49 : NDArray (dim_vector (r, c)) { } |
3585 | 50 |
11570
57632dea2446
attempt better backward compatibility for Array constructors
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
51 Matrix (octave_idx_type r, octave_idx_type c, double val) |
19510
d0c73e23a505
Change inheritance tree so that <T>Matrix inherit from <T>NDArray.
Carnë Draug <carandraug@octave.org>
parents:
17822
diff
changeset
|
52 : NDArray (dim_vector (r, c), val) { } |
3585 | 53 |
19510
d0c73e23a505
Change inheritance tree so that <T>Matrix inherit from <T>NDArray.
Carnë Draug <carandraug@octave.org>
parents:
17822
diff
changeset
|
54 Matrix (const dim_vector& dv) : NDArray (dv.redim (2)) { } |
6979 | 55 |
11570
57632dea2446
attempt better backward compatibility for Array constructors
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
56 Matrix (const dim_vector& dv, double val) |
19510
d0c73e23a505
Change inheritance tree so that <T>Matrix inherit from <T>NDArray.
Carnë Draug <carandraug@octave.org>
parents:
17822
diff
changeset
|
57 : NDArray (dv.redim (2), val) { } |
6979 | 58 |
19510
d0c73e23a505
Change inheritance tree so that <T>Matrix inherit from <T>NDArray.
Carnë Draug <carandraug@octave.org>
parents:
17822
diff
changeset
|
59 Matrix (const Matrix& a) : NDArray (a) { } |
3585 | 60 |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7788
diff
changeset
|
61 template <class U> |
19510
d0c73e23a505
Change inheritance tree so that <T>Matrix inherit from <T>NDArray.
Carnë Draug <carandraug@octave.org>
parents:
17822
diff
changeset
|
62 Matrix (const MArray<U>& a) : NDArray (a.as_matrix ()) { } |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7788
diff
changeset
|
63 |
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7788
diff
changeset
|
64 template <class U> |
19510
d0c73e23a505
Change inheritance tree so that <T>Matrix inherit from <T>NDArray.
Carnë Draug <carandraug@octave.org>
parents:
17822
diff
changeset
|
65 Matrix (const Array<U>& a) : NDArray (a.as_matrix ()) { } |
10301
9e0ec19df4bc
commit accidentally omitted parts of previous change
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
66 |
3585 | 67 explicit Matrix (const RowVector& rv); |
458 | 68 |
3585 | 69 explicit Matrix (const ColumnVector& cv); |
70 | |
71 explicit Matrix (const DiagMatrix& a); | |
72 | |
8367
445d27d79f4e
support permutation matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8336
diff
changeset
|
73 explicit Matrix (const PermMatrix& a); |
445d27d79f4e
support permutation matrix objects
Jaroslav Hajek <highegg@gmail.com>
parents:
8336
diff
changeset
|
74 |
3585 | 75 explicit Matrix (const boolMatrix& a); |
76 | |
77 explicit Matrix (const charMatrix& a); | |
1574 | 78 |
2385 | 79 bool operator == (const Matrix& a) const; |
80 bool operator != (const Matrix& a) const; | |
458 | 81 |
3354 | 82 bool is_symmetric (void) const; |
83 | |
1359 | 84 // destructive insert/delete/reorder operations |
458 | 85 |
5275 | 86 Matrix& insert (const Matrix& a, octave_idx_type r, octave_idx_type c); |
87 Matrix& insert (const RowVector& a, octave_idx_type r, octave_idx_type c); | |
88 Matrix& insert (const ColumnVector& a, octave_idx_type r, octave_idx_type c); | |
89 Matrix& insert (const DiagMatrix& a, octave_idx_type r, octave_idx_type c); | |
458 | 90 |
91 Matrix& fill (double val); | |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
92 Matrix& fill (double val, octave_idx_type r1, octave_idx_type c1, |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
93 octave_idx_type r2, octave_idx_type c2); |
458 | 94 |
95 Matrix append (const Matrix& a) const; | |
96 Matrix append (const RowVector& a) const; | |
97 Matrix append (const ColumnVector& a) const; | |
98 Matrix append (const DiagMatrix& a) const; | |
99 | |
100 Matrix stack (const Matrix& a) const; | |
101 Matrix stack (const RowVector& a) const; | |
102 Matrix stack (const ColumnVector& a) const; | |
103 Matrix stack (const DiagMatrix& a) const; | |
104 | |
6108 | 105 friend OCTAVE_API Matrix real (const ComplexMatrix& a); |
106 friend OCTAVE_API Matrix imag (const ComplexMatrix& a); | |
1205 | 107 |
8650
a1ae2aae903e
abs,real,imag,conj: use code from mx-inlines rather than the generic map
Jaroslav Hajek <highegg@gmail.com>
parents:
8392
diff
changeset
|
108 friend class ComplexMatrix; |
a1ae2aae903e
abs,real,imag,conj: use code from mx-inlines rather than the generic map
Jaroslav Hajek <highegg@gmail.com>
parents:
8392
diff
changeset
|
109 |
10350
12884915a8e4
merge MArray classes & improve Array interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10312
diff
changeset
|
110 Matrix transpose (void) const { return MArray<double>::transpose (); } |
3225 | 111 |
1359 | 112 // resize is the destructive equivalent for this one |
458 | 113 |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
114 Matrix extract (octave_idx_type r1, octave_idx_type c1, |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
115 octave_idx_type r2, octave_idx_type c2) const; |
458 | 116 |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
117 Matrix extract_n (octave_idx_type r1, octave_idx_type c1, |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
118 octave_idx_type nr, octave_idx_type nc) const; |
4316 | 119 |
1359 | 120 // extract row or column i. |
458 | 121 |
5275 | 122 RowVector row (octave_idx_type i) const; |
458 | 123 |
5275 | 124 ColumnVector column (octave_idx_type i) const; |
458 | 125 |
14616
13cc11418393
improve handling of default resize fill value for arrays
John W. Eaton <jwe@octave.org>
parents:
14557
diff
changeset
|
126 void resize (octave_idx_type nr, octave_idx_type nc, double rfv = 0) |
11574
a83bad07f7e3
attempt better backward compatibility for Array resize functions
John W. Eaton <jwe@octave.org>
parents:
11570
diff
changeset
|
127 { |
a83bad07f7e3
attempt better backward compatibility for Array resize functions
John W. Eaton <jwe@octave.org>
parents:
11570
diff
changeset
|
128 MArray<double>::resize (dim_vector (nr, nc), rfv); |
a83bad07f7e3
attempt better backward compatibility for Array resize functions
John W. Eaton <jwe@octave.org>
parents:
11570
diff
changeset
|
129 } |
a83bad07f7e3
attempt better backward compatibility for Array resize functions
John W. Eaton <jwe@octave.org>
parents:
11570
diff
changeset
|
130 |
6207 | 131 private: |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
132 Matrix tinverse (MatrixType &mattype, octave_idx_type& info, double& rcon, |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
133 int force, int calc_cond) const; |
6207 | 134 |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
135 Matrix finverse (MatrixType &mattype, octave_idx_type& info, double& rcon, |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
136 int force, int calc_cond) const; |
6207 | 137 |
138 public: | |
458 | 139 Matrix inverse (void) const; |
6479 | 140 Matrix inverse (octave_idx_type& info) const; |
7788 | 141 Matrix inverse (octave_idx_type& info, double& rcon, int force = 0, |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
142 int calc_cond = 1) const; |
6479 | 143 |
6207 | 144 Matrix inverse (MatrixType &mattype) const; |
145 Matrix inverse (MatrixType &mattype, octave_idx_type& info) const; | |
7788 | 146 Matrix inverse (MatrixType &mattype, octave_idx_type& info, double& rcon, |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
147 int force = 0, int calc_cond = 1) const; |
458 | 148 |
4384 | 149 Matrix pseudo_inverse (double tol = 0.0) const; |
740 | 150 |
458 | 151 ComplexMatrix fourier (void) const; |
152 ComplexMatrix ifourier (void) const; | |
153 | |
677 | 154 ComplexMatrix fourier2d (void) const; |
155 ComplexMatrix ifourier2d (void) const; | |
156 | |
458 | 157 DET determinant (void) const; |
5275 | 158 DET determinant (octave_idx_type& info) const; |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
159 DET determinant (octave_idx_type& info, double& rcon, |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
160 int calc_cond = 1) const; |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
161 DET determinant (MatrixType &mattype, octave_idx_type& info, |
8336
9813c07ca946
make det take advantage of matrix type
Jaroslav Hajek <highegg@gmail.com>
parents:
8335
diff
changeset
|
162 double& rcon, int calc_cond = 1) const; |
7788 | 163 |
164 double rcond (void) const; | |
165 double rcond (MatrixType &mattype) const; | |
458 | 166 |
5785 | 167 private: |
168 // Upper triangular matrix solvers | |
169 Matrix utsolve (MatrixType &typ, const Matrix& b, octave_idx_type& info, | |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
170 double& rcon, solve_singularity_handler sing_handler, |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
171 bool calc_cond = false, |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
172 blas_trans_type transt = blas_no_trans) const; |
5785 | 173 |
174 // Lower triangular matrix solvers | |
175 Matrix ltsolve (MatrixType &typ, const Matrix& b, octave_idx_type& info, | |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
176 double& rcon, solve_singularity_handler sing_handler, |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
177 bool calc_cond = false, |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
178 blas_trans_type transt = blas_no_trans) const; |
5785 | 179 |
180 // Full matrix solvers (lu/cholesky) | |
181 Matrix fsolve (MatrixType &typ, const Matrix& b, octave_idx_type& info, | |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
182 double& rcon, solve_singularity_handler sing_handler, |
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
183 bool calc_cond = false) const; |
5785 | 184 |
185 public: | |
186 // Generic interface to solver with no probing of type | |
187 Matrix solve (MatrixType &typ, const Matrix& b) const; | |
188 Matrix solve (MatrixType &typ, const Matrix& b, octave_idx_type& info) const; | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
189 Matrix solve (MatrixType &typ, const Matrix& b, octave_idx_type& info, |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
190 double& rcon) const; |
5785 | 191 Matrix solve (MatrixType &typ, const Matrix& b, octave_idx_type& info, |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
192 double& rcon, solve_singularity_handler sing_handler, |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
193 bool singular_fallback = true, |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
194 blas_trans_type transt = blas_no_trans) const; |
5785 | 195 |
196 ComplexMatrix solve (MatrixType &typ, const ComplexMatrix& b) const; | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
197 ComplexMatrix solve (MatrixType &typ, const ComplexMatrix& b, |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
198 octave_idx_type& info) const; |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
199 ComplexMatrix solve (MatrixType &typ, const ComplexMatrix& b, |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
200 octave_idx_type& info, double& rcon) const; |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
201 ComplexMatrix solve (MatrixType &typ, const ComplexMatrix& b, |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
202 octave_idx_type& info, double& rcon, |
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
203 solve_singularity_handler sing_handler, |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
204 bool singular_fallback = true, |
9661
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9656
diff
changeset
|
205 blas_trans_type transt = blas_no_trans) const; |
5785 | 206 |
207 ColumnVector solve (MatrixType &typ, const ColumnVector& b) const; | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
208 ColumnVector solve (MatrixType &typ, const ColumnVector& b, |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
209 octave_idx_type& info) const; |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
210 ColumnVector solve (MatrixType &typ, const ColumnVector& b, |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
211 octave_idx_type& info, double& rcon) const; |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
212 ColumnVector solve (MatrixType &typ, const ColumnVector& b, |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
213 octave_idx_type& info, double& rcon, |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
214 solve_singularity_handler sing_handler, |
9661
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9656
diff
changeset
|
215 blas_trans_type transt = blas_no_trans) const; |
5785 | 216 |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
217 ComplexColumnVector solve (MatrixType &typ, |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
218 const ComplexColumnVector& b) const; |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
219 ComplexColumnVector solve (MatrixType &typ, const ComplexColumnVector& b, |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
220 octave_idx_type& info) const; |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
221 ComplexColumnVector solve (MatrixType &typ, const ComplexColumnVector& b, |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
222 octave_idx_type& info, double& rcon) const; |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
223 ComplexColumnVector solve (MatrixType &typ, const ComplexColumnVector& b, |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
224 octave_idx_type& info, double& rcon, |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
225 solve_singularity_handler sing_handler, |
9661
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9656
diff
changeset
|
226 blas_trans_type transt = blas_no_trans) const; |
5785 | 227 |
228 // Generic interface to solver with probing of type | |
458 | 229 Matrix solve (const Matrix& b) const; |
5275 | 230 Matrix solve (const Matrix& b, octave_idx_type& info) const; |
7788 | 231 Matrix solve (const Matrix& b, octave_idx_type& info, double& rcon) const; |
232 Matrix solve (const Matrix& b, octave_idx_type& info, double& rcon, | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
233 solve_singularity_handler sing_handler, |
9661
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9656
diff
changeset
|
234 blas_trans_type transt = blas_no_trans) const; |
458 | 235 |
236 ComplexMatrix solve (const ComplexMatrix& b) const; | |
5275 | 237 ComplexMatrix solve (const ComplexMatrix& b, octave_idx_type& info) const; |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
238 ComplexMatrix solve (const ComplexMatrix& b, octave_idx_type& info, |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
239 double& rcon) const; |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
240 ComplexMatrix solve (const ComplexMatrix& b, octave_idx_type& info, |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
241 double& rcon, |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
242 solve_singularity_handler sing_handler, |
9661
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9656
diff
changeset
|
243 blas_trans_type transt = blas_no_trans) const; |
458 | 244 |
245 ColumnVector solve (const ColumnVector& b) const; | |
5275 | 246 ColumnVector solve (const ColumnVector& b, octave_idx_type& info) const; |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
247 ColumnVector solve (const ColumnVector& b, octave_idx_type& info, |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
248 double& rcon) const; |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
249 ColumnVector solve (const ColumnVector& b, octave_idx_type& info, |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
250 double& rcon, |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
251 solve_singularity_handler sing_handler, |
9661
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9656
diff
changeset
|
252 blas_trans_type transt = blas_no_trans) const; |
458 | 253 |
254 ComplexColumnVector solve (const ComplexColumnVector& b) const; | |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
255 ComplexColumnVector solve (const ComplexColumnVector& b, |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
256 octave_idx_type& info) const; |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
257 ComplexColumnVector solve (const ComplexColumnVector& b, |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
258 octave_idx_type& info, double& rcon) const; |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
259 ComplexColumnVector solve (const ComplexColumnVector& b, |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
260 octave_idx_type& info, double& rcon, |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
261 solve_singularity_handler sing_handler, |
9661
afcf852256d2
optimize / and '\ for triangular matrices
Jaroslav Hajek <highegg@gmail.com>
parents:
9656
diff
changeset
|
262 blas_trans_type transt = blas_no_trans) const; |
458 | 263 |
5785 | 264 // Singular solvers |
458 | 265 Matrix lssolve (const Matrix& b) const; |
5275 | 266 Matrix lssolve (const Matrix& b, octave_idx_type& info) const; |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
267 Matrix lssolve (const Matrix& b, octave_idx_type& info, |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
268 octave_idx_type& rank) const; |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
269 Matrix lssolve (const Matrix& b, octave_idx_type& info, |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
270 octave_idx_type& rank, double& rcon) const; |
458 | 271 |
272 ComplexMatrix lssolve (const ComplexMatrix& b) const; | |
5275 | 273 ComplexMatrix lssolve (const ComplexMatrix& b, octave_idx_type& info) const; |
274 ComplexMatrix lssolve (const ComplexMatrix& b, octave_idx_type& info, | |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
275 octave_idx_type& rank) const; |
7076 | 276 ComplexMatrix lssolve (const ComplexMatrix& b, octave_idx_type& info, |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
277 octave_idx_type& rank, double &rcon) const; |
458 | 278 |
279 ColumnVector lssolve (const ColumnVector& b) const; | |
5275 | 280 ColumnVector lssolve (const ColumnVector& b, octave_idx_type& info) const; |
7076 | 281 ColumnVector lssolve (const ColumnVector& b, octave_idx_type& info, |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
282 octave_idx_type& rank) const; |
7076 | 283 ColumnVector lssolve (const ColumnVector& b, octave_idx_type& info, |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
284 octave_idx_type& rank, double& rcon) const; |
458 | 285 |
286 ComplexColumnVector lssolve (const ComplexColumnVector& b) const; | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
287 ComplexColumnVector lssolve (const ComplexColumnVector& b, |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
288 octave_idx_type& info) const; |
7076 | 289 ComplexColumnVector lssolve (const ComplexColumnVector& b, |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
290 octave_idx_type& info, |
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
291 octave_idx_type& rank) const; |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
292 ComplexColumnVector lssolve (const ComplexColumnVector& b, |
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
293 octave_idx_type& info, |
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10301
diff
changeset
|
294 octave_idx_type& rank, double& rcon) const; |
458 | 295 |
296 Matrix& operator += (const DiagMatrix& a); | |
297 Matrix& operator -= (const DiagMatrix& a); | |
298 | |
1359 | 299 // unary operations |
458 | 300 |
1359 | 301 // other operations |
458 | 302 |
4017 | 303 boolMatrix all (int dim = -1) const; |
304 boolMatrix any (int dim = -1) const; | |
458 | 305 |
4017 | 306 Matrix cumprod (int dim = -1) const; |
307 Matrix cumsum (int dim = -1) const; | |
308 Matrix prod (int dim = -1) const; | |
309 Matrix sum (int dim = -1) const; | |
310 Matrix sumsq (int dim = -1) const; | |
2385 | 311 Matrix abs (void) const; |
458 | 312 |
7620
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7503
diff
changeset
|
313 Matrix diag (octave_idx_type k = 0) const; |
458 | 314 |
14557
e8e86ae3abbc
make diag (x, m, n) return a proper diagonal matrix object (bug #36099)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
315 DiagMatrix diag (octave_idx_type m, octave_idx_type n) const; |
e8e86ae3abbc
make diag (x, m, n) return a proper diagonal matrix object (bug #36099)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
316 |
458 | 317 ColumnVector row_min (void) const; |
2354 | 318 ColumnVector row_max (void) const; |
458 | 319 |
5275 | 320 ColumnVector row_min (Array<octave_idx_type>& index) const; |
321 ColumnVector row_max (Array<octave_idx_type>& index) const; | |
458 | 322 |
323 RowVector column_min (void) const; | |
2354 | 324 RowVector column_max (void) const; |
458 | 325 |
5275 | 326 RowVector column_min (Array<octave_idx_type>& index) const; |
327 RowVector column_max (Array<octave_idx_type>& index) const; | |
458 | 328 |
1359 | 329 // i/o |
458 | 330 |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
331 friend OCTAVE_API std::ostream& operator << (std::ostream& os, |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
332 const Matrix& a); |
6108 | 333 friend OCTAVE_API std::istream& operator >> (std::istream& is, Matrix& a); |
458 | 334 }; |
335 | |
5508 | 336 // Publish externally used friend functions. |
337 | |
6108 | 338 extern OCTAVE_API Matrix real (const ComplexMatrix& a); |
339 extern OCTAVE_API Matrix imag (const ComplexMatrix& a); | |
5508 | 340 |
341 // column vector by row vector -> matrix operations | |
342 | |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
343 extern OCTAVE_API Matrix operator * (const ColumnVector& a, |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
344 const RowVector& b); |
5508 | 345 |
346 // Other functions. | |
347 | |
6108 | 348 extern OCTAVE_API Matrix Givens (double, double); |
1819 | 349 |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
350 extern OCTAVE_API Matrix Sylvester (const Matrix&, const Matrix&, |
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
351 const Matrix&); |
1959 | 352 |
9665
1dba57e9d08d
use blas_trans_type for xgemm
Jaroslav Hajek <highegg@gmail.com>
parents:
9661
diff
changeset
|
353 extern OCTAVE_API Matrix xgemm (const Matrix& a, const Matrix& b, |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
354 blas_trans_type transa = blas_no_trans, |
9665
1dba57e9d08d
use blas_trans_type for xgemm
Jaroslav Hajek <highegg@gmail.com>
parents:
9661
diff
changeset
|
355 blas_trans_type transb = blas_no_trans); |
7800
5861b95e9879
support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm
Jaroslav Hajek <highegg@gmail.com>
parents:
7789
diff
changeset
|
356 |
6108 | 357 extern OCTAVE_API Matrix operator * (const Matrix& a, const Matrix& b); |
2828 | 358 |
6108 | 359 extern OCTAVE_API Matrix min (double d, const Matrix& m); |
360 extern OCTAVE_API Matrix min (const Matrix& m, double d); | |
361 extern OCTAVE_API Matrix min (const Matrix& a, const Matrix& b); | |
4309 | 362 |
6108 | 363 extern OCTAVE_API Matrix max (double d, const Matrix& m); |
364 extern OCTAVE_API Matrix max (const Matrix& m, double d); | |
365 extern OCTAVE_API Matrix max (const Matrix& a, const Matrix& b); | |
4309 | 366 |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
367 extern OCTAVE_API Matrix linspace (const ColumnVector& x1, |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
368 const ColumnVector& x2, |
9653
e087d7c77ff9
improve linspace in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
369 octave_idx_type n); |
e087d7c77ff9
improve linspace in liboctave
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
370 |
6708 | 371 MS_CMP_OP_DECLS (Matrix, double, OCTAVE_API) |
372 MS_BOOL_OP_DECLS (Matrix, double, OCTAVE_API) | |
2870 | 373 |
6708 | 374 SM_CMP_OP_DECLS (double, Matrix, OCTAVE_API) |
375 SM_BOOL_OP_DECLS (double, Matrix, OCTAVE_API) | |
2870 | 376 |
6708 | 377 MM_CMP_OP_DECLS (Matrix, Matrix, OCTAVE_API) |
378 MM_BOOL_OP_DECLS (Matrix, Matrix, OCTAVE_API) | |
2870 | 379 |
10350
12884915a8e4
merge MArray classes & improve Array interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10312
diff
changeset
|
380 MARRAY_FORWARD_DEFS (MArray, Matrix, double) |
3573 | 381 |
3689 | 382 template <class T> |
383 void read_int (std::istream& is, bool swap_bytes, T& val); | |
384 | |
458 | 385 #endif |