Mercurial > octave
annotate libinterp/corefcn/kron.cc @ 18794:03c2671493f9
maint: Periodic merge of gui-release to default.
author | Rik <rik@octave.org> |
---|---|
date | Mon, 02 Jun 2014 11:17:59 -0700 |
parents | 6a71e5030df5 |
children | 9ac2357f19bc |
rev | line source |
---|---|
3910 | 1 /* |
2 | |
17744
d63878346099
maint: Update copyright notices for release.
John W. Eaton <jwe@octave.org>
parents:
15942
diff
changeset
|
3 Copyright (C) 2002-2013 John W. Eaton |
3910 | 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. | |
3910 | 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/>. | |
3910 | 20 |
21 */ | |
22 | |
3911 | 23 // Author: Paul Kienzle <pkienzle@users.sf.net> |
24 | |
3910 | 25 #ifdef HAVE_CONFIG_H |
26 #include <config.h> | |
27 #endif | |
28 | |
29 #include "dMatrix.h" | |
10461 | 30 #include "fMatrix.h" |
3910 | 31 #include "CMatrix.h" |
10461 | 32 #include "fCMatrix.h" |
33 | |
34 #include "dSparse.h" | |
35 #include "CSparse.h" | |
36 | |
37 #include "dDiagMatrix.h" | |
38 #include "fDiagMatrix.h" | |
39 #include "CDiagMatrix.h" | |
40 #include "fCDiagMatrix.h" | |
41 | |
42 #include "PermMatrix.h" | |
43 | |
44 #include "mx-inlines.cc" | |
4153 | 45 #include "quit.h" |
3910 | 46 |
15039
e753177cde93
maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents:
14854
diff
changeset
|
47 #include "defun.h" |
3910 | 48 #include "error.h" |
49 #include "oct-obj.h" | |
50 | |
10461 | 51 template <class R, class T> |
52 static MArray<T> | |
53 kron (const MArray<R>& a, const MArray<T>& b) | |
54 { | |
55 assert (a.ndims () == 2); | |
56 assert (b.ndims () == 2); | |
57 | |
18100
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
58 octave_idx_type nra = a.rows (); |
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
59 octave_idx_type nrb = b.rows (); |
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
60 octave_idx_type nca = a.cols (); |
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
61 octave_idx_type ncb = b.cols (); |
3910 | 62 |
11570
57632dea2446
attempt better backward compatibility for Array constructors
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
63 MArray<T> c (dim_vector (nra*nrb, nca*ncb)); |
10461 | 64 T *cv = c.fortran_vec (); |
65 | |
66 for (octave_idx_type ja = 0; ja < nca; ja++) | |
67 for (octave_idx_type jb = 0; jb < ncb; jb++) | |
68 for (octave_idx_type ia = 0; ia < nra; ia++) | |
69 { | |
70 octave_quit (); | |
71 mx_inline_mul (nrb, cv, a(ia, ja), b.data () + nrb*jb); | |
72 cv += nrb; | |
73 } | |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7455
diff
changeset
|
74 |
10461 | 75 return c; |
76 } | |
77 | |
78 template <class R, class T> | |
79 static MArray<T> | |
80 kron (const MDiagArray2<R>& a, const MArray<T>& b) | |
81 { | |
82 assert (b.ndims () == 2); | |
83 | |
18100
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
84 octave_idx_type nra = a.rows (); |
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
85 octave_idx_type nrb = b.rows (); |
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
86 octave_idx_type dla = a.diag_length (); |
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
87 octave_idx_type nca = a.cols (); |
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
88 octave_idx_type ncb = b.cols (); |
7789
82be108cc558
First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents:
7455
diff
changeset
|
89 |
14846
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
14556
diff
changeset
|
90 MArray<T> c (dim_vector (nra*nrb, nca*ncb), T ()); |
10461 | 91 |
92 for (octave_idx_type ja = 0; ja < dla; ja++) | |
93 for (octave_idx_type jb = 0; jb < ncb; jb++) | |
94 { | |
95 octave_quit (); | |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
96 mx_inline_mul (nrb, &c.xelem (ja*nrb, ja*ncb + jb), a.dgelem (ja), |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
97 b.data () + nrb*jb); |
10461 | 98 } |
99 | |
100 return c; | |
101 } | |
3910 | 102 |
103 template <class T> | |
10461 | 104 static MSparse<T> |
105 kron (const MSparse<T>& A, const MSparse<T>& B) | |
7455
fe332ce262b5
eliminate spkron.cc; dispatch in kron
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
106 { |
fe332ce262b5
eliminate spkron.cc; dispatch in kron
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
107 octave_idx_type idx = 0; |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11570
diff
changeset
|
108 MSparse<T> C (A.rows () * B.rows (), A.columns () * B.columns (), |
10527
b4d2080b6df7
Replace nzmax by nnz as needed
David Bateman <dbateman@free.fr>
parents:
10461
diff
changeset
|
109 A.nnz () * B.nnz ()); |
7455
fe332ce262b5
eliminate spkron.cc; dispatch in kron
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
110 |
fe332ce262b5
eliminate spkron.cc; dispatch in kron
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
111 C.cidx (0) = 0; |
fe332ce262b5
eliminate spkron.cc; dispatch in kron
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
112 |
fe332ce262b5
eliminate spkron.cc; dispatch in kron
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
113 for (octave_idx_type Aj = 0; Aj < A.columns (); Aj++) |
fe332ce262b5
eliminate spkron.cc; dispatch in kron
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
114 for (octave_idx_type Bj = 0; Bj < B.columns (); Bj++) |
fe332ce262b5
eliminate spkron.cc; dispatch in kron
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
115 { |
10461 | 116 octave_quit (); |
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9209
diff
changeset
|
117 for (octave_idx_type Ai = A.cidx (Aj); Ai < A.cidx (Aj+1); Ai++) |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9209
diff
changeset
|
118 { |
14854
5ae9f0f77635
maint: Use Octave coding conventions for coddling parenthis is DLD-FUNCTIONS directory
Rik <octave@nomad.inbox5.com>
parents:
14846
diff
changeset
|
119 octave_idx_type Ci = A.ridx (Ai) * B.rows (); |
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9209
diff
changeset
|
120 const T v = A.data (Ai); |
7455
fe332ce262b5
eliminate spkron.cc; dispatch in kron
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
121 |
10154
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9209
diff
changeset
|
122 for (octave_idx_type Bi = B.cidx (Bj); Bi < B.cidx (Bj+1); Bi++) |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9209
diff
changeset
|
123 { |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9209
diff
changeset
|
124 C.data (idx) = v * B.data (Bi); |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9209
diff
changeset
|
125 C.ridx (idx++) = Ci + B.ridx (Bi); |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9209
diff
changeset
|
126 } |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9209
diff
changeset
|
127 } |
40dfc0c99116
DLD-FUNCTIONS/*.cc: untabify
John W. Eaton <jwe@octave.org>
parents:
9209
diff
changeset
|
128 C.cidx (Aj * B.columns () + Bj + 1) = idx; |
7455
fe332ce262b5
eliminate spkron.cc; dispatch in kron
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
129 } |
10461 | 130 |
131 return C; | |
7455
fe332ce262b5
eliminate spkron.cc; dispatch in kron
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
132 } |
fe332ce262b5
eliminate spkron.cc; dispatch in kron
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
133 |
10461 | 134 static PermMatrix |
135 kron (const PermMatrix& a, const PermMatrix& b) | |
136 { | |
18100
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
137 octave_idx_type na = a.rows (); |
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
138 octave_idx_type nb = b.rows (); |
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
139 const octave_idx_type *pa = a.data (); |
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
140 const octave_idx_type *pb = b.data (); |
10461 | 141 PermMatrix c(na*nb); // Row permutation. |
142 octave_idx_type *pc = c.fortran_vec (); | |
7455
fe332ce262b5
eliminate spkron.cc; dispatch in kron
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
143 |
18100
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
144 bool cola = a.is_col_perm (); |
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
145 bool colb = b.is_col_perm (); |
10461 | 146 if (cola && colb) |
147 { | |
148 for (octave_idx_type i = 0; i < na; i++) | |
149 for (octave_idx_type j = 0; j < nb; j++) | |
150 pc[pa[i]*nb+pb[j]] = i*nb+j; | |
151 } | |
152 else if (cola) | |
153 { | |
154 for (octave_idx_type i = 0; i < na; i++) | |
155 for (octave_idx_type j = 0; j < nb; j++) | |
156 pc[pa[i]*nb+j] = i*nb+pb[j]; | |
157 } | |
158 else if (colb) | |
159 { | |
160 for (octave_idx_type i = 0; i < na; i++) | |
161 for (octave_idx_type j = 0; j < nb; j++) | |
162 pc[i*nb+pb[j]] = pa[i]*nb+j; | |
163 } | |
164 else | |
165 { | |
166 for (octave_idx_type i = 0; i < na; i++) | |
167 for (octave_idx_type j = 0; j < nb; j++) | |
168 pc[i*nb+j] = pa[i]*nb+pb[j]; | |
169 } | |
170 | |
171 return c; | |
172 } | |
7455
fe332ce262b5
eliminate spkron.cc; dispatch in kron
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
173 |
10461 | 174 template <class MTA, class MTB> |
175 octave_value | |
176 do_kron (const octave_value& a, const octave_value& b) | |
177 { | |
178 MTA am = octave_value_extract<MTA> (a); | |
179 MTB bm = octave_value_extract<MTB> (b); | |
180 return octave_value (kron (am, bm)); | |
181 } | |
182 | |
13748
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
183 octave_value |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
184 dispatch_kron (const octave_value& a, const octave_value& b) |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
185 { |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
186 octave_value retval; |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
187 if (a.is_perm_matrix () && b.is_perm_matrix ()) |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
188 retval = do_kron<PermMatrix, PermMatrix> (a, b); |
15942
75cea615ade4
Check for sparse before diagonal class in kron (bug #38082)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15195
diff
changeset
|
189 else if (a.is_sparse_type () || b.is_sparse_type ()) |
75cea615ade4
Check for sparse before diagonal class in kron (bug #38082)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15195
diff
changeset
|
190 { |
75cea615ade4
Check for sparse before diagonal class in kron (bug #38082)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15195
diff
changeset
|
191 if (a.is_complex_type () || b.is_complex_type ()) |
75cea615ade4
Check for sparse before diagonal class in kron (bug #38082)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15195
diff
changeset
|
192 retval = do_kron<SparseComplexMatrix, SparseComplexMatrix> (a, b); |
75cea615ade4
Check for sparse before diagonal class in kron (bug #38082)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15195
diff
changeset
|
193 else |
75cea615ade4
Check for sparse before diagonal class in kron (bug #38082)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15195
diff
changeset
|
194 retval = do_kron<SparseMatrix, SparseMatrix> (a, b); |
75cea615ade4
Check for sparse before diagonal class in kron (bug #38082)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15195
diff
changeset
|
195 } |
13748
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
196 else if (a.is_diag_matrix ()) |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
197 { |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
198 if (b.is_diag_matrix () && a.rows () == a.columns () |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
199 && b.rows () == b.columns ()) |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
200 { |
14555
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
201 // We have two diagonal matrices, the product of those will be |
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
202 // another diagonal matrix. To do that efficiently, extract |
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
203 // the diagonals as vectors and compute the product. That |
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
204 // will be another vector, which we then use to construct a |
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
205 // diagonal matrix object. Note that this will fail if our |
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
206 // digaonal matrix object is modified to allow the non-zero |
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
207 // values to be stored off of the principal diagonal (i.e., if |
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
208 // diag ([1,2], 3) is modified to return a diagonal matrix |
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
209 // object instead of a full matrix object). |
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
210 |
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
211 octave_value tmp = dispatch_kron (a.diag (), b.diag ()); |
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
212 retval = tmp.diag (); |
13748
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
213 } |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
214 else if (a.is_single_type () || b.is_single_type ()) |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
215 { |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
216 if (a.is_complex_type ()) |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
217 retval = do_kron<FloatComplexDiagMatrix, FloatComplexMatrix> (a, b); |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
218 else if (b.is_complex_type ()) |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
219 retval = do_kron<FloatDiagMatrix, FloatComplexMatrix> (a, b); |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
220 else |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
221 retval = do_kron<FloatDiagMatrix, FloatMatrix> (a, b); |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
222 } |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
223 else |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
224 { |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
225 if (a.is_complex_type ()) |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
226 retval = do_kron<ComplexDiagMatrix, ComplexMatrix> (a, b); |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
227 else if (b.is_complex_type ()) |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
228 retval = do_kron<DiagMatrix, ComplexMatrix> (a, b); |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
229 else |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
230 retval = do_kron<DiagMatrix, Matrix> (a, b); |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
231 } |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
232 } |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
233 else if (a.is_single_type () || b.is_single_type ()) |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
234 { |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
235 if (a.is_complex_type ()) |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
236 retval = do_kron<FloatComplexMatrix, FloatComplexMatrix> (a, b); |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
237 else if (b.is_complex_type ()) |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
238 retval = do_kron<FloatMatrix, FloatComplexMatrix> (a, b); |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
239 else |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
240 retval = do_kron<FloatMatrix, FloatMatrix> (a, b); |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
241 } |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
242 else |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
243 { |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
244 if (a.is_complex_type ()) |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
245 retval = do_kron<ComplexMatrix, ComplexMatrix> (a, b); |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
246 else if (b.is_complex_type ()) |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
247 retval = do_kron<Matrix, ComplexMatrix> (a, b); |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
248 else |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
249 retval = do_kron<Matrix, Matrix> (a, b); |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
250 } |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
251 return retval; |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
252 } |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
253 |
10461 | 254 |
15039
e753177cde93
maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents:
14854
diff
changeset
|
255 DEFUN (kron, args, , "-*- texinfo -*-\n\ |
e753177cde93
maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents:
14854
diff
changeset
|
256 @deftypefn {Built-in Function} {} kron (@var{A}, @var{B})\n\ |
e753177cde93
maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents:
14854
diff
changeset
|
257 @deftypefnx {Built-in Function} {} kron (@var{A1}, @var{A2}, @dots{})\n\ |
13748
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
258 Form the Kronecker product of two or more matrices, defined block by \n\ |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
259 block as\n\ |
3910 | 260 \n\ |
261 @example\n\ | |
14360
97883071e8e4
doc: Correct off-by-1 spacings in all .cc docstrings
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
262 x = [ a(i,j)*b ]\n\ |
3910 | 263 @end example\n\ |
264 \n\ | |
10840 | 265 For example:\n\ |
3910 | 266 \n\ |
267 @example\n\ | |
268 @group\n\ | |
269 kron (1:4, ones (3, 1))\n\ | |
14360
97883071e8e4
doc: Correct off-by-1 spacings in all .cc docstrings
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
270 @result{} 1 2 3 4\n\ |
97883071e8e4
doc: Correct off-by-1 spacings in all .cc docstrings
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
271 1 2 3 4\n\ |
97883071e8e4
doc: Correct off-by-1 spacings in all .cc docstrings
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
272 1 2 3 4\n\ |
3910 | 273 @end group\n\ |
274 @end example\n\ | |
13748
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
275 \n\ |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
276 If there are more than two input arguments @var{A1}, @var{A2}, @dots{}, \n\ |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
277 @var{An} the Kronecker product is computed as\n\ |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
278 \n\ |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
279 @example\n\ |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
280 kron (kron (@var{A1}, @var{A2}), @dots{}, @var{An})\n\ |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
281 @end example\n\ |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
282 \n\ |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
283 @noindent\n\ |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
284 Since the Kronecker product is associative, this is well-defined.\n\ |
3910 | 285 @end deftypefn") |
286 { | |
10461 | 287 octave_value retval; |
3910 | 288 |
289 int nargin = args.length (); | |
290 | |
13748
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
291 if (nargin >= 2) |
3910 | 292 { |
18100
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
293 octave_value a = args(0); |
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
294 octave_value b = args(1); |
13748
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
295 retval = dispatch_kron (a, b); |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
296 for (octave_idx_type i = 2; i < nargin; i++) |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
297 retval = dispatch_kron (retval, args(i)); |
3910 | 298 } |
13748
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
299 else |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
300 print_usage (); |
3910 | 301 |
302 return retval; | |
303 } | |
12790
5ecdb60ddf0f
codesprint: Write two tests for kron.cc
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
304 |
13748
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
305 |
12790
5ecdb60ddf0f
codesprint: Write two tests for kron.cc
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
306 /* |
5ecdb60ddf0f
codesprint: Write two tests for kron.cc
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
307 %!test |
14501
60e5cf354d80
Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions.
Rik <octave@nomad.inbox5.com>
parents:
14360
diff
changeset
|
308 %! x = ones (2); |
60e5cf354d80
Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions.
Rik <octave@nomad.inbox5.com>
parents:
14360
diff
changeset
|
309 %! assert (kron (x, x), ones (4)); |
12790
5ecdb60ddf0f
codesprint: Write two tests for kron.cc
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
310 |
13748
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
311 %!shared x, y, z |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
312 %! x = [1, 2]; |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
313 %! y = [-1, -2]; |
12790
5ecdb60ddf0f
codesprint: Write two tests for kron.cc
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
314 %! z = [1, 2, 3, 4; 1, 2, 3, 4; 1, 2, 3, 4]; |
13748
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
315 %!assert (kron (1:4, ones (3, 1)), z) |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
316 %!assert (kron (x, y, z), kron (kron (x, y), z)) |
77857d6fe074
Allow more than two input arguments for the kron function, plus some cleanup.
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
12790
diff
changeset
|
317 %!assert (kron (x, y, z), kron (x, kron (y, z))) |
12790
5ecdb60ddf0f
codesprint: Write two tests for kron.cc
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
318 |
14555
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
319 %!assert (kron (diag ([1, 2]), diag ([3, 4])), diag ([3, 4, 6, 8])) |
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
320 |
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
321 %% Test for two diag matrices. See the comments above in |
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
322 %% dispatch_kron for this case. |
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
323 %% |
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
324 %!test |
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
325 %! expected = zeros (16, 16); |
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
326 %! expected (1, 11) = 3; |
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
327 %! expected (2, 12) = 4; |
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
328 %! expected (5, 15) = 6; |
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
329 %! expected (6, 16) = 8; |
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
330 %! assert (kron (diag ([1, 2], 2), diag ([3, 4], 2)), expected) |
12790
5ecdb60ddf0f
codesprint: Write two tests for kron.cc
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
331 */ |