Mercurial > octave-nkf

annotate liboctave/Range.cc @ 11523:fd0a3ac60b0e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update copyright notices
author John W. Eaton <jwe@octave.org>
date Fri, 14 Jan 2011 05:47:45 -0500
parents 5eb10763069f
children 12df7854fa7c
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
11523
fd0a3ac60b0e update copyright notices
John W. Eaton <jwe@octave.org>
parents: 11450
diff changeset
3 Copyright (C) 1993-2011 John W. Eaton
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
4
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
5 This file is part of Octave.
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
6
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
7 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
8 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: 6490
diff changeset
9 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6490
diff changeset
10 option) any later version.
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
11
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
12 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
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
14 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
15 for more details.
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
16
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
17 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: 6490
diff changeset
18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe]
jwe
parents: 6490
diff changeset
19 <http://www.gnu.org/licenses/>.
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
20
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
238
780cbbc57b7c [project @ 1993-11-30 20:23:04 by jwe]
jwe
parents: 208
diff changeset
23 #ifdef HAVE_CONFIG_H
1192
b6360f2d4fa6 [project @ 1995-03-30 21:38:35 by jwe]
jwe
parents: 1011
diff changeset
24 #include <config.h>
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
25 #endif
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
26
1546
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
27 #include <cfloat>
1367
9f9131a8d706 [project @ 1995-09-06 00:07:03 by jwe]
jwe
parents: 1360
diff changeset
28
3503
d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe]
jwe
parents: 2847
diff changeset
29 #include <iostream>
6490
0ad7655cf2bc [project @ 2007-04-05 02:44:34 by jwe]
jwe
parents: 6457
diff changeset
30 #include <limits>
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
31
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
32 #include "Range.h"
7458
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
33 #include "lo-error.h"
2383
096529066838 [project @ 1996-10-12 17:50:47 by jwe]
jwe
parents: 1993
diff changeset
34 #include "lo-mappers.h"
7231
2eb392d058bb [project @ 2007-11-30 18:53:29 by jwe]
jwe
parents: 7017
diff changeset
35 #include "lo-math.h"
2383
096529066838 [project @ 1996-10-12 17:50:47 by jwe]
jwe
parents: 1993
diff changeset
36 #include "lo-utils.h"
10366
e5ae13b8b2c2 improve Array indexing error messages
Jaroslav Hajek <highegg@gmail.com>
parents: 10314
diff changeset
37 #include "Array-util.h"
2383
096529066838 [project @ 1996-10-12 17:50:47 by jwe]
jwe
parents: 1993
diff changeset
38
8971
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
39 Range::Range (double b, double i, octave_idx_type n)
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
40 : rng_base (b), rng_limit (b + n * i), rng_inc (i),
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
41 rng_nelem (n), cache ()
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
42 {
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
43 if (! xfinite (b) || ! xfinite (i))
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
44 rng_nelem = -2;
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
45 }
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
46
2383
096529066838 [project @ 1996-10-12 17:50:47 by jwe]
jwe
parents: 1993
diff changeset
47 bool
096529066838 [project @ 1996-10-12 17:50:47 by jwe]
jwe
parents: 1993
diff changeset
48 Range::all_elements_are_ints (void) const
096529066838 [project @ 1996-10-12 17:50:47 by jwe]
jwe
parents: 1993
diff changeset
49 {
096529066838 [project @ 1996-10-12 17:50:47 by jwe]
jwe
parents: 1993
diff changeset
50 // If the base and increment are ints, the final value in the range
6457
a58b5981ab65 [project @ 2007-03-26 16:51:46 by jwe]
jwe
parents: 5307
diff changeset
51 // will also be an integer, even if the limit is not. If there is one
a58b5981ab65 [project @ 2007-03-26 16:51:46 by jwe]
jwe
parents: 5307
diff changeset
52 // or fewer elements only the base needs to be an integer
2383
096529066838 [project @ 1996-10-12 17:50:47 by jwe]
jwe
parents: 1993
diff changeset
53
096529066838 [project @ 1996-10-12 17:50:47 by jwe]
jwe
parents: 1993
diff changeset
54 return (! (xisnan (rng_base) || xisnan (rng_inc))
10314
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
55 && (NINTbig (rng_base) == rng_base || rng_nelem < 1)
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
56 && (NINTbig (rng_inc) == rng_inc || rng_nelem <= 1));
2383
096529066838 [project @ 1996-10-12 17:50:47 by jwe]
jwe
parents: 1993
diff changeset
57 }
645
21cb3c7dc9e3 [project @ 1994-08-24 06:19:54 by jwe]
jwe
parents: 461
diff changeset
58
21cb3c7dc9e3 [project @ 1994-08-24 06:19:54 by jwe]
jwe
parents: 461
diff changeset
59 Matrix
21cb3c7dc9e3 [project @ 1994-08-24 06:19:54 by jwe]
jwe
parents: 461
diff changeset
60 Range::matrix_value (void) const
21cb3c7dc9e3 [project @ 1994-08-24 06:19:54 by jwe]
jwe
parents: 461
diff changeset
61 {
8971
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
62 if (rng_nelem > 0 && cache.nelem () == 0)
645
21cb3c7dc9e3 [project @ 1994-08-24 06:19:54 by jwe]
jwe
parents: 461
diff changeset
63 {
4810
72a6d410a14a [project @ 2004-03-03 18:49:39 by jwe]
jwe
parents: 4791
diff changeset
64 cache.resize (1, rng_nelem);
645
21cb3c7dc9e3 [project @ 1994-08-24 06:19:54 by jwe]
jwe
parents: 461
diff changeset
65 double b = rng_base;
21cb3c7dc9e3 [project @ 1994-08-24 06:19:54 by jwe]
jwe
parents: 461
diff changeset
66 double increment = rng_inc;
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5105
diff changeset
67 for (octave_idx_type i = 0; i < rng_nelem; i++)
10314
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
68 cache(i) = b + i * increment;
4791
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe]
jwe
parents: 4192
diff changeset
69
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe]
jwe
parents: 4192
diff changeset
70 // On some machines (x86 with extended precision floating point
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe]
jwe
parents: 4192
diff changeset
71 // arithmetic, for example) it is possible that we can overshoot
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe]
jwe
parents: 4192
diff changeset
72 // the limit by approximately the machine precision even though
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe]
jwe
parents: 4192
diff changeset
73 // we were very careful in our calculation of the number of
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe]
jwe
parents: 4192
diff changeset
74 // elements.
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe]
jwe
parents: 4192
diff changeset
75
4810
72a6d410a14a [project @ 2004-03-03 18:49:39 by jwe]
jwe
parents: 4791
diff changeset
76 if ((rng_inc > 0 && cache(rng_nelem-1) > rng_limit)
10314
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
77 || (rng_inc < 0 && cache(rng_nelem-1) < rng_limit))
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
78 cache(rng_nelem-1) = rng_limit;
645
21cb3c7dc9e3 [project @ 1994-08-24 06:19:54 by jwe]
jwe
parents: 461
diff changeset
79 }
21cb3c7dc9e3 [project @ 1994-08-24 06:19:54 by jwe]
jwe
parents: 461
diff changeset
80
4810
72a6d410a14a [project @ 2004-03-03 18:49:39 by jwe]
jwe
parents: 4791
diff changeset
81 return cache;
645
21cb3c7dc9e3 [project @ 1994-08-24 06:19:54 by jwe]
jwe
parents: 461
diff changeset
82 }
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
83
9986
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
84 double
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
85 Range::checkelem (octave_idx_type i) const
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
86 {
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
87 if (i < 0 || i >= rng_nelem)
10366
e5ae13b8b2c2 improve Array indexing error messages
Jaroslav Hajek <highegg@gmail.com>
parents: 10314
diff changeset
88 gripe_index_out_of_range (1, 1, i+1, rng_nelem);
9986
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
89
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
90 return rng_base + rng_inc * i;
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
91 }
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
92
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
93 struct _rangeidx_helper
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
94 {
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
95 double *array, base, inc;
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
96 _rangeidx_helper (double *a, double b, double i)
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
97 : array (a), base (b), inc (i) { }
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
98 void operator () (octave_idx_type i)
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
99 { *array++ = base + i * inc; }
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
100 };
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
101
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
102 Array<double>
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
103 Range::index (const idx_vector& i) const
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
104 {
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
105 Array<double> retval;
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
106
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
107 octave_idx_type n = rng_nelem;
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
108
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
109 if (i.is_colon ())
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
110 {
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
111 retval = matrix_value ().reshape (dim_vector (rng_nelem, 1));
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
112 }
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
113 else
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
114 {
10366
e5ae13b8b2c2 improve Array indexing error messages
Jaroslav Hajek <highegg@gmail.com>
parents: 10314
diff changeset
115 if (i.extent (n) != n)
e5ae13b8b2c2 improve Array indexing error messages
Jaroslav Hajek <highegg@gmail.com>
parents: 10314
diff changeset
116 gripe_index_out_of_range (1, 1, i.extent (n), n); // throws
e5ae13b8b2c2 improve Array indexing error messages
Jaroslav Hajek <highegg@gmail.com>
parents: 10314
diff changeset
117
9986
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
118 dim_vector rd = i.orig_dimensions ();
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
119 octave_idx_type il = i.length (n);
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
120
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
121 // taken from Array.cc.
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
122
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
123 if (n != 1 && rd.is_vector ())
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
124 rd = dim_vector (1, il);
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
125
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
126 retval.clear (rd);
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
127
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
128 i.loop (n, _rangeidx_helper (retval.fortran_vec (), rng_base, rng_inc));
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
129 }
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
130
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
131 return retval;
672e1b49e01e optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents: 8971
diff changeset
132 }
4810
72a6d410a14a [project @ 2004-03-03 18:49:39 by jwe]
jwe
parents: 4791
diff changeset
133
208
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
134 // NOTE: max and min only return useful values if nelem > 0.
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
135
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
136 double
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
137 Range::min (void) const
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
138 {
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
139 double retval = 0.0;
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
140 if (rng_nelem > 0)
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
141 {
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
142 if (rng_inc > 0)
10314
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
143 retval = rng_base;
208
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
144 else
10314
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
145 {
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
146 retval = rng_base + (rng_nelem - 1) * rng_inc;
4791
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe]
jwe
parents: 4192
diff changeset
147
10314
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
148 // See the note in the matrix_value method above.
4791
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe]
jwe
parents: 4192
diff changeset
149
10314
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
150 if (retval < rng_limit)
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
151 retval = rng_limit;
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
152 }
4791
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe]
jwe
parents: 4192
diff changeset
153
208
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
154 }
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
155 return retval;
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
156 }
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
157
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
158 double
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
159 Range::max (void) const
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
160 {
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
161 double retval = 0.0;
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
162 if (rng_nelem > 0)
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
163 {
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
164 if (rng_inc > 0)
10314
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
165 {
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
166 retval = rng_base + (rng_nelem - 1) * rng_inc;
4791
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe]
jwe
parents: 4192
diff changeset
167
10314
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
168 // See the note in the matrix_value method above.
4791
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe]
jwe
parents: 4192
diff changeset
169
10314
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
170 if (retval > rng_limit)
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
171 retval = rng_limit;
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
172 }
208
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
173 else
10314
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
174 retval = rng_base;
208
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
175 }
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
176 return retval;
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
177 }
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
178
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
179 void
7458
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
180 Range::sort_internal (bool ascending)
208
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
181 {
7458
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
182 if (ascending && rng_base > rng_limit && rng_inc < 0.0)
208
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
183 {
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
184 double tmp = rng_base;
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
185 rng_base = min ();
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
186 rng_limit = tmp;
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
187 rng_inc = -rng_inc;
4811
198f3712c692 [project @ 2004-03-03 19:24:33 by jwe]
jwe
parents: 4810
diff changeset
188 clear_cache ();
208
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
189 }
8565
4a864c4e682d fix sorting of ranges
Jaroslav Hajek <highegg@gmail.com>
parents: 8553
diff changeset
190 else if (! ascending && rng_base < rng_limit && rng_inc > 0.0)
7458
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
191 {
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
192 double tmp = rng_limit;
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
193 rng_limit = min ();
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
194 rng_base = tmp;
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
195 rng_inc = -rng_inc;
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
196 clear_cache ();
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
197 }
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
198 }
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
199
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
200 void
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
201 Range::sort_internal (Array<octave_idx_type>& sidx, bool ascending)
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
202 {
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
203 octave_idx_type nel = nelem ();
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
204
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
205 sidx.resize (dim_vector (1, nel));
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
206
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
207 octave_idx_type *psidx = sidx.fortran_vec ();
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
208
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
209 bool reverse = false;
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
210
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
211 if (ascending && rng_base > rng_limit && rng_inc < 0.0)
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
212 {
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
213 double tmp = rng_base;
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
214 rng_base = min ();
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
215 rng_limit = tmp;
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
216 rng_inc = -rng_inc;
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
217 clear_cache ();
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
218 reverse = true;
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
219 }
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
220 else if (! ascending && rng_base < rng_limit && rng_inc > 0.0)
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
221 {
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
222 double tmp = rng_limit;
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
223 rng_limit = min ();
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
224 rng_base = tmp;
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
225 rng_inc = -rng_inc;
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
226 clear_cache ();
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
227 reverse = true;
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
228 }
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
229
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
230 octave_idx_type tmp = reverse ? nel - 1 : 0;
7467
ba4214856f9f avoid shadow warning
John W. Eaton <jwe@octave.org>
parents: 7463
diff changeset
231 octave_idx_type stp = reverse ? -1 : 1;
7458
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
232
7467
ba4214856f9f avoid shadow warning
John W. Eaton <jwe@octave.org>
parents: 7463
diff changeset
233 for (octave_idx_type i = 0; i < nel; i++, tmp += stp)
7458
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
234 psidx[i] = tmp;
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
235
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
236 }
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
237
7620
36594d5bbe13 Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents: 7467
diff changeset
238 Matrix
36594d5bbe13 Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents: 7467
diff changeset
239 Range::diag (octave_idx_type k) const
36594d5bbe13 Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents: 7467
diff changeset
240 {
8971
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
241 return matrix_value ().diag (k);
7620
36594d5bbe13 Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents: 7467
diff changeset
242 }
36594d5bbe13 Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents: 7467
diff changeset
243
7458
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
244 Range
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
245 Range::sort (octave_idx_type dim, sortmode mode) const
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
246 {
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
247 Range retval = *this;
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
248
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
249 if (dim == 1)
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
250 {
7463
2467639bd8c0 eliminate UNDEFINED sort mode
John W. Eaton <jwe@octave.org>
parents: 7458
diff changeset
251 if (mode == ASCENDING)
10314
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
252 retval.sort_internal (true);
7463
2467639bd8c0 eliminate UNDEFINED sort mode
John W. Eaton <jwe@octave.org>
parents: 7458
diff changeset
253 else if (mode == DESCENDING)
10314
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
254 retval.sort_internal (false);
7458
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
255 }
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
256 else if (dim != 0)
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
257 (*current_liboctave_error_handler) ("Range::sort: invalid dimension");
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
258
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
259 return retval;
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
260 }
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
261
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
262 Range
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
263 Range::sort (Array<octave_idx_type>& sidx, octave_idx_type dim,
10314
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
264 sortmode mode) const
7458
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
265 {
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
266 Range retval = *this;
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
267
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
268 if (dim == 1)
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
269 {
7463
2467639bd8c0 eliminate UNDEFINED sort mode
John W. Eaton <jwe@octave.org>
parents: 7458
diff changeset
270 if (mode == ASCENDING)
10314
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
271 retval.sort_internal (sidx, true);
7463
2467639bd8c0 eliminate UNDEFINED sort mode
John W. Eaton <jwe@octave.org>
parents: 7458
diff changeset
272 else if (mode == DESCENDING)
10314
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
273 retval.sort_internal (sidx, false);
7458
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
274 }
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
275 else if (dim != 0)
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
276 (*current_liboctave_error_handler) ("Range::sort: invalid dimension");
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
277
1032e24f199f make sort work for ranges
John W. Eaton <jwe@octave.org>
parents: 7231
diff changeset
278 return retval;
208
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
279 }
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
280
8721
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8589
diff changeset
281 sortmode
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8589
diff changeset
282 Range::is_sorted (sortmode mode) const
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8589
diff changeset
283 {
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8589
diff changeset
284 if (rng_nelem > 1 && rng_inc < 0)
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8589
diff changeset
285 mode = (mode == ASCENDING) ? UNSORTED : DESCENDING;
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8589
diff changeset
286 else if (rng_nelem > 1 && rng_inc > 0)
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8589
diff changeset
287 mode = (mode == DESCENDING) ? UNSORTED : ASCENDING;
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8589
diff changeset
288 else
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8589
diff changeset
289 mode = mode ? mode : ASCENDING;
8742
d2b06871afac add missing return statement
Jaroslav Hajek <highegg@gmail.com>
parents: 8721
diff changeset
290
d2b06871afac add missing return statement
Jaroslav Hajek <highegg@gmail.com>
parents: 8721
diff changeset
291 return mode;
8721
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8589
diff changeset
292 }
e9cb742df9eb imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents: 8589
diff changeset
293
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
294 std::ostream&
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
295 operator << (std::ostream& os, const Range& a)
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
296 {
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
297 double b = a.base ();
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
298 double increment = a.inc ();
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5105
diff changeset
299 octave_idx_type num_elem = a.nelem ();
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
300
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5105
diff changeset
301 for (octave_idx_type i = 0; i < num_elem-1; i++)
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
302 os << b + i * increment << " ";
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
303
4791
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe]
jwe
parents: 4192
diff changeset
304 // Prevent overshoot. See comment in the matrix_value method
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe]
jwe
parents: 4192
diff changeset
305 // above.
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe]
jwe
parents: 4192
diff changeset
306
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe]
jwe
parents: 4192
diff changeset
307 os << (increment > 0 ? a.max () : a.min ()) << "\n";
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
308
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
309 return os;
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
310 }
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
311
3504
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
312 std::istream&
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe]
jwe
parents: 3503
diff changeset
313 operator >> (std::istream& is, Range& a)
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
314 {
208
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
315 is >> a.rng_base;
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
316 if (is)
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
317 {
208
380cb9ccc889 [project @ 1993-11-12 10:35:05 by jwe]
jwe
parents: 3
diff changeset
318 is >> a.rng_limit;
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
319 if (is)
10314
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
320 {
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
321 is >> a.rng_inc;
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
322 a.rng_nelem = a.nelem_internal ();
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
323 }
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
324 }
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
325
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
326 return is;
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
327 }
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
328
2599
9705ea40f0a2 [project @ 1996-12-19 04:49:09 by jwe]
jwe
parents: 2383
diff changeset
329 Range
9705ea40f0a2 [project @ 1996-12-19 04:49:09 by jwe]
jwe
parents: 2383
diff changeset
330 operator - (const Range& r)
9705ea40f0a2 [project @ 1996-12-19 04:49:09 by jwe]
jwe
parents: 2383
diff changeset
331 {
8589
0131fa223dbc make length invariant in range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 8565
diff changeset
332 return Range (-r.base (), -r.inc (), r.nelem ());
2599
9705ea40f0a2 [project @ 1996-12-19 04:49:09 by jwe]
jwe
parents: 2383
diff changeset
333 }
9705ea40f0a2 [project @ 1996-12-19 04:49:09 by jwe]
jwe
parents: 2383
diff changeset
334
8553
c7ff200e45f5 optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 7620
diff changeset
335 Range operator + (double x, const Range& r)
c7ff200e45f5 optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 7620
diff changeset
336 {
8971
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
337 Range result (x + r.base (), r.inc (), r.nelem ());
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
338 if (result.rng_nelem < 0)
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
339 result.cache = x + r.matrix_value ();
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
340
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
341 return result;
8553
c7ff200e45f5 optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 7620
diff changeset
342 }
c7ff200e45f5 optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 7620
diff changeset
343
c7ff200e45f5 optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 7620
diff changeset
344 Range operator + (const Range& r, double x)
c7ff200e45f5 optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 7620
diff changeset
345 {
8971
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
346 Range result (r.base () + x, r.inc (), r.nelem ());
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
347 if (result.rng_nelem < 0)
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
348 result.cache = r.matrix_value () + x;
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
349
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
350 return result;
8553
c7ff200e45f5 optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 7620
diff changeset
351 }
c7ff200e45f5 optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 7620
diff changeset
352
c7ff200e45f5 optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 7620
diff changeset
353 Range operator - (double x, const Range& r)
c7ff200e45f5 optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 7620
diff changeset
354 {
8971
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
355 Range result (x - r.base (), -r.inc (), r.nelem ());
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
356 if (result.rng_nelem < 0)
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
357 result.cache = x - r.matrix_value ();
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
358
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
359 return result;
8553
c7ff200e45f5 optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 7620
diff changeset
360 }
c7ff200e45f5 optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 7620
diff changeset
361
c7ff200e45f5 optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 7620
diff changeset
362 Range operator - (const Range& r, double x)
c7ff200e45f5 optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 7620
diff changeset
363 {
8971
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
364 Range result (r.base () - x, r.inc (), r.nelem ());
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
365 if (result.rng_nelem < 0)
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
366 result.cache = r.matrix_value () - x;
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
367
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
368 return result;
8553
c7ff200e45f5 optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 7620
diff changeset
369 }
c7ff200e45f5 optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 7620
diff changeset
370
c7ff200e45f5 optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 7620
diff changeset
371 Range operator * (double x, const Range& r)
c7ff200e45f5 optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 7620
diff changeset
372 {
8971
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
373 Range result (x * r.base (), x * r.inc (), r.nelem ());
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
374 if (result.rng_nelem < 0)
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
375 result.cache = x * r.matrix_value ();
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
376
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
377 return result;
8553
c7ff200e45f5 optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 7620
diff changeset
378 }
c7ff200e45f5 optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 7620
diff changeset
379
c7ff200e45f5 optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 7620
diff changeset
380 Range operator * (const Range& r, double x)
c7ff200e45f5 optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 7620
diff changeset
381 {
8971
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
382 Range result (r.base () * x, r.inc () * x, r.nelem ());
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
383 if (result.rng_nelem < 0)
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
384 result.cache = r.matrix_value () * x;
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
385
967a692ddfe2 fix range arithmetics
Jaroslav Hajek <highegg@gmail.com>
parents: 8920
diff changeset
386 return result;
8553
c7ff200e45f5 optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 7620
diff changeset
387 }
c7ff200e45f5 optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 7620
diff changeset
388
c7ff200e45f5 optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents: 7620
diff changeset
389
1546
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
390 // C See Knuth, Art Of Computer Programming, Vol. 1, Problem 1.2.4-5.
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
391 // C
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
392 // C===Tolerant FLOOR function.
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
393 // C
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
394 // C X - is given as a Double Precision argument to be operated on.
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
395 // C It is assumed that X is represented with M mantissa bits.
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
396 // C CT - is given as a Comparison Tolerance such that
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
397 // C 0.LT.CT.LE.3-SQRT(5)/2. If the relative difference between
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
398 // C X and A whole number is less than CT, then TFLOOR is
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
399 // C returned as this whole number. By treating the
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
400 // C floating-point numbers as a finite ordered set note that
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
401 // C the heuristic EPS=2.**(-(M-1)) and CT=3*EPS causes
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
402 // C arguments of TFLOOR/TCEIL to be treated as whole numbers
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
403 // C if they are exactly whole numbers or are immediately
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
404 // C adjacent to whole number representations. Since EPS, the
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
405 // C "distance" between floating-point numbers on the unit
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
406 // C interval, and M, the number of bits in X'S mantissa, exist
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
407 // C on every floating-point computer, TFLOOR/TCEIL are
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
408 // C consistently definable on every floating-point computer.
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
409 // C
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
410 // C For more information see the following references:
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
411 // C (1) P. E. Hagerty, "More On Fuzzy Floor And Ceiling," APL QUOTE
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
412 // C QUAD 8(4):20-24, June 1978. Note that TFLOOR=FL5.
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
413 // C (2) L. M. Breed, "Definitions For Fuzzy Floor And Ceiling", APL
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
414 // C QUOTE QUAD 8(3):16-23, March 1978. This paper cites FL1 through
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
415 // C FL5, the history of five years of evolutionary development of
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
416 // C FL5 - the seven lines of code below - by open collaboration
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
417 // C and corroboration of the mathematical-computing community.
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
418 // C
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
419 // C Penn State University Center for Academic Computing
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
420 // C H. D. Knoble - August, 1978.
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
421
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
422 static inline double
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
423 tfloor (double x, double ct)
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
424 {
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
425 // C---------FLOOR(X) is the largest integer algebraically less than
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
426 // C or equal to X; that is, the unfuzzy FLOOR function.
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
427
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
428 // DINT (X) = X - DMOD (X, 1.0);
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
429 // FLOOR (X) = DINT (X) - DMOD (2.0 + DSIGN (1.0, X), 3.0);
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
430
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
431 // C---------Hagerty's FL5 function follows...
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
432
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
433 double q = 1.0;
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
434
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
435 if (x < 0.0)
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
436 q = 1.0 - ct;
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
437
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
438 double rmax = q / (2.0 - ct);
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
439
11450
5eb10763069f substitute and use LAPACK_LIBS in mkoctfile script
John W. Eaton <jwe@octave.org>
parents: 10366
diff changeset
440 double t1 = 1.0 + gnulib::floor (x);
1546
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
441 t1 = (ct / q) * (t1 < 0.0 ? -t1 : t1);
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
442 t1 = rmax < t1 ? rmax : t1;
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
443 t1 = ct > t1 ? ct : t1;
11450
5eb10763069f substitute and use LAPACK_LIBS in mkoctfile script
John W. Eaton <jwe@octave.org>
parents: 10366
diff changeset
444 t1 = gnulib::floor (x + t1);
1546
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
445
1555
6935e817fd25 [project @ 1995-10-11 05:49:55 by jwe]
jwe
parents: 1548
diff changeset
446 if (x <= 0.0 || (t1 - x) < rmax)
1546
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
447 return t1;
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
448 else
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
449 return t1 - 1.0;
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
450 }
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
451
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
452 static inline double
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
453 tceil (double x, double ct)
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
454 {
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
455 return -tfloor (-x, ct);
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
456 }
a272c4056bab [project @ 1995-10-07 03:38:40 by jwe]
jwe
parents: 1367
diff changeset
457
3753
f751e43de300 [project @ 2000-12-14 03:01:23 by jwe]
jwe
parents: 3751
diff changeset
458 static inline bool
f751e43de300 [project @ 2000-12-14 03:01:23 by jwe]
jwe
parents: 3751
diff changeset
459 teq (double u, double v, double ct = 3.0 * DBL_EPSILON)
f751e43de300 [project @ 2000-12-14 03:01:23 by jwe]
jwe
parents: 3751
diff changeset
460 {
f751e43de300 [project @ 2000-12-14 03:01:23 by jwe]
jwe
parents: 3751
diff changeset
461 double tu = fabs (u);
f751e43de300 [project @ 2000-12-14 03:01:23 by jwe]
jwe
parents: 3751
diff changeset
462 double tv = fabs (v);
f751e43de300 [project @ 2000-12-14 03:01:23 by jwe]
jwe
parents: 3751
diff changeset
463
f751e43de300 [project @ 2000-12-14 03:01:23 by jwe]
jwe
parents: 3751
diff changeset
464 return fabs (u - v) < ((tu > tv ? tu : tv) * ct);
f751e43de300 [project @ 2000-12-14 03:01:23 by jwe]
jwe
parents: 3751
diff changeset
465 }
f751e43de300 [project @ 2000-12-14 03:01:23 by jwe]
jwe
parents: 3751
diff changeset
466
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5105
diff changeset
467 octave_idx_type
1360
7eb93d12654c [project @ 1995-09-05 21:51:54 by jwe]
jwe
parents: 1315
diff changeset
468 Range::nelem_internal (void) const
7eb93d12654c [project @ 1995-09-05 21:51:54 by jwe]
jwe
parents: 1315
diff changeset
469 {
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5105
diff changeset
470 octave_idx_type retval = -1;
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
471
3858
de05e6bdf897 [project @ 2001-11-08 19:34:22 by jwe]
jwe
parents: 3753
diff changeset
472 if (rng_inc == 0
de05e6bdf897 [project @ 2001-11-08 19:34:22 by jwe]
jwe
parents: 3753
diff changeset
473 || (rng_limit > rng_base && rng_inc < 0)
de05e6bdf897 [project @ 2001-11-08 19:34:22 by jwe]
jwe
parents: 3753
diff changeset
474 || (rng_limit < rng_base && rng_inc > 0))
de05e6bdf897 [project @ 2001-11-08 19:34:22 by jwe]
jwe
parents: 3753
diff changeset
475 {
de05e6bdf897 [project @ 2001-11-08 19:34:22 by jwe]
jwe
parents: 3753
diff changeset
476 retval = 0;
de05e6bdf897 [project @ 2001-11-08 19:34:22 by jwe]
jwe
parents: 3753
diff changeset
477 }
de05e6bdf897 [project @ 2001-11-08 19:34:22 by jwe]
jwe
parents: 3753
diff changeset
478 else
de05e6bdf897 [project @ 2001-11-08 19:34:22 by jwe]
jwe
parents: 3753
diff changeset
479 {
de05e6bdf897 [project @ 2001-11-08 19:34:22 by jwe]
jwe
parents: 3753
diff changeset
480 double ct = 3.0 * DBL_EPSILON;
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
481
3858
de05e6bdf897 [project @ 2001-11-08 19:34:22 by jwe]
jwe
parents: 3753
diff changeset
482 double tmp = tfloor ((rng_limit - rng_base + rng_inc) / rng_inc, ct);
de05e6bdf897 [project @ 2001-11-08 19:34:22 by jwe]
jwe
parents: 3753
diff changeset
483
5275
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe]
jwe
parents: 5105
diff changeset
484 octave_idx_type n_elt = (tmp > 0.0 ? static_cast<octave_idx_type> (tmp) : 0);
398
167ea9ebd5a0 [project @ 1994-04-06 18:41:44 by jwe]
jwe
parents: 238
diff changeset
485
3858
de05e6bdf897 [project @ 2001-11-08 19:34:22 by jwe]
jwe
parents: 3753
diff changeset
486 // If the final element that we would compute for the range is
de05e6bdf897 [project @ 2001-11-08 19:34:22 by jwe]
jwe
parents: 3753
diff changeset
487 // equal to the limit of the range, or is an adjacent floating
de05e6bdf897 [project @ 2001-11-08 19:34:22 by jwe]
jwe
parents: 3753
diff changeset
488 // point number, accept it. Otherwise, try a range with one
de05e6bdf897 [project @ 2001-11-08 19:34:22 by jwe]
jwe
parents: 3753
diff changeset
489 // fewer element. If that fails, try again with one more
de05e6bdf897 [project @ 2001-11-08 19:34:22 by jwe]
jwe
parents: 3753
diff changeset
490 // element.
de05e6bdf897 [project @ 2001-11-08 19:34:22 by jwe]
jwe
parents: 3753
diff changeset
491 //
de05e6bdf897 [project @ 2001-11-08 19:34:22 by jwe]
jwe
parents: 3753
diff changeset
492 // I'm not sure this is very good, but it seems to work better than
de05e6bdf897 [project @ 2001-11-08 19:34:22 by jwe]
jwe
parents: 3753
diff changeset
493 // just using tfloor as above. For example, without it, the
de05e6bdf897 [project @ 2001-11-08 19:34:22 by jwe]
jwe
parents: 3753
diff changeset
494 // expression 1.8:0.05:1.9 fails to produce the expected result of
de05e6bdf897 [project @ 2001-11-08 19:34:22 by jwe]
jwe
parents: 3753
diff changeset
495 // [1.8, 1.85, 1.9].
3753
f751e43de300 [project @ 2000-12-14 03:01:23 by jwe]
jwe
parents: 3751
diff changeset
496
3858
de05e6bdf897 [project @ 2001-11-08 19:34:22 by jwe]
jwe
parents: 3753
diff changeset
497 if (! teq (rng_base + (n_elt - 1) * rng_inc, rng_limit))
10314
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
498 {
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
499 if (teq (rng_base + (n_elt - 2) * rng_inc, rng_limit))
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
500 n_elt--;
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
501 else if (teq (rng_base + n_elt * rng_inc, rng_limit))
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
502 n_elt++;
07ebe522dac2 untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents: 10158
diff changeset
503 }
3858
de05e6bdf897 [project @ 2001-11-08 19:34:22 by jwe]
jwe
parents: 3753
diff changeset
504
6490
0ad7655cf2bc [project @ 2007-04-05 02:44:34 by jwe]
jwe
parents: 6457
diff changeset
505 retval = (n_elt >= std::numeric_limits<octave_idx_type>::max () - 1) ? -1 : n_elt;
3753
f751e43de300 [project @ 2000-12-14 03:01:23 by jwe]
jwe
parents: 3751
diff changeset
506 }
f751e43de300 [project @ 2000-12-14 03:01:23 by jwe]
jwe
parents: 3751
diff changeset
507
3858
de05e6bdf897 [project @ 2001-11-08 19:34:22 by jwe]
jwe
parents: 3753
diff changeset
508 return retval;
3
9a4c07481e61 [project @ 1993-08-08 01:20:23 by jwe]
jwe
parents:
diff changeset
509 }