Mercurial > hg > octave-lyh

annotate liboctave/bsxfun-decl.h @ 13012:15eefbd9d4e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Implement a few missing automatic bsxfun power operators * bsxfun-decl.h: Declare mixed integer-float bsxfun power operators. * int8NDArray.h: Ditto. * int16NDArray.h: Ditto. * int32NDArray.h: Ditto. * int64NDArray.h: Ditto. * uint8NDArray.h: Ditto. * uint16NDArray.h: Ditto. * uint32NDArray.h: Ditto. * uint64NDArray.h: Ditto. * bsxfun-defs.cc: Define mixed integer-float bsxfun power operators. * int8NDArray.cc: Ditto. * int16NDArray.cc: Ditto. * int32NDArray.cc: Ditto. * int64NDArray.cc: Ditto. * uint8NDArray.cc: Ditto. * uint16NDArray.cc: Ditto. * uint32NDArray.cc: Ditto. * uint64NDArray.cc: Ditto. * fNDArray.h: Declare mixed float-complex bsxfun power operators. * fNDArray.cc: Define mixed float-complex bsxfun power operators. * oct-inttypes.cc: Declare overloaded pow(integer, float) functions. * oct-inttypes.cc: Define and instantiate overloaded pow(integer, float) functions. * op-int.h: Remove casts so that mixed-type bsxfun_pow functions are called now. * xpow.cc: Cast to complex arrays if pow returns non-real; call bsxfun on a few missing functions
author Jordi Gutiérrez Hermoso <jordigh@gmail.com>
date Fri, 26 Aug 2011 21:57:23 -0500
parents fd0a3ac60b0e
children 72c96de7a403
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
9747
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
1 /*
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
2
11523
fd0a3ac60b0e update copyright notices
John W. Eaton <jwe@octave.org>
parents: 9827
diff changeset
3 Copyright (C) 2009-2011 Jaroslav Hajek
9747
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
4 Copyright (C) 2009 VZLU Prague
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
5
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
6 This file is part of Octave.
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
7
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
8 Octave is free software; you can redistribute it and/or modify it
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
9 under the terms of the GNU General Public License as published by the
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
10 Free Software Foundation; either version 3 of the License, or (at your
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
11 option) any later version.
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
12
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
13 Octave is distributed in the hope that it will be useful, but WITHOUT
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
16 for more details.
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
17
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
18 You should have received a copy of the GNU General Public License
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
19 along with Octave; see the file COPYING. If not, see
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
20 <http://www.gnu.org/licenses/>.
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
21
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
22 */
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
23
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
24 #if !defined (octave_bsxfun_decl_h)
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
25 #define octave_bsxfun_decl_h 1
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
26
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
27 #define BSXFUN_OP_DECL(OP, ARRAY, API) \
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
28 extern API ARRAY bsxfun_ ## OP (const ARRAY&, const ARRAY&);
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
29
9827
c15a5ed0da58 optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents: 9747
diff changeset
30 #define BSXFUN_OP2_DECL(OP, ARRAY, ARRAY1, ARRAY2, API) \
c15a5ed0da58 optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents: 9747
diff changeset
31 extern API ARRAY bsxfun_ ## OP (const ARRAY1&, const ARRAY2&);
c15a5ed0da58 optimize bsxfun (@power, ...)
Jaroslav Hajek <highegg@gmail.com>
parents: 9747
diff changeset
32
9747
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
33 #define BSXFUN_REL_DECL(OP, ARRAY, API) \
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
34 extern API boolNDArray bsxfun_ ## OP (const ARRAY&, const ARRAY&);
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
35
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
36 #define BSXFUN_STDOP_DECLS(ARRAY, API) \
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
37 BSXFUN_OP_DECL (add, ARRAY, API) \
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
38 BSXFUN_OP_DECL (sub, ARRAY, API) \
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
39 BSXFUN_OP_DECL (mul, ARRAY, API) \
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
40 BSXFUN_OP_DECL (div, ARRAY, API) \
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
41 BSXFUN_OP_DECL (pow, ARRAY, API) \
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
42 BSXFUN_OP_DECL (min, ARRAY, API) \
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
43 BSXFUN_OP_DECL (max, ARRAY, API)
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
44
13012
15eefbd9d4e8 Implement a few missing automatic bsxfun power operators
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 11523
diff changeset
45 #define BSXFUN_MIXED_INT_DECLS(INT_TYPE, API) \
15eefbd9d4e8 Implement a few missing automatic bsxfun power operators
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 11523
diff changeset
46 BSXFUN_OP2_DECL (pow, INT_TYPE, INT_TYPE, NDArray, API) \
15eefbd9d4e8 Implement a few missing automatic bsxfun power operators
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 11523
diff changeset
47 BSXFUN_OP2_DECL (pow, INT_TYPE, INT_TYPE, FloatNDArray, API) \
15eefbd9d4e8 Implement a few missing automatic bsxfun power operators
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 11523
diff changeset
48 BSXFUN_OP2_DECL (pow, INT_TYPE, NDArray, INT_TYPE, API) \
15eefbd9d4e8 Implement a few missing automatic bsxfun power operators
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 11523
diff changeset
49 BSXFUN_OP2_DECL (pow, INT_TYPE, FloatNDArray, INT_TYPE, API)
15eefbd9d4e8 Implement a few missing automatic bsxfun power operators
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents: 11523
diff changeset
50
9747
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
51 #define BSXFUN_STDREL_DECLS(ARRAY, API) \
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
52 BSXFUN_REL_DECL (eq, ARRAY, API) \
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
53 BSXFUN_REL_DECL (ne, ARRAY, API) \
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
54 BSXFUN_REL_DECL (lt, ARRAY, API) \
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
55 BSXFUN_REL_DECL (le, ARRAY, API) \
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
56 BSXFUN_REL_DECL (gt, ARRAY, API) \
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
57 BSXFUN_REL_DECL (ge, ARRAY, API) \
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
58
7bda650b691a add omitted files from 26abff55f6fe
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
59 #endif