annotate liboctave/mx-inlines.cc @ 8380:dbe67764e628

fix & improve speed of diagonal matrix multiplication
author Jaroslav Hajek <highegg@gmail.com>
date Sun, 07 Dec 2008 10:29:34 +0100
parents 82be108cc558
children a1ae2aae903e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
1 /*
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
2
7017
a1dbe9d80eee [project @ 2007-10-12 21:27:11 by jwe]
jwe
parents: 7016
diff changeset
3 Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002,
a1dbe9d80eee [project @ 2007-10-12 21:27:11 by jwe]
jwe
parents: 7016
diff changeset
4 2003, 2004, 2005, 2006, 2007 John W. Eaton
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
5
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
6 This file is part of Octave.
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
7
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
8 Octave is free software; you can redistribute it and/or modify it
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
9 under the terms of the GNU General Public License as published by the
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 5972
diff changeset
10 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 5972
diff changeset
11 option) any later version.
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
12
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
13 Octave is distributed in the hope that it will be useful, but WITHOUT
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
16 for more details.
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
17
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
18 You should have received a copy of the GNU General Public License
7016
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 5972
diff changeset
19 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 5972
diff changeset
20 <http://www.gnu.org/licenses/>.
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
21
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
22 */
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
23
2828
92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe]
jwe
parents: 2811
diff changeset
24 #if !defined (octave_mx_inlines_h)
92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe]
jwe
parents: 2811
diff changeset
25 #define octave_mx_inlines_h 1
2804
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
26
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
27 #include <cstddef>
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
28
5525
558c69736dc0 [project @ 2005-11-01 00:49:50 by jwe]
jwe
parents: 5524
diff changeset
29 #include "quit.h"
558c69736dc0 [project @ 2005-11-01 00:49:50 by jwe]
jwe
parents: 5524
diff changeset
30
1650
23aa282707e8 [project @ 1995-12-20 06:53:12 by jwe]
jwe
parents: 1574
diff changeset
31 #include "oct-cmplx.h"
461
00f8b2242a18 [project @ 1994-06-06 00:45:57 by jwe]
jwe
parents: 238
diff changeset
32
8380
dbe67764e628 fix & improve speed of diagonal matrix multiplication
Jaroslav Hajek <highegg@gmail.com>
parents: 7789
diff changeset
33 template <class R, class S>
dbe67764e628 fix & improve speed of diagonal matrix multiplication
Jaroslav Hajek <highegg@gmail.com>
parents: 7789
diff changeset
34 inline void
dbe67764e628 fix & improve speed of diagonal matrix multiplication
Jaroslav Hajek <highegg@gmail.com>
parents: 7789
diff changeset
35 mx_inline_fill_vs (R *r, size_t n, S s)
dbe67764e628 fix & improve speed of diagonal matrix multiplication
Jaroslav Hajek <highegg@gmail.com>
parents: 7789
diff changeset
36 {
dbe67764e628 fix & improve speed of diagonal matrix multiplication
Jaroslav Hajek <highegg@gmail.com>
parents: 7789
diff changeset
37 for (size_t i = 0; i < n; i++)
dbe67764e628 fix & improve speed of diagonal matrix multiplication
Jaroslav Hajek <highegg@gmail.com>
parents: 7789
diff changeset
38 r[i] = s;
dbe67764e628 fix & improve speed of diagonal matrix multiplication
Jaroslav Hajek <highegg@gmail.com>
parents: 7789
diff changeset
39 }
dbe67764e628 fix & improve speed of diagonal matrix multiplication
Jaroslav Hajek <highegg@gmail.com>
parents: 7789
diff changeset
40
2811
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
41 #define VS_OP_FCN(F, OP) \
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
42 template <class R, class V, class S> \
3262
eaa639880b51 [project @ 1999-08-20 19:06:48 by jwe]
jwe
parents: 3107
diff changeset
43 inline void \
2811
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
44 F ## _vs (R *r, const V *v, size_t n, S s) \
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
45 { \
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
46 for (size_t i = 0; i < n; i++) \
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
47 r[i] = v[i] OP s; \
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
48 }
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
49
3769
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
50 VS_OP_FCN (mx_inline_add, +)
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
51 VS_OP_FCN (mx_inline_subtract, -)
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
52 VS_OP_FCN (mx_inline_multiply, *)
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
53 VS_OP_FCN (mx_inline_divide, /)
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
54
2804
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
55 #define VS_OP(F, OP, R, V, S) \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
56 static inline R * \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
57 F (const V *v, size_t n, S s) \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
58 { \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
59 R *r = 0; \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
60 if (n > 0) \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
61 { \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
62 r = new R [n]; \
2811
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
63 F ## _vs (r, v, n, s); \
2804
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
64 } \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
65 return r; \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
66 }
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
67
2804
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
68 #define VS_OPS(R, V, S) \
3769
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
69 VS_OP (mx_inline_add, +, R, V, S) \
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
70 VS_OP (mx_inline_subtract, -, R, V, S) \
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
71 VS_OP (mx_inline_multiply, *, R, V, S) \
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
72 VS_OP (mx_inline_divide, /, R, V, S)
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
73
2804
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
74 VS_OPS (double, double, double)
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
75 VS_OPS (Complex, double, Complex)
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
76 VS_OPS (Complex, Complex, double)
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
77 VS_OPS (Complex, Complex, Complex)
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
78
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
79 VS_OPS (float, float, float)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
80 VS_OPS (FloatComplex, float, FloatComplex)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
81 VS_OPS (FloatComplex, FloatComplex, float)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
82 VS_OPS (FloatComplex, FloatComplex, FloatComplex)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
83
2811
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
84 #define SV_OP_FCN(F, OP) \
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
85 template <class R, class S, class V> \
3262
eaa639880b51 [project @ 1999-08-20 19:06:48 by jwe]
jwe
parents: 3107
diff changeset
86 inline void \
2811
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
87 F ## _sv (R *r, S s, const V *v, size_t n) \
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
88 { \
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
89 for (size_t i = 0; i < n; i++) \
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
90 r[i] = s OP v[i]; \
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
91 } \
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
92
3769
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
93 SV_OP_FCN (mx_inline_add, +)
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
94 SV_OP_FCN (mx_inline_subtract, -)
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
95 SV_OP_FCN (mx_inline_multiply, *)
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
96 SV_OP_FCN (mx_inline_divide, /)
2811
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
97
2804
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
98 #define SV_OP(F, OP, R, S, V) \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
99 static inline R * \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
100 F (S s, const V *v, size_t n) \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
101 { \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
102 R *r = 0; \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
103 if (n > 0) \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
104 { \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
105 r = new R [n]; \
2811
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
106 F ## _sv (r, s, v, n); \
2804
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
107 } \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
108 return r; \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
109 }
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
110
2804
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
111 #define SV_OPS(R, S, V) \
3769
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
112 SV_OP (mx_inline_add, +, R, S, V) \
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
113 SV_OP (mx_inline_subtract, -, R, S, V) \
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
114 SV_OP (mx_inline_multiply, *, R, S, V) \
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
115 SV_OP (mx_inline_divide, /, R, S, V)
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
116
2804
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
117 SV_OPS (double, double, double)
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
118 SV_OPS (Complex, double, Complex)
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
119 SV_OPS (Complex, Complex, double)
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
120 SV_OPS (Complex, Complex, Complex)
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
121
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
122 SV_OPS (float, float, float)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
123 SV_OPS (FloatComplex, float, FloatComplex)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
124 SV_OPS (FloatComplex, FloatComplex, float)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
125 SV_OPS (FloatComplex, FloatComplex, FloatComplex)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
126
2811
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
127 #define VV_OP_FCN(F, OP) \
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
128 template <class R, class T1, class T2> \
3262
eaa639880b51 [project @ 1999-08-20 19:06:48 by jwe]
jwe
parents: 3107
diff changeset
129 inline void \
2811
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
130 F ## _vv (R *r, const T1 *v1, const T2 *v2, size_t n) \
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
131 { \
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
132 for (size_t i = 0; i < n; i++) \
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
133 r[i] = v1[i] OP v2[i]; \
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
134 } \
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
135
3769
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
136 VV_OP_FCN (mx_inline_add, +)
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
137 VV_OP_FCN (mx_inline_subtract, -)
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
138 VV_OP_FCN (mx_inline_multiply, *)
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
139 VV_OP_FCN (mx_inline_divide, /)
2811
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
140
2804
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
141 #define VV_OP(F, OP, R, T1, T2) \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
142 static inline R * \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
143 F (const T1 *v1, const T2 *v2, size_t n) \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
144 { \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
145 R *r = 0; \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
146 if (n > 0) \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
147 { \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
148 r = new R [n]; \
2811
1dd37f97364a [project @ 1997-03-12 23:06:13 by jwe]
jwe
parents: 2804
diff changeset
149 F ## _vv (r, v1, v2, n); \
2804
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
150 } \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
151 return r; \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
152 }
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
153
2804
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
154 #define VV_OPS(R, T1, T2) \
3769
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
155 VV_OP (mx_inline_add, +, R, T1, T2) \
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
156 VV_OP (mx_inline_subtract, -, R, T1, T2) \
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
157 VV_OP (mx_inline_multiply, *, R, T1, T2) \
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
158 VV_OP (mx_inline_divide, /, R, T1, T2)
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
159
2804
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
160 VV_OPS (double, double, double)
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
161 VV_OPS (Complex, double, Complex)
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
162 VV_OPS (Complex, Complex, double)
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
163 VV_OPS (Complex, Complex, Complex)
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
164
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
165 VV_OPS (float, float, float)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
166 VV_OPS (FloatComplex, float, FloatComplex)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
167 VV_OPS (FloatComplex, FloatComplex, float)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
168 VV_OPS (FloatComplex, FloatComplex, FloatComplex)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
169
2804
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
170 #define VS_OP2(F, OP, V, S) \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
171 static inline V * \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
172 F (V *v, size_t n, S s) \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
173 { \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
174 for (size_t i = 0; i < n; i++) \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
175 v[i] OP s; \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
176 return v; \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
177 }
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
178
2804
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
179 #define VS_OP2S(V, S) \
3769
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
180 VS_OP2 (mx_inline_add2, +=, V, S) \
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
181 VS_OP2 (mx_inline_subtract2, -=, V, S) \
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
182 VS_OP2 (mx_inline_multiply2, *=, V, S) \
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
183 VS_OP2 (mx_inline_divide2, /=, V, S) \
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
184 VS_OP2 (mx_inline_copy, =, V, S)
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
185
2804
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
186 VS_OP2S (double, double)
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
187 VS_OP2S (Complex, double)
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
188 VS_OP2S (Complex, Complex)
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
189
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
190 VS_OP2S (float, float)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
191 VS_OP2S (FloatComplex, float)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
192 VS_OP2S (FloatComplex, FloatComplex)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
193
2804
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
194 #define VV_OP2(F, OP, T1, T2) \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
195 static inline T1 * \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
196 F (T1 *v1, const T2 *v2, size_t n) \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
197 { \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
198 for (size_t i = 0; i < n; i++) \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
199 v1[i] OP v2[i]; \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
200 return v1; \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
201 }
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
202
2804
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
203 #define VV_OP2S(T1, T2) \
3769
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
204 VV_OP2 (mx_inline_add2, +=, T1, T2) \
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
205 VV_OP2 (mx_inline_subtract2, -=, T1, T2) \
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
206 VV_OP2 (mx_inline_multiply2, *=, T1, T2) \
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
207 VV_OP2 (mx_inline_divide2, /=, T1, T2) \
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
208 VV_OP2 (mx_inline_copy, =, T1, T2)
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
209
2804
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
210 VV_OP2S (double, double)
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
211 VV_OP2S (Complex, double)
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
212 VV_OP2S (Complex, Complex)
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
213
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
214 VV_OP2S (float, float)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
215 VV_OP2S (FloatComplex, float)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
216 VV_OP2S (FloatComplex, FloatComplex)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
217
2804
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
218 #define OP_EQ_FCN(T1, T2) \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
219 static inline bool \
3769
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
220 mx_inline_equal (const T1 *x, const T2 *y, size_t n) \
2804
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
221 { \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
222 for (size_t i = 0; i < n; i++) \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
223 if (x[i] != y[i]) \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
224 return false; \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
225 return true; \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
226 }
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
227
2828
92826d6e8bd9 [project @ 1997-03-25 23:41:41 by jwe]
jwe
parents: 2811
diff changeset
228 OP_EQ_FCN (bool, bool)
2804
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
229 OP_EQ_FCN (char, char)
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
230 OP_EQ_FCN (double, double)
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
231 OP_EQ_FCN (Complex, Complex)
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
232 OP_EQ_FCN (float, float)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
233 OP_EQ_FCN (FloatComplex, FloatComplex)
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
234
2804
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
235 #define OP_DUP_FCN(OP, F, R, T) \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
236 static inline R * \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
237 F (const T *x, size_t n) \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
238 { \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
239 R *r = 0; \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
240 if (n > 0) \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
241 { \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
242 r = new R [n]; \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
243 for (size_t i = 0; i < n; i++) \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
244 r[i] = OP (x[i]); \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
245 } \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
246 return r; \
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
247 }
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
248
3769
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
249 OP_DUP_FCN (, mx_inline_dup, double, double)
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
250 OP_DUP_FCN (, mx_inline_dup, Complex, Complex)
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
251 OP_DUP_FCN (, mx_inline_dup, float, float)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
252 OP_DUP_FCN (, mx_inline_dup, FloatComplex, FloatComplex)
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
253
2804
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
254 // These should really return a bool *. Also, they should probably be
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
255 // in with a collection of other element-by-element boolean ops.
3769
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
256 OP_DUP_FCN (0.0 ==, mx_inline_not, double, double)
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
257 OP_DUP_FCN (0.0 ==, mx_inline_not, double, Complex)
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
258
3769
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
259 OP_DUP_FCN (, mx_inline_make_complex, Complex, double)
2804
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
260
3769
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
261 OP_DUP_FCN (-, mx_inline_change_sign, double, double)
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
262 OP_DUP_FCN (-, mx_inline_change_sign, Complex, Complex)
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
263
3769
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
264 OP_DUP_FCN (real, mx_inline_real_dup, double, Complex)
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
265 OP_DUP_FCN (imag, mx_inline_imag_dup, double, Complex)
7c8e3c42ed04 [project @ 2001-01-31 22:15:51 by jwe]
jwe
parents: 3504
diff changeset
266 OP_DUP_FCN (conj, mx_inline_conj_dup, Complex, Complex)
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
267
7789
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
268 OP_DUP_FCN (0.0 ==, mx_inline_not, float, float)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
269 OP_DUP_FCN (static_cast<float>(0.0) ==, mx_inline_not, float, FloatComplex)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
270
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
271 OP_DUP_FCN (, mx_inline_make_complex, FloatComplex, float)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
272
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
273 OP_DUP_FCN (-, mx_inline_change_sign, float, float)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
274 OP_DUP_FCN (-, mx_inline_change_sign, FloatComplex, FloatComplex)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
275
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
276 OP_DUP_FCN (real, mx_inline_real_dup, float, FloatComplex)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
277 OP_DUP_FCN (imag, mx_inline_imag_dup, float, FloatComplex)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
278 OP_DUP_FCN (conj, mx_inline_conj_dup, FloatComplex, FloatComplex)
82be108cc558 First attempt at single precision tyeps
David Bateman <dbateman@free.fr>
parents: 7017
diff changeset
279
3864
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
280 // Avoid some code duplication. Maybe we should use templates.
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
281
4015
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
282 #define MX_CUMULATIVE_OP(RET_TYPE, ELT_TYPE, OP) \
3864
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
283 \
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5110
diff changeset
284 octave_idx_type nr = rows (); \
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5110
diff changeset
285 octave_idx_type nc = cols (); \
3864
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
286 \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
287 RET_TYPE retval (nr, nc); \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
288 \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
289 if (nr > 0 && nc > 0) \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
290 { \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
291 if ((nr == 1 && dim == -1) || dim == 1) \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
292 { \
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5110
diff changeset
293 for (octave_idx_type i = 0; i < nr; i++) \
3864
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
294 { \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
295 ELT_TYPE t = elem (i, 0); \
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5110
diff changeset
296 for (octave_idx_type j = 0; j < nc; j++) \
3864
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
297 { \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
298 retval.elem (i, j) = t; \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
299 if (j < nc - 1) \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
300 t OP elem (i, j+1); \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
301 } \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
302 } \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
303 } \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
304 else \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
305 { \
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5110
diff changeset
306 for (octave_idx_type j = 0; j < nc; j++) \
3864
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
307 { \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
308 ELT_TYPE t = elem (0, j); \
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5110
diff changeset
309 for (octave_idx_type i = 0; i < nr; i++) \
3864
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
310 { \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
311 retval.elem (i, j) = t; \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
312 if (i < nr - 1) \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
313 t OP elem (i+1, j); \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
314 } \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
315 } \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
316 } \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
317 } \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
318 \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
319 return retval
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
320
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
321 #define MX_BASE_REDUCTION_OP(RET_TYPE, ROW_EXPR, COL_EXPR, INIT_VAL, \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
322 MT_RESULT) \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
323 \
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5110
diff changeset
324 octave_idx_type nr = rows (); \
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5110
diff changeset
325 octave_idx_type nc = cols (); \
3864
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
326 \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
327 RET_TYPE retval; \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
328 \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
329 if (nr > 0 && nc > 0) \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
330 { \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
331 if ((nr == 1 && dim == -1) || dim == 1) \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
332 { \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
333 retval.resize (nr, 1); \
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5110
diff changeset
334 for (octave_idx_type i = 0; i < nr; i++) \
3864
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
335 { \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
336 retval.elem (i, 0) = INIT_VAL; \
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5110
diff changeset
337 for (octave_idx_type j = 0; j < nc; j++) \
3864
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
338 { \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
339 ROW_EXPR; \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
340 } \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
341 } \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
342 } \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
343 else \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
344 { \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
345 retval.resize (1, nc); \
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5110
diff changeset
346 for (octave_idx_type j = 0; j < nc; j++) \
3864
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
347 { \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
348 retval.elem (0, j) = INIT_VAL; \
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5110
diff changeset
349 for (octave_idx_type i = 0; i < nr; i++) \
3864
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
350 { \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
351 COL_EXPR; \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
352 } \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
353 } \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
354 } \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
355 } \
4139
02ca908056e9 [project @ 2002-11-01 00:49:13 by jwe]
jwe
parents: 4015
diff changeset
356 else if (nc == 0 && (nr == 0 || (nr == 1 && dim == -1))) \
02ca908056e9 [project @ 2002-11-01 00:49:13 by jwe]
jwe
parents: 4015
diff changeset
357 retval.resize (1, 1, MT_RESULT); \
4015
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
358 else if (nr == 0 && (dim == 0 || dim == -1)) \
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
359 retval.resize (1, nc, MT_RESULT); \
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
360 else if (nc == 0 && dim == 1) \
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
361 retval.resize (nr, 1, MT_RESULT); \
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
362 else \
4139
02ca908056e9 [project @ 2002-11-01 00:49:13 by jwe]
jwe
parents: 4015
diff changeset
363 retval.resize (nr > 0, nc > 0); \
3864
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
364 \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
365 return retval
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
366
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
367 #define MX_REDUCTION_OP_ROW_EXPR(OP) \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
368 retval.elem (i, 0) OP elem (i, j)
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
369
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
370 #define MX_REDUCTION_OP_COL_EXPR(OP) \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
371 retval.elem (0, j) OP elem (i, j)
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
372
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
373 #define MX_REDUCTION_OP(RET_TYPE, OP, INIT_VAL, MT_RESULT) \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
374 MX_BASE_REDUCTION_OP (RET_TYPE, \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
375 MX_REDUCTION_OP_ROW_EXPR (OP), \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
376 MX_REDUCTION_OP_COL_EXPR (OP), \
e78705239df5 [project @ 2001-11-16 12:56:20 by jwe]
jwe
parents: 3769
diff changeset
377 INIT_VAL, MT_RESULT)
4015
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
378
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
379 #define MX_ANY_ALL_OP_ROW_CODE(TEST_OP, TEST_TRUE_VAL) \
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
380 if (elem (i, j) TEST_OP 0.0) \
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
381 { \
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
382 retval.elem (i, 0) = TEST_TRUE_VAL; \
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
383 break; \
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
384 }
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
385
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
386 #define MX_ANY_ALL_OP_COL_CODE(TEST_OP, TEST_TRUE_VAL) \
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
387 if (elem (i, j) TEST_OP 0.0) \
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
388 { \
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
389 retval.elem (0, j) = TEST_TRUE_VAL; \
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
390 break; \
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
391 }
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
392
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
393 #define MX_ANY_ALL_OP(DIM, INIT_VAL, TEST_OP, TEST_TRUE_VAL) \
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
394 MX_BASE_REDUCTION_OP (boolMatrix, \
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
395 MX_ANY_ALL_OP_ROW_CODE (TEST_OP, TEST_TRUE_VAL), \
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
396 MX_ANY_ALL_OP_COL_CODE (TEST_OP, TEST_TRUE_VAL), \
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
397 INIT_VAL, INIT_VAL)
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
398
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
399 #define MX_ALL_OP(DIM) MX_ANY_ALL_OP (DIM, true, ==, false)
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
400
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
401 #define MX_ANY_OP(DIM) MX_ANY_ALL_OP (DIM, false, !=, true)
6476dd85a65f [project @ 2002-08-02 07:59:19 by jwe]
jwe
parents: 3864
diff changeset
402
4563
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4559
diff changeset
403 #define MX_ND_ALL_EXPR elem (iter_idx) == 0
4556
773a21e4fce8 [project @ 2003-10-28 05:02:10 by jwe]
jwe
parents: 4139
diff changeset
404
4563
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4559
diff changeset
405 #define MX_ND_ANY_EXPR elem (iter_idx) != 0
4556
773a21e4fce8 [project @ 2003-10-28 05:02:10 by jwe]
jwe
parents: 4139
diff changeset
406
773a21e4fce8 [project @ 2003-10-28 05:02:10 by jwe]
jwe
parents: 4139
diff changeset
407 #define MX_ND_ALL_EVAL(TEST_EXPR) \
5520
b99404352541 [project @ 2005-10-29 04:44:00 by jwe]
jwe
parents: 5307
diff changeset
408 if (retval(result_idx) && (TEST_EXPR)) \
b99404352541 [project @ 2005-10-29 04:44:00 by jwe]
jwe
parents: 5307
diff changeset
409 retval(result_idx) = 0;
4556
773a21e4fce8 [project @ 2003-10-28 05:02:10 by jwe]
jwe
parents: 4139
diff changeset
410
773a21e4fce8 [project @ 2003-10-28 05:02:10 by jwe]
jwe
parents: 4139
diff changeset
411 #define MX_ND_ANY_EVAL(TEST_EXPR) \
5520
b99404352541 [project @ 2005-10-29 04:44:00 by jwe]
jwe
parents: 5307
diff changeset
412 if (retval(result_idx) || (TEST_EXPR)) \
b99404352541 [project @ 2005-10-29 04:44:00 by jwe]
jwe
parents: 5307
diff changeset
413 retval(result_idx) = 1;
4569
01e4957409a4 [project @ 2003-10-30 05:48:17 by jwe]
jwe
parents: 4563
diff changeset
414
5520
b99404352541 [project @ 2005-10-29 04:44:00 by jwe]
jwe
parents: 5307
diff changeset
415 #define MX_ND_REDUCTION(EVAL_EXPR, INIT_VAL, RET_TYPE) \
4556
773a21e4fce8 [project @ 2003-10-28 05:02:10 by jwe]
jwe
parents: 4139
diff changeset
416 \
4569
01e4957409a4 [project @ 2003-10-30 05:48:17 by jwe]
jwe
parents: 4563
diff changeset
417 RET_TYPE retval; \
4556
773a21e4fce8 [project @ 2003-10-28 05:02:10 by jwe]
jwe
parents: 4139
diff changeset
418 \
4932
43f4ebd2704c [project @ 2004-08-05 13:26:10 by jwe]
jwe
parents: 4899
diff changeset
419 dim_vector dv = this->dims (); \
5520
b99404352541 [project @ 2005-10-29 04:44:00 by jwe]
jwe
parents: 5307
diff changeset
420 int nd = this->ndims (); \
4563
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4559
diff changeset
421 \
5955
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
422 int empty = false; \
4563
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4559
diff changeset
423 \
5520
b99404352541 [project @ 2005-10-29 04:44:00 by jwe]
jwe
parents: 5307
diff changeset
424 for (int i = 0; i < nd; i++) \
4563
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4559
diff changeset
425 { \
5955
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
426 if (dv(i) == 0) \
4563
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4559
diff changeset
427 { \
5955
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
428 empty = true; \
4563
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4559
diff changeset
429 break; \
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4559
diff changeset
430 } \
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4559
diff changeset
431 } \
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4559
diff changeset
432 \
5972
393babcaa877 [project @ 2006-08-26 03:02:39 by jwe]
jwe
parents: 5955
diff changeset
433 if (nd == 2 && dv(0) == 0 && dv(1) == 0) \
393babcaa877 [project @ 2006-08-26 03:02:39 by jwe]
jwe
parents: 5955
diff changeset
434 { \
393babcaa877 [project @ 2006-08-26 03:02:39 by jwe]
jwe
parents: 5955
diff changeset
435 retval.resize (dim_vector (1, 1), INIT_VAL); \
393babcaa877 [project @ 2006-08-26 03:02:39 by jwe]
jwe
parents: 5955
diff changeset
436 return retval; \
393babcaa877 [project @ 2006-08-26 03:02:39 by jwe]
jwe
parents: 5955
diff changeset
437 } \
393babcaa877 [project @ 2006-08-26 03:02:39 by jwe]
jwe
parents: 5955
diff changeset
438 \
5520
b99404352541 [project @ 2005-10-29 04:44:00 by jwe]
jwe
parents: 5307
diff changeset
439 /* We need to find first non-singleton dim. */ \
b99404352541 [project @ 2005-10-29 04:44:00 by jwe]
jwe
parents: 5307
diff changeset
440 \
b99404352541 [project @ 2005-10-29 04:44:00 by jwe]
jwe
parents: 5307
diff changeset
441 if (dim == -1) \
4556
773a21e4fce8 [project @ 2003-10-28 05:02:10 by jwe]
jwe
parents: 4139
diff changeset
442 { \
5520
b99404352541 [project @ 2005-10-29 04:44:00 by jwe]
jwe
parents: 5307
diff changeset
443 dim = 0; \
b99404352541 [project @ 2005-10-29 04:44:00 by jwe]
jwe
parents: 5307
diff changeset
444 \
b99404352541 [project @ 2005-10-29 04:44:00 by jwe]
jwe
parents: 5307
diff changeset
445 for (int i = 0; i < nd; i++) \
4563
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4559
diff changeset
446 { \
5520
b99404352541 [project @ 2005-10-29 04:44:00 by jwe]
jwe
parents: 5307
diff changeset
447 if (dv(i) != 1) \
4563
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4559
diff changeset
448 { \
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4559
diff changeset
449 dim = i; \
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4559
diff changeset
450 break; \
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4559
diff changeset
451 } \
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4559
diff changeset
452 } \
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4559
diff changeset
453 } \
5520
b99404352541 [project @ 2005-10-29 04:44:00 by jwe]
jwe
parents: 5307
diff changeset
454 else if (dim >= nd) \
4563
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4559
diff changeset
455 { \
5520
b99404352541 [project @ 2005-10-29 04:44:00 by jwe]
jwe
parents: 5307
diff changeset
456 dim = nd++; \
b99404352541 [project @ 2005-10-29 04:44:00 by jwe]
jwe
parents: 5307
diff changeset
457 dv.resize (nd, 1); \
4563
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4559
diff changeset
458 } \
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4559
diff changeset
459 \
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
460 /* R = op (A, DIM) \
4563
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4559
diff changeset
461 \
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
462 The strategy here is to access the elements of A along the \
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
463 dimension specified by DIM. This means that we loop over each \
5615
d01f07aeaec5 [project @ 2006-02-10 21:30:41 by jwe]
jwe
parents: 5614
diff changeset
464 element of R and adjust the index into A as needed. Store the \
d01f07aeaec5 [project @ 2006-02-10 21:30:41 by jwe]
jwe
parents: 5614
diff changeset
465 cummulative product of all dimensions of A in CP_SZ. The last \
d01f07aeaec5 [project @ 2006-02-10 21:30:41 by jwe]
jwe
parents: 5614
diff changeset
466 element of CP_SZ is the total number of elements of A. */ \
4563
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe]
jwe
parents: 4559
diff changeset
467 \
5615
d01f07aeaec5 [project @ 2006-02-10 21:30:41 by jwe]
jwe
parents: 5614
diff changeset
468 Array<octave_idx_type> cp_sz (nd+1, 1); \
d01f07aeaec5 [project @ 2006-02-10 21:30:41 by jwe]
jwe
parents: 5614
diff changeset
469 for (int i = 1; i <= nd; i++) \
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
470 cp_sz(i) = cp_sz(i-1)*dv(i-1); \
5520
b99404352541 [project @ 2005-10-29 04:44:00 by jwe]
jwe
parents: 5307
diff changeset
471 \
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
472 octave_idx_type reset_at = cp_sz(dim); \
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
473 octave_idx_type base_incr = cp_sz(dim+1); \
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
474 octave_idx_type incr = cp_sz(dim); \
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
475 octave_idx_type base = 0; \
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
476 octave_idx_type next_base = base + base_incr; \
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
477 octave_idx_type iter_idx = base; \
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
478 octave_idx_type n_elts = dv(dim); \
4556
773a21e4fce8 [project @ 2003-10-28 05:02:10 by jwe]
jwe
parents: 4139
diff changeset
479 \
5520
b99404352541 [project @ 2005-10-29 04:44:00 by jwe]
jwe
parents: 5307
diff changeset
480 dv(dim) = 1; \
4556
773a21e4fce8 [project @ 2003-10-28 05:02:10 by jwe]
jwe
parents: 4139
diff changeset
481 \
5520
b99404352541 [project @ 2005-10-29 04:44:00 by jwe]
jwe
parents: 5307
diff changeset
482 retval.resize (dv, INIT_VAL); \
4556
773a21e4fce8 [project @ 2003-10-28 05:02:10 by jwe]
jwe
parents: 4139
diff changeset
483 \
5955
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
484 if (! empty) \
4556
773a21e4fce8 [project @ 2003-10-28 05:02:10 by jwe]
jwe
parents: 4139
diff changeset
485 { \
5955
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
486 octave_idx_type nel = dv.numel (); \
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
487 \
5955
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
488 octave_idx_type k = 1; \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
489 \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
490 for (octave_idx_type result_idx = 0; result_idx < nel; result_idx++) \
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
491 { \
5955
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
492 OCTAVE_QUIT; \
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
493 \
5955
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
494 for (octave_idx_type j = 0; j < n_elts; j++) \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
495 { \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
496 OCTAVE_QUIT; \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
497 \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
498 EVAL_EXPR; \
5520
b99404352541 [project @ 2005-10-29 04:44:00 by jwe]
jwe
parents: 5307
diff changeset
499 \
5955
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
500 iter_idx += incr; \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
501 } \
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
502 \
5955
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
503 if (k == reset_at) \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
504 { \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
505 base = next_base; \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
506 next_base += base_incr; \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
507 iter_idx = base; \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
508 k = 1; \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
509 } \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
510 else \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
511 { \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
512 base++; \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
513 iter_idx = base; \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
514 k++; \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
515 } \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
516 } \
4556
773a21e4fce8 [project @ 2003-10-28 05:02:10 by jwe]
jwe
parents: 4139
diff changeset
517 } \
773a21e4fce8 [project @ 2003-10-28 05:02:10 by jwe]
jwe
parents: 4139
diff changeset
518 \
4871
9c89c1408c32 [project @ 2004-04-21 19:05:28 by jwe]
jwe
parents: 4845
diff changeset
519 retval.chop_trailing_singletons (); \
9c89c1408c32 [project @ 2004-04-21 19:05:28 by jwe]
jwe
parents: 4845
diff changeset
520 \
4556
773a21e4fce8 [project @ 2003-10-28 05:02:10 by jwe]
jwe
parents: 4139
diff changeset
521 return retval
4569
01e4957409a4 [project @ 2003-10-30 05:48:17 by jwe]
jwe
parents: 4563
diff changeset
522
01e4957409a4 [project @ 2003-10-30 05:48:17 by jwe]
jwe
parents: 4563
diff changeset
523 #define MX_ND_REAL_OP_REDUCTION(ASN_EXPR, INIT_VAL) \
5520
b99404352541 [project @ 2005-10-29 04:44:00 by jwe]
jwe
parents: 5307
diff changeset
524 MX_ND_REDUCTION (retval(result_idx) ASN_EXPR, INIT_VAL, NDArray)
4569
01e4957409a4 [project @ 2003-10-30 05:48:17 by jwe]
jwe
parents: 4563
diff changeset
525
01e4957409a4 [project @ 2003-10-30 05:48:17 by jwe]
jwe
parents: 4563
diff changeset
526 #define MX_ND_COMPLEX_OP_REDUCTION(ASN_EXPR, INIT_VAL) \
5520
b99404352541 [project @ 2005-10-29 04:44:00 by jwe]
jwe
parents: 5307
diff changeset
527 MX_ND_REDUCTION (retval(result_idx) ASN_EXPR, INIT_VAL, ComplexNDArray)
4569
01e4957409a4 [project @ 2003-10-30 05:48:17 by jwe]
jwe
parents: 4563
diff changeset
528
01e4957409a4 [project @ 2003-10-30 05:48:17 by jwe]
jwe
parents: 4563
diff changeset
529 #define MX_ND_ANY_ALL_REDUCTION(EVAL_EXPR, VAL) \
5520
b99404352541 [project @ 2005-10-29 04:44:00 by jwe]
jwe
parents: 5307
diff changeset
530 MX_ND_REDUCTION (EVAL_EXPR, VAL, boolNDArray)
4556
773a21e4fce8 [project @ 2003-10-28 05:02:10 by jwe]
jwe
parents: 4139
diff changeset
531
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
532 #define MX_ND_CUMULATIVE_OP(RET_TYPE, ACC_TYPE, INIT_VAL, OP) \
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
533 \
4584
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
534 RET_TYPE retval; \
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
535 \
4932
43f4ebd2704c [project @ 2004-08-05 13:26:10 by jwe]
jwe
parents: 4899
diff changeset
536 dim_vector dv = this->dims (); \
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
537 int nd = this->ndims (); \
4584
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
538 \
5955
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
539 bool empty = false; \
4584
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
540 \
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
541 for (int i = 0; i < nd; i++) \
4584
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
542 { \
5955
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
543 if (dv(i) == 0) \
4584
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
544 { \
5955
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
545 empty = true; \
4584
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
546 break; \
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
547 } \
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
548 } \
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
549 \
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
550 /* We need to find first non-singleton dim. */ \
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
551 \
4584
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
552 if (dim == -1) \
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
553 { \
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
554 dim = 0; \
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
555 \
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
556 for (int i = 0; i < nd; i++) \
4584
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
557 { \
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
558 if (dv(i) != 1) \
4584
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
559 { \
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
560 dim = i; \
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
561 break; \
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
562 } \
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
563 } \
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
564 } \
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
565 else if (dim >= nd) \
4584
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
566 { \
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
567 dim = nd++; \
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
568 dv.resize (nd, 1); \
4584
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
569 } \
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
570 \
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
571 /* R = op (A, DIM) \
4584
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
572 \
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
573 The strategy here is to access the elements of A along the \
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
574 dimension specified by DIM. This means that we loop over each \
5611
5be3463fed41 [project @ 2006-02-09 19:12:14 by jwe]
jwe
parents: 5525
diff changeset
575 element of R and adjust the index into A as needed. Store the \
5614
4cc6aeb35f93 [project @ 2006-02-10 15:07:32 by jwe]
jwe
parents: 5611
diff changeset
576 cummulative product of all dimensions of A in CP_SZ. The last \
4cc6aeb35f93 [project @ 2006-02-10 15:07:32 by jwe]
jwe
parents: 5611
diff changeset
577 element of CP_SZ is the total number of elements of A. */ \
4584
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
578 \
5611
5be3463fed41 [project @ 2006-02-09 19:12:14 by jwe]
jwe
parents: 5525
diff changeset
579 Array<octave_idx_type> cp_sz (nd+1, 1); \
5be3463fed41 [project @ 2006-02-09 19:12:14 by jwe]
jwe
parents: 5525
diff changeset
580 for (int i = 1; i <= nd; i++) \
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
581 cp_sz(i) = cp_sz(i-1)*dv(i-1); \
4584
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
582 \
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
583 octave_idx_type reset_at = cp_sz(dim); \
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
584 octave_idx_type base_incr = cp_sz(dim+1); \
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
585 octave_idx_type incr = cp_sz(dim); \
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
586 octave_idx_type base = 0; \
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
587 octave_idx_type next_base = base + base_incr; \
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
588 octave_idx_type iter_idx = base; \
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
589 octave_idx_type n_elts = dv(dim); \
4584
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
590 \
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
591 retval.resize (dv, INIT_VAL); \
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
592 \
5955
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
593 if (! empty) \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
594 { \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
595 octave_idx_type nel = dv.numel () / n_elts; \
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
596 \
5955
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
597 octave_idx_type k = 1; \
4584
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
598 \
5955
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
599 for (octave_idx_type i = 0; i < nel; i++) \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
600 { \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
601 OCTAVE_QUIT; \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
602 \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
603 ACC_TYPE prev_val = INIT_VAL; \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
604 \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
605 for (octave_idx_type j = 0; j < n_elts; j++) \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
606 { \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
607 OCTAVE_QUIT; \
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
608 \
5955
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
609 if (j == 0) \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
610 { \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
611 retval(iter_idx) = elem (iter_idx); \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
612 prev_val = retval(iter_idx); \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
613 } \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
614 else \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
615 { \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
616 prev_val = prev_val OP elem (iter_idx); \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
617 retval(iter_idx) = prev_val; \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
618 } \
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
619 \
5955
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
620 iter_idx += incr; \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
621 } \
4584
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
622 \
5955
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
623 if (k == reset_at) \
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
624 { \
5955
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
625 base = next_base; \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
626 next_base += base_incr; \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
627 iter_idx = base; \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
628 k = 1; \
4584
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
629 } \
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
630 else \
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
631 { \
5955
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
632 base++; \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
633 iter_idx = base; \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
634 k++; \
fc46f9c99028 [project @ 2006-08-22 18:37:43 by jwe]
jwe
parents: 5615
diff changeset
635 } \
4584
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
636 } \
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
637 } \
4584
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
638 \
5523
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
639 retval.chop_trailing_singletons (); \
451ad352b288 [project @ 2005-10-31 03:18:21 by jwe]
jwe
parents: 5520
diff changeset
640 \
4584
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
641 return retval
f7697d703481 [project @ 2003-10-31 19:47:35 by jwe]
jwe
parents: 4569
diff changeset
642
2804
eedc2f3f61f7 [project @ 1997-03-11 04:34:50 by jwe]
jwe
parents: 2386
diff changeset
643 #endif
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
644
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
645 /*
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
646 ;;; Local Variables: ***
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
647 ;;; mode: C++ ***
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
648 ;;; End: ***
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
649 */