Mercurial > octave
annotate libinterp/corefcn/kron.cc @ 21301:40de9f8f23a6
Use '#include "config.h"' rather than <config.h>.
* mk-octave-config-h.sh, mk-opts.pl, Backend.cc, BaseControl.cc,
ButtonControl.cc, Canvas.cc, CheckBoxControl.cc, Container.cc, ContextMenu.cc,
EditControl.cc, Figure.cc, FigureWindow.cc, GLCanvas.cc, KeyMap.cc,
ListBoxControl.cc, Logger.cc, Menu.cc, MouseModeActionGroup.cc, Object.cc,
ObjectFactory.cc, ObjectProxy.cc, Panel.cc, PopupMenuControl.cc,
PushButtonControl.cc, PushTool.cc, QtHandlesUtils.cc, RadioButtonControl.cc,
SliderControl.cc, TextControl.cc, TextEdit.cc, ToggleButtonControl.cc,
ToggleTool.cc, ToolBar.cc, ToolBarButton.cc, __init_qt__.cc,
annotation-dialog.cc, gl-select.cc, module.mk, kpty.cpp, color-picker.cc,
dialog.cc, documentation-dock-widget.cc, files-dock-widget.cc,
find-files-dialog.cc, find-files-model.cc, history-dock-widget.cc,
file-editor-tab.cc, file-editor-tab.h, file-editor.cc, find-dialog.cc,
marker.cc, octave-qscintilla.cc, octave-txt-lexer.cc, main-window.cc,
octave-cmd.cc, octave-dock-widget.cc, octave-gui.cc, octave-interpreter.cc,
octave-qt-link.cc, parser.cc, webinfo.cc, resource-manager.cc,
settings-dialog.cc, shortcut-manager.cc, terminal-dock-widget.cc,
thread-manager.cc, welcome-wizard.cc, workspace-model.cc, workspace-view.cc,
build-env-features.sh, build-env.in.cc, Cell.cc, __contourc__.cc,
__dispatch__.cc, __dsearchn__.cc, __ichol__.cc, __ilu__.cc, __lin_interpn__.cc,
__pchip_deriv__.cc, __qp__.cc, balance.cc, besselj.cc, betainc.cc, bitfcns.cc,
bsxfun.cc, c-file-ptr-stream.cc, cdisplay.c, cellfun.cc, coct-hdf5-types.c,
colloc.cc, comment-list.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc,
debug.cc, defaults.cc, defun.cc, det.cc, dirfns.cc, display.cc, dlmread.cc,
dot.cc, dynamic-ld.cc, eig.cc, ellipj.cc, error.cc, errwarn.cc, event-queue.cc,
fft.cc, fft2.cc, fftn.cc, file-io.cc, filter.cc, find.cc, ft-text-renderer.cc,
gammainc.cc, gcd.cc, getgrent.cc, getpwent.cc, getrusage.cc, givens.cc,
gl-render.cc, gl2ps-print.cc, graphics.cc, gripes.cc, hash.cc, help.cc,
hess.cc, hex2num.cc, hook-fcn.cc, input.cc, inv.cc, jit-ir.cc, jit-typeinfo.cc,
jit-util.cc, kron.cc, load-path.cc, load-save.cc, lookup.cc,
ls-ascii-helper.cc, ls-hdf5.cc, ls-mat-ascii.cc, ls-mat4.cc, ls-mat5.cc,
ls-oct-binary.cc, ls-oct-text.cc, ls-utils.cc, lsode.cc, lu.cc, luinc.cc,
mappers.cc, matrix_type.cc, max.cc, mex.cc, mgorth.cc, nproc.cc,
oct-errno.in.cc, oct-fstrm.cc, oct-hdf5-types.cc, oct-hist.cc, oct-iostrm.cc,
oct-lvalue.cc, oct-map.cc, oct-prcstrm.cc, oct-procbuf.cc, oct-stream.cc,
oct-strstrm.cc, oct-tex-lexer.in.ll, oct-tex-parser.in.yy, octave-link.cc,
ordschur.cc, pager.cc, pinv.cc, pr-output.cc, procstream.cc, profiler.cc,
psi.cc, pt-jit.cc, quad.cc, quadcc.cc, qz.cc, rand.cc, rcond.cc, regexp.cc,
schur.cc, sighandlers.cc, siglist.c, sparse-xdiv.cc, sparse-xpow.cc, sparse.cc,
spparms.cc, sqrtm.cc, str2double.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc,
sylvester.cc, symtab.cc, syscalls.cc, sysdep.cc, text-renderer.cc, time.cc,
toplev.cc, tril.cc, tsearch.cc, txt-eng.cc, typecast.cc, urlwrite.cc, utils.cc,
variables.cc, xdiv.cc, xgl2ps.c, xnorm.cc, xpow.cc, zfstream.cc,
__delaunayn__.cc, __eigs__.cc, __fltk_uigetfile__.cc, __glpk__.cc,
__init_fltk__.cc, __init_gnuplot__.cc, __magick_read__.cc, __osmesa_print__.cc,
__voronoi__.cc, amd.cc, audiodevinfo.cc, audioread.cc, ccolamd.cc, chol.cc,
colamd.cc, convhulln.cc, dmperm.cc, fftw.cc, qr.cc, symbfact.cc, symrcm.cc,
mkbuiltins, mkops, ov-base-diag.cc, ov-base-int.cc, ov-base-mat.cc,
ov-base-scalar.cc, ov-base-sparse.cc, ov-base.cc, ov-bool-mat.cc,
ov-bool-sparse.cc, ov-bool.cc, ov-builtin.cc, ov-cell.cc, ov-ch-mat.cc,
ov-class.cc, ov-classdef.cc, ov-colon.cc, ov-complex.cc, ov-cs-list.cc,
ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-dld-fcn.cc, ov-fcn-handle.cc,
ov-fcn-inline.cc, ov-fcn.cc, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-diag.cc,
ov-flt-cx-mat.cc, ov-flt-re-diag.cc, ov-flt-re-mat.cc, ov-int16.cc,
ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-java.cc, ov-lazy-idx.cc,
ov-mex-fcn.cc, ov-null-mat.cc, ov-oncleanup.cc, ov-perm.cc, ov-range.cc,
ov-re-diag.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc,
ov-struct.cc, ov-typeinfo.cc, ov-uint16.cc, ov-uint32.cc, ov-uint64.cc,
ov-uint8.cc, ov-usr-fcn.cc, ov.cc, ovl.cc, octave.cc, op-b-b.cc, op-b-bm.cc,
op-b-sbm.cc, op-bm-b.cc, op-bm-bm.cc, op-bm-sbm.cc, op-cdm-cdm.cc, op-cell.cc,
op-chm.cc, op-class.cc, op-cm-cm.cc, op-cm-cs.cc, op-cm-m.cc, op-cm-s.cc,
op-cm-scm.cc, op-cm-sm.cc, op-cs-cm.cc, op-cs-cs.cc, op-cs-m.cc, op-cs-s.cc,
op-cs-scm.cc, op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc,
op-dm-template.cc, op-dms-template.cc, op-double-conv.cc, op-fcdm-fcdm.cc,
op-fcdm-fdm.cc, op-fcm-fcm.cc, op-fcm-fcs.cc, op-fcm-fm.cc, op-fcm-fs.cc,
op-fcn.cc, op-fcs-fcm.cc, op-fcs-fcs.cc, op-fcs-fm.cc, op-fcs-fs.cc,
op-fdm-fdm.cc, op-float-conv.cc, op-fm-fcm.cc, op-fm-fcs.cc, op-fm-fm.cc,
op-fm-fs.cc, op-fs-fcm.cc, op-fs-fcs.cc, op-fs-fm.cc, op-fs-fs.cc,
op-i16-i16.cc, op-i32-i32.cc, op-i64-i64.cc, op-i8-i8.cc, op-int-concat.cc,
op-int-conv.cc, op-m-cm.cc, op-m-cs.cc, op-m-m.cc, op-m-s.cc, op-m-scm.cc,
op-m-sm.cc, op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-pm-template.cc,
op-range.cc, op-s-cm.cc, op-s-cs.cc, op-s-m.cc, op-s-s.cc, op-s-scm.cc,
op-s-sm.cc, op-sbm-b.cc, op-sbm-bm.cc, op-sbm-sbm.cc, op-scm-cm.cc,
op-scm-cs.cc, op-scm-m.cc, op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc,
op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc, op-sm-s.cc, op-sm-scm.cc, op-sm-sm.cc,
op-str-m.cc, op-str-s.cc, op-str-str.cc, op-struct.cc, op-ui16-ui16.cc,
op-ui32-ui32.cc, op-ui64-ui64.cc, op-ui8-ui8.cc, lex.ll, oct-parse.in.yy,
pt-arg-list.cc, pt-array-list.cc, pt-assign.cc, pt-binop.cc, pt-bp.cc,
pt-cbinop.cc, pt-cell.cc, pt-check.cc, pt-classdef.cc, pt-cmd.cc, pt-colon.cc,
pt-const.cc, pt-decl.cc, pt-eval.cc, pt-except.cc, pt-exp.cc, pt-fcn-handle.cc,
pt-funcall.cc, pt-id.cc, pt-idx.cc, pt-jump.cc, pt-loop.cc, pt-mat.cc,
pt-misc.cc, pt-pr-code.cc, pt-select.cc, pt-stmt.cc, pt-unop.cc, pt.cc,
token.cc, Array-jit.cc, Array-os.cc, Array-sym.cc, Array-tc.cc, version.cc,
Array-C.cc, Array-b.cc, Array-ch.cc, Array-d.cc, Array-f.cc, Array-fC.cc,
Array-i.cc, Array-idx-vec.cc, Array-s.cc, Array-str.cc, Array-util.cc,
Array-voidp.cc, Array.cc, CColVector.cc, CDiagMatrix.cc, CMatrix.cc,
CNDArray.cc, CRowVector.cc, CSparse.cc, DiagArray2.cc, MArray-C.cc,
MArray-d.cc, MArray-f.cc, MArray-fC.cc, MArray-i.cc, MArray-s.cc, MArray.cc,
MDiagArray2.cc, MSparse-C.cc, MSparse-d.cc, MatrixType.cc, PermMatrix.cc,
Range.cc, Sparse-C.cc, Sparse-b.cc, Sparse-d.cc, Sparse.cc, boolMatrix.cc,
boolNDArray.cc, boolSparse.cc, chMatrix.cc, chNDArray.cc, dColVector.cc,
dDiagMatrix.cc, dMatrix.cc, dNDArray.cc, dRowVector.cc, dSparse.cc,
dim-vector.cc, fCColVector.cc, fCDiagMatrix.cc, fCMatrix.cc, fCNDArray.cc,
fCRowVector.cc, fColVector.cc, fDiagMatrix.cc, fMatrix.cc, fNDArray.cc,
fRowVector.cc, idx-vector.cc, int16NDArray.cc, int32NDArray.cc,
int64NDArray.cc, int8NDArray.cc, intNDArray.cc, uint16NDArray.cc,
uint32NDArray.cc, uint64NDArray.cc, uint8NDArray.cc, blaswrap.c, cquit.c,
f77-extern.cc, f77-fcn.c, lo-error.c, quit.cc, CollocWt.cc, DASPK.cc, DASRT.cc,
DASSL.cc, EIG.cc, LSODE.cc, ODES.cc, Quad.cc, aepbalance.cc, chol.cc,
eigs-base.cc, fEIG.cc, gepbalance.cc, hess.cc, lo-mappers.cc, lo-specfun.cc,
lu.cc, oct-convn.cc, oct-fftw.cc, oct-norm.cc, oct-rand.cc, oct-spparms.cc,
qr.cc, qrp.cc, randgamma.c, randmtzig.c, randpoisson.c, schur.cc,
sparse-chol.cc, sparse-dmsolve.cc, sparse-lu.cc, sparse-qr.cc, svd.cc,
mk-ops.awk, dir-ops.cc, file-ops.cc, file-stat.cc, lo-sysdep.cc, mach-info.cc,
oct-env.cc, oct-group.cc, oct-passwd.cc, oct-syscalls.cc, oct-time.cc,
oct-uname.cc, cmd-edit.cc, cmd-hist.cc, data-conv.cc, f2c-main.c,
glob-match.cc, kpse.cc, lo-array-errwarn.cc, lo-array-gripes.cc, lo-cutils.c,
lo-ieee.cc, lo-regexp.cc, lo-utils.cc, oct-base64.cc, oct-glob.cc,
oct-inttypes.cc, oct-locbuf.cc, oct-mutex.cc, oct-rl-edit.c, oct-rl-hist.c,
oct-shlib.cc, oct-sort.cc, pathsearch.cc, singleton-cleanup.cc, sparse-sort.cc,
sparse-util.cc, str-vec.cc, unwind-prot.cc, url-transfer.cc,
display-available.c, main-cli.cc, main-gui.cc, main.in.cc, mkoctfile.in.cc,
octave-config.in.cc:
Use '#include "config.h"' rather than <config.h>.
author | Rik <rik@octave.org> |
---|---|
date | Thu, 18 Feb 2016 13:34:50 -0800 |
parents | fcac5dbbf9ed |
children | ecce63c99c3f |
rev | line source |
---|---|
3910 | 1 /* |
2 | |
19697
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
19341
diff
changeset
|
3 Copyright (C) 2002-2015 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 |
21301
40de9f8f23a6
Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents:
21200
diff
changeset
|
26 # include "config.h" |
3910 | 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" |
20940
48b2ad5ee801
maint: Rename oct-obj.[cc|h] to ovl.[cc|h] for clarity.
Rik <rik@octave.org>
parents:
20939
diff
changeset
|
49 #include "ovl.h" |
3910 | 50 |
21139
538b57866b90
consistently use "typename" intead of "class" in template declarations
John W. Eaton <jwe@octave.org>
parents:
21127
diff
changeset
|
51 template <typename R, typename T> |
10461 | 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 | |
21139
538b57866b90
consistently use "typename" intead of "class" in template declarations
John W. Eaton <jwe@octave.org>
parents:
21127
diff
changeset
|
78 template <typename R, typename T> |
10461 | 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 |
21139
538b57866b90
consistently use "typename" intead of "class" in template declarations
John W. Eaton <jwe@octave.org>
parents:
21127
diff
changeset
|
103 template <typename 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 (); |
18849
aa9ca67f09fb
make all permutation matrices column permutations (bug #42418)
David Spies <dnspies@gmail.com>
parents:
18812
diff
changeset
|
139 const Array<octave_idx_type>& pa = a.col_perm_vec (); |
aa9ca67f09fb
make all permutation matrices column permutations (bug #42418)
David Spies <dnspies@gmail.com>
parents:
18812
diff
changeset
|
140 const Array<octave_idx_type>& pb = b.col_perm_vec (); |
19341
718aaf1e84f7
kron.cc: Use column vector in undeprecated Array constructor (cset 1f4455ff2329).
Rik <rik@octave.org>
parents:
19330
diff
changeset
|
141 Array<octave_idx_type> res_perm (dim_vector (na * nb, 1)); |
18849
aa9ca67f09fb
make all permutation matrices column permutations (bug #42418)
David Spies <dnspies@gmail.com>
parents:
18812
diff
changeset
|
142 octave_idx_type rescol = 0; |
aa9ca67f09fb
make all permutation matrices column permutations (bug #42418)
David Spies <dnspies@gmail.com>
parents:
18812
diff
changeset
|
143 for (octave_idx_type i = 0; i < na; i++) |
10461 | 144 { |
18849
aa9ca67f09fb
make all permutation matrices column permutations (bug #42418)
David Spies <dnspies@gmail.com>
parents:
18812
diff
changeset
|
145 octave_idx_type a_add = pa(i) * nb; |
aa9ca67f09fb
make all permutation matrices column permutations (bug #42418)
David Spies <dnspies@gmail.com>
parents:
18812
diff
changeset
|
146 for (octave_idx_type j = 0; j < nb; j++) |
aa9ca67f09fb
make all permutation matrices column permutations (bug #42418)
David Spies <dnspies@gmail.com>
parents:
18812
diff
changeset
|
147 res_perm.xelem (rescol++) = a_add + pb(j); |
10461 | 148 } |
149 | |
18849
aa9ca67f09fb
make all permutation matrices column permutations (bug #42418)
David Spies <dnspies@gmail.com>
parents:
18812
diff
changeset
|
150 return PermMatrix (res_perm, true); |
10461 | 151 } |
7455
fe332ce262b5
eliminate spkron.cc; dispatch in kron
David Bateman <dbateman@free.fr>
parents:
7017
diff
changeset
|
152 |
21139
538b57866b90
consistently use "typename" intead of "class" in template declarations
John W. Eaton <jwe@octave.org>
parents:
21127
diff
changeset
|
153 template <typename MTA, typename MTB> |
10461 | 154 octave_value |
155 do_kron (const octave_value& a, const octave_value& b) | |
156 { | |
157 MTA am = octave_value_extract<MTA> (a); | |
158 MTB bm = octave_value_extract<MTB> (b); | |
21127
df7891224709
maint: Use "return ovl (...)" in DEFUN macros.
Rik <rik@octave.org>
parents:
20940
diff
changeset
|
159 |
10461 | 160 return octave_value (kron (am, bm)); |
161 } | |
162 | |
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
|
163 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
|
164 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
|
165 { |
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
|
166 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
|
167 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
|
168 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
|
169 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
|
170 { |
75cea615ade4
Check for sparse before diagonal class in kron (bug #38082)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15195
diff
changeset
|
171 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
|
172 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
|
173 else |
75cea615ade4
Check for sparse before diagonal class in kron (bug #38082)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
15195
diff
changeset
|
174 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
|
175 } |
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
|
176 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
|
177 { |
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
|
178 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
|
179 && 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
|
180 { |
14555
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
181 // 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
|
182 // 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
|
183 // 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
|
184 // 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
|
185 // diagonal matrix object. Note that this will fail if our |
18812
9ac2357f19bc
doc: Replace "non-zero" with "nonzero" to match existing usage.
Rik <rik@octave.org>
parents:
18100
diff
changeset
|
186 // digaonal matrix object is modified to allow the nonzero |
14555
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
187 // 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
|
188 // 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
|
189 // 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
|
190 |
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
191 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
|
192 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
|
193 } |
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
|
194 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
|
195 { |
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 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
|
197 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
|
198 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
|
199 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
|
200 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
|
201 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
|
202 } |
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
|
203 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
|
204 { |
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
|
205 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
|
206 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
|
207 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
|
208 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
|
209 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
|
210 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
|
211 } |
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
|
212 } |
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 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
|
214 { |
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 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
|
216 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
|
217 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
|
218 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
|
219 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
|
220 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
|
221 } |
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 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
|
223 { |
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 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
|
225 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
|
226 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
|
227 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
|
228 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
|
229 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
|
230 } |
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 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
|
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 |
10461 | 234 |
15039
e753177cde93
maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents:
14854
diff
changeset
|
235 DEFUN (kron, args, , "-*- texinfo -*-\n\ |
20853
1142cf6abc0d
2015 Code Sprint: remove class of function from docstring for all C++ files.
Rik <rik@octave.org>
parents:
20801
diff
changeset
|
236 @deftypefn {} {} kron (@var{A}, @var{B})\n\ |
1142cf6abc0d
2015 Code Sprint: remove class of function from docstring for all C++ files.
Rik <rik@octave.org>
parents:
20801
diff
changeset
|
237 @deftypefnx {} {} kron (@var{A1}, @var{A2}, @dots{})\n\ |
20172
4f45eaf83908
doc: Update more docstrings to have one sentence summary as first line.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
238 Form the Kronecker product of two or more matrices.\n\ |
4f45eaf83908
doc: Update more docstrings to have one sentence summary as first line.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
239 \n\ |
4f45eaf83908
doc: Update more docstrings to have one sentence summary as first line.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
240 This is defined block by block as\n\ |
3910 | 241 \n\ |
242 @example\n\ | |
14360
97883071e8e4
doc: Correct off-by-1 spacings in all .cc docstrings
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
243 x = [ a(i,j)*b ]\n\ |
3910 | 244 @end example\n\ |
245 \n\ | |
10840 | 246 For example:\n\ |
3910 | 247 \n\ |
248 @example\n\ | |
249 @group\n\ | |
250 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
|
251 @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
|
252 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
|
253 1 2 3 4\n\ |
3910 | 254 @end group\n\ |
255 @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
|
256 \n\ |
20172
4f45eaf83908
doc: Update more docstrings to have one sentence summary as first line.
Rik <rik@octave.org>
parents:
19697
diff
changeset
|
257 If there are more than two input arguments @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 @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
|
259 \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
|
260 @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
|
261 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
|
262 @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
|
263 \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
|
264 @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
|
265 Since the Kronecker product is associative, this is well-defined.\n\ |
3910 | 266 @end deftypefn") |
267 { | |
268 int nargin = args.length (); | |
269 | |
20801
a542a9bf177e
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20172
diff
changeset
|
270 if (nargin < 2) |
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
|
271 print_usage (); |
3910 | 272 |
20939
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
273 octave_value retval; |
b17fda023ca6
maint: Use new C++ archetype in more files.
Rik <rik@octave.org>
parents:
20853
diff
changeset
|
274 |
20801
a542a9bf177e
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20172
diff
changeset
|
275 octave_value a = args(0); |
a542a9bf177e
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20172
diff
changeset
|
276 octave_value b = args(1); |
a542a9bf177e
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20172
diff
changeset
|
277 |
a542a9bf177e
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20172
diff
changeset
|
278 retval = dispatch_kron (a, b); |
a542a9bf177e
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20172
diff
changeset
|
279 |
a542a9bf177e
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20172
diff
changeset
|
280 for (octave_idx_type i = 2; i < nargin; i++) |
a542a9bf177e
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20172
diff
changeset
|
281 retval = dispatch_kron (retval, args(i)); |
a542a9bf177e
eliminate return statements after calls to print_usage
John W. Eaton <jwe@octave.org>
parents:
20172
diff
changeset
|
282 |
3910 | 283 return retval; |
284 } | |
12790
5ecdb60ddf0f
codesprint: Write two tests for kron.cc
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
285 |
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
|
286 |
12790
5ecdb60ddf0f
codesprint: Write two tests for kron.cc
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
287 /* |
5ecdb60ddf0f
codesprint: Write two tests for kron.cc
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
288 %!test |
14501
60e5cf354d80
Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions.
Rik <octave@nomad.inbox5.com>
parents:
14360
diff
changeset
|
289 %! x = ones (2); |
60e5cf354d80
Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions.
Rik <octave@nomad.inbox5.com>
parents:
14360
diff
changeset
|
290 %! 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
|
291 |
19134
38c54d45d05f
kron.cc: codesprint: add more kron tests
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
18849
diff
changeset
|
292 %!shared x, y, z, p1, p2, d1, d2 |
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
|
293 %! 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
|
294 %! y = [-1, -2]; |
12790
5ecdb60ddf0f
codesprint: Write two tests for kron.cc
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
295 %! z = [1, 2, 3, 4; 1, 2, 3, 4; 1, 2, 3, 4]; |
19134
38c54d45d05f
kron.cc: codesprint: add more kron tests
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
18849
diff
changeset
|
296 %! p1 = eye (3)([2, 3, 1], :); ## Permutation matrix |
38c54d45d05f
kron.cc: codesprint: add more kron tests
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
18849
diff
changeset
|
297 %! p2 = [0 1 0; 0 0 1; 1 0 0]; ## Non-permutation equivalent |
38c54d45d05f
kron.cc: codesprint: add more kron tests
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
18849
diff
changeset
|
298 %! d1 = diag ([1 2 3]); ## Diag type matrix |
38c54d45d05f
kron.cc: codesprint: add more kron tests
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
18849
diff
changeset
|
299 %! d2 = [1 0 0; 0 2 0; 0 0 3]; ## Non-diag equivalent |
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
|
300 %!assert (kron (1:4, ones (3, 1)), z) |
19134
38c54d45d05f
kron.cc: codesprint: add more kron tests
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
18849
diff
changeset
|
301 %!assert (kron (single (1:4), ones (3, 1)), single (z)) |
38c54d45d05f
kron.cc: codesprint: add more kron tests
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
18849
diff
changeset
|
302 %!assert (kron (sparse (1:4), ones (3, 1)), sparse (z)) |
38c54d45d05f
kron.cc: codesprint: add more kron tests
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
18849
diff
changeset
|
303 %!assert (kron (complex (1:4), ones (3, 1)), z) |
38c54d45d05f
kron.cc: codesprint: add more kron tests
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
18849
diff
changeset
|
304 %!assert (kron (complex (single(1:4)), ones (3, 1)), single(z)) |
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 %!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
|
306 %!assert (kron (x, y, z), kron (x, kron (y, z))) |
19134
38c54d45d05f
kron.cc: codesprint: add more kron tests
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
18849
diff
changeset
|
307 %!assert (kron (p1, p1), kron (p2, p2)) |
38c54d45d05f
kron.cc: codesprint: add more kron tests
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
18849
diff
changeset
|
308 %!assert (kron (p1, p2), kron (p2, p1)) |
38c54d45d05f
kron.cc: codesprint: add more kron tests
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
18849
diff
changeset
|
309 %!assert (kron (d1, d1), kron (d2, d2)) |
38c54d45d05f
kron.cc: codesprint: add more kron tests
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
18849
diff
changeset
|
310 %!assert (kron (d1, d2), kron (d2, d1)) |
38c54d45d05f
kron.cc: codesprint: add more kron tests
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
18849
diff
changeset
|
311 |
12790
5ecdb60ddf0f
codesprint: Write two tests for kron.cc
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
11586
diff
changeset
|
312 |
14555
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
313 %!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
|
314 |
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
315 %% 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
|
316 %% 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
|
317 %% |
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
318 %!test |
6eabd81604b5
allow kron to work for two diag matrix arguments (bug #35647)
John W. Eaton <jwe@octave.org>
parents:
14138
diff
changeset
|
319 %! 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
|
320 %! 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
|
321 %! 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
|
322 %! 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
|
323 %! 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
|
324 %! 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
|
325 */ |