Mercurial > hg > octave-lyh
annotate liboctave/array/Range.h @ 16169:0303fda3e929
Fix range behavior with -0 endpoints (bug #38423)
* libinterp/interpfcn/pr-output.cc(octave_print_internal): print base
or limit of range rather than using expression base+i*increment
which can destroy the signbit of base/limit.
* liboctave/array/Range.cc(Range constructor): Move trivial 2-line constructor
to .h file.
* liboctave/array/Range.cc(matrix_value, checkelem): Return base for first
element of array. Return limit of range for end of array if appropriate.
* liboctave/array/Range.cc(elem): Move function from Range.h Return base for
first element of array. Return limit of range for end of array if appropriate.
* liboctave/array/Range.cc(_rangeindex_helper, index): Return base for first
element of array. Return limit of range for end of array if appropriate.
* liboctave/array/Range.cc(min, max): Use '<=' or '>=' tests to
return base or limit if appropriate.
* liboctave/array/Range.cc(is_sorted): Place more common test first in
if/else if/else tree.
* liboctave/array/Range.cc(operator <<): Return base for first
element of array. Return limit of range for end of array if appropriate.
liboctave/array/Range.h(Range constructor): Put trivial 2-line constructor
in .h file.
liboctave/array/Range.h(elem): Move function which has become more complicated
to Range.cc.
* test/range.tst: Add %!tests for corner cases of base and limit of range.
| author | Rik <rik@octave.org> |
|---|---|
| date | Fri, 01 Mar 2013 14:06:02 -0800 |
| parents | 648dabbb4c6b |
| children |
| rev | line source |
|---|---|
| 3 | 1 /* |
| 2 | |
|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
3 Copyright (C) 1993-2012 John W. Eaton |
| 3 | 4 |
| 5 This file is part of Octave. | |
| 6 | |
| 7 Octave is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
| 10 option) any later version. | |
| 3 | 11 |
| 12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 7016 | 18 along with Octave; see the file COPYING. If not, see |
| 19 <http://www.gnu.org/licenses/>. | |
| 3 | 20 |
| 21 */ | |
| 22 | |
| 382 | 23 #if !defined (octave_Range_h) |
| 24 #define octave_Range_h 1 | |
| 25 | |
|
8950
d865363208d6
include <iosfwd> instead of <iostream> in header files
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
26 #include <iosfwd> |
| 7458 | 27 |
| 4810 | 28 #include "dMatrix.h" |
| 7458 | 29 #include "oct-sort.h" |
| 3 | 30 |
| 1860 | 31 class |
| 6108 | 32 OCTAVE_API |
| 1860 | 33 Range |
| 3 | 34 { |
| 35 public: | |
| 1860 | 36 |
| 1528 | 37 Range (void) |
| 5347 | 38 : rng_base (0), rng_limit (0), rng_inc (0), rng_nelem (0), cache (1, 0) { } |
| 1528 | 39 |
| 40 Range (const Range& r) | |
| 1860 | 41 : rng_base (r.rng_base), rng_limit (r.rng_limit), rng_inc (r.rng_inc), |
| 8971 | 42 rng_nelem (r.rng_nelem), cache (r.cache) { } |
| 3 | 43 |
| 1528 | 44 Range (double b, double l) |
| 1860 | 45 : rng_base (b), rng_limit (l), rng_inc (1), |
| 4811 | 46 rng_nelem (nelem_internal ()), cache () { } |
| 1528 | 47 |
| 48 Range (double b, double l, double i) | |
| 1860 | 49 : rng_base (b), rng_limit (l), rng_inc (i), |
| 4811 | 50 rng_nelem (nelem_internal ()), cache () { } |
| 1528 | 51 |
|
8589
0131fa223dbc
make length invariant in range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8553
diff
changeset
|
52 // For operators' usage (to preserve element count). |
|
16169
0303fda3e929
Fix range behavior with -0 endpoints (bug #38423)
Rik <rik@octave.org>
parents:
15271
diff
changeset
|
53 Range (double b, double i, octave_idx_type n) |
|
0303fda3e929
Fix range behavior with -0 endpoints (bug #38423)
Rik <rik@octave.org>
parents:
15271
diff
changeset
|
54 : rng_base (b), rng_limit (b + (n-1) * i), rng_inc (i), |
|
0303fda3e929
Fix range behavior with -0 endpoints (bug #38423)
Rik <rik@octave.org>
parents:
15271
diff
changeset
|
55 rng_nelem (n), cache () |
|
0303fda3e929
Fix range behavior with -0 endpoints (bug #38423)
Rik <rik@octave.org>
parents:
15271
diff
changeset
|
56 { |
|
0303fda3e929
Fix range behavior with -0 endpoints (bug #38423)
Rik <rik@octave.org>
parents:
15271
diff
changeset
|
57 if (! xfinite (b) || ! xfinite (i)) |
|
0303fda3e929
Fix range behavior with -0 endpoints (bug #38423)
Rik <rik@octave.org>
parents:
15271
diff
changeset
|
58 rng_nelem = -2; |
|
0303fda3e929
Fix range behavior with -0 endpoints (bug #38423)
Rik <rik@octave.org>
parents:
15271
diff
changeset
|
59 } |
|
8589
0131fa223dbc
make length invariant in range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
8553
diff
changeset
|
60 |
| 4811 | 61 double base (void) const { return rng_base; } |
| 1528 | 62 double limit (void) const { return rng_limit; } |
| 4811 | 63 double inc (void) const { return rng_inc; } |
| 5275 | 64 octave_idx_type nelem (void) const { return rng_nelem; } |
| 3 | 65 |
| 2383 | 66 bool all_elements_are_ints (void) const; |
| 67 | |
| 645 | 68 Matrix matrix_value (void) const; |
| 69 | |
| 3 | 70 double min (void) const; |
| 71 double max (void) const; | |
| 72 | |
| 7458 | 73 void sort_internal (bool ascending = true); |
| 74 void sort_internal (Array<octave_idx_type>& sidx, bool ascending = true); | |
| 75 | |
|
7620
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7463
diff
changeset
|
76 Matrix diag (octave_idx_type k = 0) const; |
|
36594d5bbe13
Move diag function into the octave_value class
David Bateman <dbateman@free.fr>
parents:
7463
diff
changeset
|
77 |
|
7463
2467639bd8c0
eliminate UNDEFINED sort mode
John W. Eaton <jwe@octave.org>
parents:
7458
diff
changeset
|
78 Range sort (octave_idx_type dim = 0, sortmode mode = ASCENDING) const; |
| 7458 | 79 |
| 80 Range sort (Array<octave_idx_type>& sidx, octave_idx_type dim = 0, | |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
81 sortmode mode = ASCENDING) const; |
| 208 | 82 |
|
8721
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8589
diff
changeset
|
83 sortmode is_sorted (sortmode mode = ASCENDING) const; |
|
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8589
diff
changeset
|
84 |
|
9986
672e1b49e01e
optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents:
8971
diff
changeset
|
85 // Support for single-index subscripting, without generating matrix cache. |
|
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 double checkelem (octave_idx_type i) const; |
|
672e1b49e01e
optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents:
8971
diff
changeset
|
88 |
|
16169
0303fda3e929
Fix range behavior with -0 endpoints (bug #38423)
Rik <rik@octave.org>
parents:
15271
diff
changeset
|
89 double elem (octave_idx_type i) const; |
|
9986
672e1b49e01e
optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents:
8971
diff
changeset
|
90 |
|
672e1b49e01e
optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents:
8971
diff
changeset
|
91 Array<double> index (const idx_vector& i) const; |
|
672e1b49e01e
optimize indexing of ranges by single subscripts
Jaroslav Hajek <highegg@gmail.com>
parents:
8971
diff
changeset
|
92 |
| 4811 | 93 void set_base (double b) |
| 94 { | |
| 95 if (rng_base != b) | |
| 96 { | |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
97 rng_base = b; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
98 clear_cache (); |
| 4811 | 99 } |
| 100 } | |
| 101 | |
| 102 void set_limit (double l) | |
| 103 { | |
| 104 if (rng_limit != l) | |
| 105 { | |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
106 rng_limit = l; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
107 clear_cache (); |
| 4811 | 108 } |
| 109 } | |
| 110 | |
| 111 void set_inc (double i) | |
| 112 { | |
| 113 if (rng_inc != i) | |
| 114 { | |
|
10312
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
115 rng_inc = i; |
|
cbc402e64d83
untabify liboctave header files
John W. Eaton <jwe@octave.org>
parents:
10158
diff
changeset
|
116 clear_cache (); |
| 4811 | 117 } |
| 118 } | |
| 1528 | 119 |
| 6108 | 120 friend OCTAVE_API std::ostream& operator << (std::ostream& os, const Range& r); |
| 121 friend OCTAVE_API std::istream& operator >> (std::istream& is, Range& r); | |
| 3 | 122 |
| 8971 | 123 friend OCTAVE_API Range operator - (const Range& r); |
| 124 friend OCTAVE_API Range operator + (double x, const Range& r); | |
| 125 friend OCTAVE_API Range operator + (const Range& r, double x); | |
| 126 friend OCTAVE_API Range operator - (double x, const Range& r); | |
| 127 friend OCTAVE_API Range operator - (const Range& r, double x); | |
| 128 friend OCTAVE_API Range operator * (double x, const Range& r); | |
| 129 friend OCTAVE_API Range operator * (const Range& r, double x); | |
| 130 | |
| 3 | 131 void print_range (void); |
| 132 | |
| 133 private: | |
| 1860 | 134 |
| 208 | 135 double rng_base; |
| 136 double rng_limit; | |
| 137 double rng_inc; | |
| 1860 | 138 |
| 5275 | 139 octave_idx_type rng_nelem; |
| 3 | 140 |
| 4811 | 141 mutable Matrix cache; |
| 142 | |
| 5275 | 143 octave_idx_type nelem_internal (void) const; |
| 4811 | 144 |
| 145 void clear_cache (void) const { cache.resize (0, 0); } | |
| 8971 | 146 |
| 3 | 147 }; |
| 148 | |
| 6108 | 149 extern OCTAVE_API Range operator - (const Range& r); |
| 2599 | 150 |
|
8553
c7ff200e45f5
optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
7620
diff
changeset
|
151 extern OCTAVE_API Range operator + (double x, const Range& r); |
|
c7ff200e45f5
optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
7620
diff
changeset
|
152 |
|
c7ff200e45f5
optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
7620
diff
changeset
|
153 extern OCTAVE_API Range operator + (const Range& r, double x); |
|
c7ff200e45f5
optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
7620
diff
changeset
|
154 |
|
c7ff200e45f5
optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
7620
diff
changeset
|
155 extern OCTAVE_API Range operator - (double x, const Range& r); |
|
c7ff200e45f5
optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
7620
diff
changeset
|
156 |
|
c7ff200e45f5
optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
7620
diff
changeset
|
157 extern OCTAVE_API Range operator - (const Range& r, double x); |
|
c7ff200e45f5
optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
7620
diff
changeset
|
158 |
|
c7ff200e45f5
optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
7620
diff
changeset
|
159 extern OCTAVE_API Range operator * (double x, const Range& r); |
|
c7ff200e45f5
optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
7620
diff
changeset
|
160 |
|
c7ff200e45f5
optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
7620
diff
changeset
|
161 extern OCTAVE_API Range operator * (const Range& r, double x); |
|
c7ff200e45f5
optimize range-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
7620
diff
changeset
|
162 |
| 3 | 163 #endif |