Mercurial > octave

annotate liboctave/numeric/oct-convn.h @ 31605:e88a07dec498 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Use macros to begin/end C++ namespaces. * oct-conf-post-public.in.h: Define two macros (OCTAVE_BEGIN_NAMESPACE, OCTAVE_END_NAMESPACE) that can be used to start/end a namespace. * mk-opts.pl, build-env.h, build-env.in.cc, __betainc__.cc, __contourc__.cc, __dsearchn__.cc, __eigs__.cc, __expint__.cc, __ftp__.cc, __gammainc__.cc, __ichol__.cc, __ilu__.cc, __isprimelarge__.cc, __lin_interpn__.cc, __magick_read__.cc, __pchip_deriv__.cc, __qp__.cc, amd.cc, auto-shlib.cc, auto-shlib.h, balance.cc, base-text-renderer.cc, base-text-renderer.h, besselj.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, colloc.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, data.h, debug.cc, defaults.cc, defaults.h, defun-int.h, defun.cc, det.cc, dirfns.cc, display.cc, display.h, dlmread.cc, dmperm.cc, dot.cc, dynamic-ld.cc, dynamic-ld.h, eig.cc, ellipj.cc, environment.cc, environment.h, error.cc, error.h, errwarn.h, event-manager.cc, event-manager.h, event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, fft.cc, fft2.cc, fftn.cc, file-io.cc, filter.cc, find.cc, ft-text-renderer.cc, ft-text-renderer.h, gcd.cc, getgrent.cc, getpwent.cc, getrusage.cc, givens.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, gl2ps-print.h, graphics-toolkit.cc, graphics-toolkit.h, graphics.cc, graphics.in.h, gsvd.cc, gtk-manager.cc, gtk-manager.h, hash.cc, help.cc, help.h, hess.cc, hex2num.cc, hook-fcn.cc, hook-fcn.h, input.cc, input.h, interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h, inv.cc, jsondecode.cc, jsonencode.cc, kron.cc, latex-text-renderer.cc, latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h, lookup.cc, ls-ascii-helper.cc, ls-ascii-helper.h, ls-oct-text.cc, ls-utils.cc, ls-utils.h, lsode.cc, lu.cc, mappers.cc, matrix_type.cc, max.cc, mex-private.h, mex.cc, mgorth.cc, nproc.cc, oct-fstrm.cc, oct-fstrm.h, oct-hdf5-types.cc, oct-hdf5-types.h, oct-hist.cc, oct-hist.h, oct-iostrm.cc, oct-iostrm.h, oct-opengl.h, oct-prcstrm.cc, oct-prcstrm.h, oct-procbuf.cc, oct-procbuf.h, oct-process.cc, oct-process.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.cc, oct-strstrm.h, oct-tex-lexer.in.ll, oct-tex-parser.yy, ordqz.cc, ordschur.cc, pager.cc, pager.h, pinv.cc, pow2.cc, pr-flt-fmt.cc, pr-output.cc, procstream.cc, procstream.h, psi.cc, qr.cc, quad.cc, quadcc.cc, qz.cc, rand.cc, rcond.cc, regexp.cc, schur.cc, settings.cc, settings.h, sighandlers.cc, sighandlers.h, sparse-xdiv.cc, sparse-xdiv.h, sparse-xpow.cc, sparse-xpow.h, sparse.cc, spparms.cc, sqrtm.cc, stack-frame.cc, stack-frame.h, stream-euler.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc, sylvester.cc, symbfact.cc, syminfo.cc, syminfo.h, symrcm.cc, symrec.cc, symrec.h, symscope.cc, symscope.h, symtab.cc, symtab.h, syscalls.cc, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h, text-renderer.cc, text-renderer.h, time.cc, toplev.cc, tril.cc, tsearch.cc, typecast.cc, url-handle-manager.cc, url-handle-manager.h, urlwrite.cc, utils.cc, utils.h, variables.cc, variables.h, xdiv.cc, xdiv.h, xnorm.cc, xnorm.h, xpow.cc, xpow.h, __delaunayn__.cc, __fltk_uigetfile__.cc, __glpk__.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audiodevinfo.cc, audioread.cc, convhulln.cc, fftw.cc, gzip.cc, mk-build-env-features.sh, mk-builtins.pl, cdef-class.cc, cdef-class.h, cdef-fwd.h, cdef-manager.cc, cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h, cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h, cdef-utils.cc, cdef-utils.h, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-builtin.h, ov-cell.cc, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-complex.cc, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.h, ov-java.cc, ov-java.h, ov-mex-fcn.h, ov-null-mat.cc, ov-oncleanup.cc, ov-struct.cc, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, octave.cc, octave.h, mk-ops.sh, 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-fcdm-fcdm.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-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-m-cm.cc, op-m-cs.cc, op-m-m.cc, op-m-s.cc, op-m-scm.cc, op-m-sm.cc, op-mi.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, ops.h, anon-fcn-validator.cc, anon-fcn-validator.h, bp-table.cc, bp-table.h, comment-list.cc, comment-list.h, filepos.h, lex.h, lex.ll, oct-lvalue.cc, oct-lvalue.h, oct-parse.yy, parse.h, profiler.cc, profiler.h, pt-anon-scopes.cc, pt-anon-scopes.h, pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h, pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-bp.cc, pt-bp.h, pt-cbinop.cc, pt-cbinop.h, pt-cell.cc, pt-cell.h, pt-check.cc, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h, pt-colon.cc, pt-colon.h, pt-const.cc, pt-const.h, pt-decl.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.cc, pt-mat.h, pt-misc.cc, pt-misc.h, pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h, pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h, pt-vm-eval.cc, pt-walk.cc, pt-walk.h, pt.cc, pt.h, token.cc, token.h, Range.cc, Range.h, idx-vector.cc, idx-vector.h, range-fwd.h, CollocWt.cc, CollocWt.h, aepbalance.cc, aepbalance.h, chol.cc, chol.h, gepbalance.cc, gepbalance.h, gsvd.cc, gsvd.h, hess.cc, hess.h, lo-mappers.cc, lo-mappers.h, lo-specfun.cc, lo-specfun.h, lu.cc, lu.h, oct-convn.cc, oct-convn.h, oct-fftw.cc, oct-fftw.h, oct-norm.cc, oct-norm.h, oct-rand.cc, oct-rand.h, oct-spparms.cc, oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randgamma.cc, randgamma.h, randmtzig.cc, randmtzig.h, randpoisson.cc, randpoisson.h, schur.cc, schur.h, sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc, sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h, file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h, lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h, oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc, oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h, action-container.cc, action-container.h, base-list.h, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, f77-fcn.h, file-info.cc, file-info.h, lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.h, lo-regexp.cc, lo-regexp.h, lo-utils.cc, lo-utils.h, oct-base64.cc, oct-base64.h, oct-glob.cc, oct-glob.h, oct-inttypes.h, oct-mutex.cc, oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sparse.cc, oct-sparse.h, oct-string.h, octave-preserve-stream-state.h, pathsearch.cc, pathsearch.h, quit.cc, quit.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc, url-transfer.h : Use new macros to begin/end C++ namespaces.
author Rik <rik@octave.org>
date Thu, 01 Dec 2022 14:23:45 -0800
parents 796f54d4ddbf
children dfa5d9c3ae72 aac27ad79be6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
27923
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
2 //
30564
796f54d4ddbf update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents: 30508
diff changeset
3 // Copyright (C) 2009-2022 The Octave Project Developers
27923
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
4 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
7 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
9 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
14 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
19 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
23 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
24 ////////////////////////////////////////////////////////////////////////
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
25
20791
f7084eae3318 maint: Use Octave coding conventions for #if statements.
Rik <rik@octave.org>
parents: 19697
diff changeset
26 #if ! defined (octave_oct_convn_h)
17822
ebb3ef964372 maint: Use common #define syntax "octave_filename_h" in h_files.
Rik <rik@octave.org>
parents: 17744
diff changeset
27 #define octave_oct_convn_h 1
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
28
21244
1473547f50f5 include octave-config.h in public header files
John W. Eaton <jwe@octave.org>
parents: 20791
diff changeset
29 #include "octave-config.h"
1473547f50f5 include octave-config.h in public header files
John W. Eaton <jwe@octave.org>
parents: 20791
diff changeset
30
30508
6f07492c9c20 Provide header file with forward declarations of matrix types (bug #59820).
Markus Mützel <markus.muetzel@gmx.de>
parents: 30394
diff changeset
31 #include "mx-fwd.h"
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
32
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
33 // The remaining includes can be removed when the global enum
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
34 // declaration, the convert_enum function, and the deprecated functions
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
35 // at the end of this file are removed.
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
36
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
37 #include <cstdlib>
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
38 #include "dMatrix.h"
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
39 #include "dNDArray.h"
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
40 #include "CMatrix.h"
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
41 #include "CNDArray.h"
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
42 #include "fMatrix.h"
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
43 #include "fNDArray.h"
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
44 #include "fCMatrix.h"
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
45 #include "fCNDArray.h"
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
46
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
47 // FIXME: Is there any sane way to move a global enum to a namespace and
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
48 // tag the global one as deprecated when it is used as a parameter in
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
49 // public functions that also need to be tagged as deprecated?
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
50
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
51 enum convn_type
30394
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release.
Rik <rik@octave.org>
parents: 29954
diff changeset
52 {
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release.
Rik <rik@octave.org>
parents: 29954
diff changeset
53 convn_full,
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release.
Rik <rik@octave.org>
parents: 29954
diff changeset
54 convn_same,
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release.
Rik <rik@octave.org>
parents: 29954
diff changeset
55 convn_valid
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release.
Rik <rik@octave.org>
parents: 29954
diff changeset
56 };
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release.
Rik <rik@octave.org>
parents: 29954
diff changeset
57
31605
e88a07dec498 maint: Use macros to begin/end C++ namespaces.
Rik <rik@octave.org>
parents: 30564
diff changeset
58 OCTAVE_BEGIN_NAMESPACE(octave)
e88a07dec498 maint: Use macros to begin/end C++ namespaces.
Rik <rik@octave.org>
parents: 30564
diff changeset
59
30394
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release.
Rik <rik@octave.org>
parents: 29954
diff changeset
60 enum convn_type
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
61 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
62 convn_full,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
63 convn_same,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
64 convn_valid
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
65 };
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
66
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
67 // double real X double real
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
68
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
69 extern OCTAVE_API NDArray
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
70 convn (const NDArray& a, const NDArray& b, convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
71
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
72 extern OCTAVE_API Matrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
73 convn (const Matrix& a, const Matrix& b, convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
74
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
75 extern OCTAVE_API Matrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
76 convn (const Matrix& a, const ColumnVector& c, const RowVector& r,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
77 convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
78
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
79 // double complex X double real
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
80
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
81 extern OCTAVE_API ComplexNDArray
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
82 convn (const ComplexNDArray& a, const NDArray& b, convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
83
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
84 extern OCTAVE_API ComplexMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
85 convn (const ComplexMatrix& a, const Matrix& b, convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
86
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
87 extern OCTAVE_API ComplexMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
88 convn (const ComplexMatrix& a, const ColumnVector& c, const RowVector& r,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
89 convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
90
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
91 // double complex X double complex
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
92
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
93 extern OCTAVE_API ComplexNDArray
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
94 convn (const ComplexNDArray& a, const ComplexNDArray& b, convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
95
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
96 extern OCTAVE_API ComplexMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
97 convn (const ComplexMatrix& a, const ComplexMatrix& b, convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
98
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
99 extern OCTAVE_API ComplexMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
100 convn (const ComplexMatrix& a, const ComplexColumnVector& c,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
101 const ComplexRowVector& r, convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
102
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
103 // float real X float real
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
104
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
105 extern OCTAVE_API FloatNDArray
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
106 convn (const FloatNDArray& a, const FloatNDArray& b, convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
107
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
108 extern OCTAVE_API FloatMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
109 convn (const FloatMatrix& a, const FloatMatrix& b, convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
110
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
111 extern OCTAVE_API FloatMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
112 convn (const FloatMatrix& a, const FloatColumnVector& c,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
113 const FloatRowVector& r, convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
114
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
115 // float complex X float real
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
116
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
117 extern OCTAVE_API FloatComplexNDArray
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
118 convn (const FloatComplexNDArray& a, const FloatNDArray& b, convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
119
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
120 extern OCTAVE_API FloatComplexMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
121 convn (const FloatComplexMatrix& a, const FloatMatrix& b, convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
122
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
123 extern OCTAVE_API FloatComplexMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
124 convn (const FloatComplexMatrix& a, const FloatColumnVector& c,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
125 const FloatRowVector& r, convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
126
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
127 // float complex X float complex
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
128
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
129 extern OCTAVE_API FloatComplexNDArray
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
130 convn (const FloatComplexNDArray& a, const FloatComplexNDArray& b,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
131 convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
132
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
133 extern OCTAVE_API FloatComplexMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
134 convn (const FloatComplexMatrix& a, const FloatComplexMatrix& b,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
135 convn_type ct);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
136
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
137 extern OCTAVE_API FloatComplexMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
138 convn (const FloatComplexMatrix& a, const FloatComplexColumnVector& c,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
139 const FloatComplexRowVector& r, convn_type ct);
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
140
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
141 convn_type convert_enum (::convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
142 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
143 switch (ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
144 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
145 case ::convn_full:
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
146 return convn_full;
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
147
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
148 case ::convn_same:
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
149 return convn_same;
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
150
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
151 case ::convn_valid:
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
152 return convn_valid;
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
153
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
154 default:
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
155 abort ();
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
156 }
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
157 }
31605
e88a07dec498 maint: Use macros to begin/end C++ namespaces.
Rik <rik@octave.org>
parents: 30564
diff changeset
158
e88a07dec498 maint: Use macros to begin/end C++ namespaces.
Rik <rik@octave.org>
parents: 30564
diff changeset
159 OCTAVE_END_NAMESPACE(octave)
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
160
29954
4c88a452519c rename OCTAVE_USE_DEPRECATED_FUNCTIONS macro and attempt to make it work
John W. Eaton <jwe@octave.org>
parents: 29876
diff changeset
161 #if defined (OCTAVE_PROVIDE_DEPRECATED_SYMBOLS)
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
162 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
163 inline NDArray
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
164 convn (const NDArray& a, const NDArray& b, convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
165 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
166 return octave::convn (a, b, static_cast<octave::convn_type> (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
167 }
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
168
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
169 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
170 inline Matrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
171 convn (const Matrix& a, const Matrix& b, convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
172 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
173 return octave::convn (a, b, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
174 }
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
175
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
176 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
177 inline Matrix
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
178 convn (const Matrix& a, const ColumnVector& c, const RowVector& r,
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
179 convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
180 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
181 return octave::convn (a, c, r, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
182 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
183
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
184 // double complex X double real
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
185
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
186 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
187 inline ComplexNDArray
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
188 convn (const ComplexNDArray& a, const NDArray& b, convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
189 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
190 return octave::convn (a, b, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
191 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
192
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
193 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
194 inline ComplexMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
195 convn (const ComplexMatrix& a, const Matrix& b, convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
196 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
197 return octave::convn (a, b, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
198 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
199
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
200 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
201 inline ComplexMatrix
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
202 convn (const ComplexMatrix& a, const ColumnVector& c, const RowVector& r,
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
203 convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
204 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
205 return octave::convn (a, c, r, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
206 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
207
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
208 // double complex X double complex
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
209
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
210 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
211 inline ComplexNDArray
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
212 convn (const ComplexNDArray& a, const ComplexNDArray& b, convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
213 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
214 return octave::convn (a, b, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
215 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
216
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
217 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
218 inline ComplexMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
219 convn (const ComplexMatrix& a, const ComplexMatrix& b, convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
220 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
221 return octave::convn (a, b, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
222 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
223
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
224 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
225 inline ComplexMatrix
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
226 convn (const ComplexMatrix& a, const ComplexColumnVector& c,
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
227 const ComplexRowVector& r, convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
228 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
229 return octave::convn (a, c, r, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
230 }
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 21244
diff changeset
231
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
232 // float real X float real
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
233
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
234 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
235 inline FloatNDArray
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
236 convn (const FloatNDArray& a, const FloatNDArray& b, convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
237 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
238 return octave::convn (a, b, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
239 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
240
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
241 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
242 inline FloatMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
243 convn (const FloatMatrix& a, const FloatMatrix& b, convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
244 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
245 return octave::convn (a, b, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
246 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
247
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
248 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
249 inline FloatMatrix
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
250 convn (const FloatMatrix& a, const FloatColumnVector& c,
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
251 const FloatRowVector& r, convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
252 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
253 return octave::convn (a, c, r, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
254 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
255
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
256 // float complex X float real
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
257
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
258 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
259 inline FloatComplexNDArray
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
260 convn (const FloatComplexNDArray& a, const FloatNDArray& b,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
261 convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
262 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
263 return octave::convn (a, b, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
264 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
265
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
266 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
267 inline FloatComplexMatrix
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
268 convn (const FloatComplexMatrix& a, const FloatMatrix& b,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
269 convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
270 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
271 return octave::convn (a, b, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
272 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
273
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
274 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
275 inline FloatComplexMatrix
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
276 convn (const FloatComplexMatrix& a, const FloatColumnVector& c,
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
277 const FloatRowVector& r, convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
278 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
279 return octave::convn (a, c, r, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
280 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
281
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
282 // float complex X float complex
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
283
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
284 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
285 inline FloatComplexNDArray
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
286 convn (const FloatComplexNDArray& a, const FloatComplexNDArray& b,
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
287 convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
288 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
289 return octave::convn (a, b, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
290 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
291
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
292 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
293 inline FloatComplexMatrix
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
294 convn (const FloatComplexMatrix& a, const FloatComplexMatrix& b,
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
295 convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
296 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
297 return octave::convn (a, b, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
298 }
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
299
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
300 OCTAVE_DEPRECATED (7, "use 'octave::convn' instead")
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
301 inline FloatComplexMatrix
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29358
diff changeset
302 convn (const FloatComplexMatrix& a, const FloatComplexColumnVector& c,
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
303 const FloatComplexRowVector& r, convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
304 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
305 return octave::convn (a, c, r, octave::convert_enum (ct));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
306 }
29954
4c88a452519c rename OCTAVE_USE_DEPRECATED_FUNCTIONS macro and attempt to make it work
John W. Eaton <jwe@octave.org>
parents: 29876
diff changeset
307 #endif
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
308
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
309 #endif