Mercurial > hg > octave-lyh
annotate liboctave/Array-d.cc @ 13502:751bbbcfd6e3
Renamed project files and target binary to octave-gui.
author | Jacob Dawid <jacob.dawid@googlemail.com> |
---|---|
date | Sun, 17 Jul 2011 18:12:23 +0200 |
parents | 12df7854fa7c |
children | 72c96de7a403 |
rev | line source |
---|---|
757 | 1 /* |
2 | |
11523 | 3 Copyright (C) 1994-2011 John W. Eaton |
10521
4d1fc073fbb7
add some missing copyright stmts
Jaroslav Hajek <highegg@gmail.com>
parents:
10374
diff
changeset
|
4 Copyright (C) 2009 VZLU Prague |
757 | 5 |
6 This file is part of Octave. | |
7 | |
8 Octave is free software; you can redistribute it and/or modify it | |
9 under the terms of the GNU General Public License as published by the | |
7016 | 10 Free Software Foundation; either version 3 of the License, or (at your |
11 option) any later version. | |
757 | 12 |
13 Octave is distributed in the hope that it will be useful, but WITHOUT | |
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
16 for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
7016 | 19 along with Octave; see the file COPYING. If not, see |
20 <http://www.gnu.org/licenses/>. | |
757 | 21 |
22 */ | |
23 | |
2006 | 24 #ifdef HAVE_CONFIG_H |
25 #include <config.h> | |
26 #endif | |
27 | |
757 | 28 // Instantiate Arrays of double values. |
29 | |
9003
0631d397fbe0
replace lo_ieee_isnan by xisnan, add missing includes
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
30 #include "lo-mappers.h" |
757 | 31 #include "Array.h" |
32 #include "Array.cc" | |
8377
25bc2d31e1bf
improve OCTAVE_LOCAL_BUFFER
Jaroslav Hajek <highegg@gmail.com>
parents:
8290
diff
changeset
|
33 #include "oct-locbuf.h" |
7433 | 34 |
8700 | 35 #define INLINE_ASCENDING_SORT |
36 #define INLINE_DESCENDING_SORT | |
37 #include "oct-sort.cc" | |
7433 | 38 |
39 template <> | |
8725 | 40 inline bool |
41 sort_isnan<double> (double x) | |
7433 | 42 { |
9003
0631d397fbe0
replace lo_ieee_isnan by xisnan, add missing includes
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
43 return xisnan (x); |
7433 | 44 } |
45 | |
8725 | 46 static bool |
47 nan_ascending_compare (double x, double y) | |
8721
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
48 { |
9003
0631d397fbe0
replace lo_ieee_isnan by xisnan, add missing includes
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
49 return xisnan (y) ? ! xisnan (x) : x < y; |
8721
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
50 } |
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
51 |
8725 | 52 static bool |
53 nan_descending_compare (double x, double y) | |
8721
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
54 { |
9003
0631d397fbe0
replace lo_ieee_isnan by xisnan, add missing includes
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
55 return xisnan (x) ? ! xisnan (y) : x > y; |
8721
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
56 } |
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
57 |
8725 | 58 Array<double>::compare_fcn_type |
9920
56fbe170d354
fix issorted with NaNs in middle
Jaroslav Hajek <highegg@gmail.com>
parents:
9732
diff
changeset
|
59 safe_comparator (sortmode mode, const Array<double>& a , bool allow_chk) |
8721
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
60 { |
8725 | 61 Array<double>::compare_fcn_type result = 0; |
8721
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
62 |
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
63 if (allow_chk) |
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
64 { |
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
65 octave_idx_type k = 0; |
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
66 for (; k < a.numel () && ! xisnan (a(k)); k++) ; |
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
67 if (k == a.numel ()) |
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
68 { |
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
69 if (mode == ASCENDING) |
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
70 result = octave_sort<double>::ascending_compare; |
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
71 else if (mode == DESCENDING) |
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
72 result = octave_sort<double>::descending_compare; |
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
73 } |
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
74 } |
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
75 |
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
76 if (! result) |
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
77 { |
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
78 if (mode == ASCENDING) |
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
79 result = nan_ascending_compare; |
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
80 else if (mode == DESCENDING) |
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
81 result = nan_descending_compare; |
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
82 } |
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
83 |
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
84 return result; |
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
85 } |
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
86 |
9922
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
87 // The default solution using NaN-safe comparator is OK, but almost twice as |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
88 // slow than this code. |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
89 template <> |
9941
1369f13ae6b2
several fixes by M. Goffioul
Jaroslav Hajek <highegg@gmail.com>
parents:
9922
diff
changeset
|
90 OCTAVE_API |
9922
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
91 sortmode |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
92 Array<double>::is_sorted (sortmode mode) const |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
93 { |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
94 octave_idx_type n = numel (); |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
95 |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
96 const double *el = data (); |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
97 |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
98 if (n <= 1) |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
99 return mode ? mode : ASCENDING; |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
100 |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
101 if (! mode) |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
102 { |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
103 // Auto-detect mode. |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
104 if (el[n-1] < el[0] || xisnan (el[0])) |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
105 mode = DESCENDING; |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
106 else |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
107 mode = ASCENDING; |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
108 } |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
109 |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
110 if (mode == DESCENDING) |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
111 { |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
112 octave_idx_type j = 0; |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
113 double r; |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
114 // Sort out NaNs. |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
115 do |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
116 r = el[j++]; |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
117 while (xisnan (r) && j < n); |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
118 |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
119 // Orient the test so that NaN will not pass through. |
9922
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
120 for (; j < n; j++) |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
121 { |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
122 if (r >= el[j]) |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
123 r = el[j]; |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
124 else |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
125 { |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
126 mode = UNSORTED; |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
127 break; |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
128 } |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
129 } |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
130 |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
131 } |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
132 else if (mode == ASCENDING) |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
133 { |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
134 // Sort out NaNs. |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
135 while (n > 0 && xisnan (el[n-1])) |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
136 n--; |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
137 |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
138 if (n > 0) |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
139 { |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
140 // Orient the test so that NaN will not pass through. |
9922
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
141 double r = el[0]; |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
142 for (octave_idx_type j = 1; j < n; j++) |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
143 { |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
144 if (r <= el[j]) |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
145 r = el[j]; |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
146 else |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
147 { |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
148 mode = UNSORTED; |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
149 break; |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
150 } |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
151 } |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
152 } |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
153 } |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
154 |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
155 return mode; |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
156 } |
3a8327d51ed4
optimize issorted for doubles & floats
Jaroslav Hajek <highegg@gmail.com>
parents:
9920
diff
changeset
|
157 |
7433 | 158 INSTANTIATE_ARRAY_SORT (double); |
159 | |
8721
e9cb742df9eb
imported patch sort3.diff
Jaroslav Hajek <highegg@gmail.com>
parents:
8700
diff
changeset
|
160 INSTANTIATE_ARRAY (double, OCTAVE_API); |
3836 | 161 |
9732
b4fdfee405b5
remove ArrayN<T> + fix nonhom. diag-scalar ops
Jaroslav Hajek <highegg@gmail.com>
parents:
9287
diff
changeset
|
162 template OCTAVE_API std::ostream& operator << (std::ostream&, const Array<double>&); |
3665 | 163 |
1989 | 164 #include "DiagArray2.h" |
165 #include "DiagArray2.cc" | |
166 | |
6153 | 167 template class OCTAVE_API DiagArray2<double>; |