1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
|
Index: gecode-6.2.0/Makefile.in
===================================================================
--- gecode-6.2.0.orig/Makefile.in 2019-12-15 17:13:56.971198754 +0200
+++ gecode-6.2.0/Makefile.in 2019-12-15 17:13:56.967198885 +0200
@@ -998,8 +998,7 @@
numeric/interval.hpp \
LICENSE_1_0.txt \
limits.hpp non_type.hpp type.hpp
-THIRDHDR = \
- $(BOOSTHDR:%=gecode/third-party/boost/%)
+THIRDHDR =
#
# COLLECTING ALL
Index: gecode-6.2.0/gecode/float.hh
===================================================================
--- gecode-6.2.0.orig/gecode/float.hh 2019-12-15 17:13:56.971198754 +0200
+++ gecode-6.2.0/gecode/float.hh 2019-12-15 17:14:23.462332109 +0200
@@ -77,7 +77,7 @@
#endif
// Include interval implementation
-#include <gecode/third-party/boost/numeric/interval.hpp>
+#include <boost/numeric/interval.hpp>
/**
* \namespace Gecode::Float
@@ -135,13 +135,13 @@
*
*/
/// Rounding Base class (safe version)
- typedef gecode_boost::numeric::interval_lib::save_state< gecode_boost::numeric::interval_lib::rounded_arith_std<FloatNum> >
+ typedef boost::numeric::interval_lib::save_state< boost::numeric::interval_lib::rounded_arith_std<FloatNum> >
RoundingBase;
#else
/// Rounding Base class (optimized version)
- typedef gecode_boost::numeric::interval_lib::rounded_arith_opp<FloatNum>
+ typedef boost::numeric::interval_lib::rounded_arith_opp<FloatNum>
RoundingBase;
#endif
@@ -413,13 +413,13 @@
friend FloatVal Float::hull(const FloatNum& x, const FloatNum& y);
protected:
/// Used rounding policies
- typedef gecode_boost::numeric::interval_lib::save_state<Float::Rounding> R;
+ typedef boost::numeric::interval_lib::save_state<Float::Rounding> R;
/// Used checking policy
- typedef gecode_boost::numeric::interval_lib::checking_strict<FloatNum> P;
+ typedef boost::numeric::interval_lib::checking_strict<FloatNum> P;
/// Implementation type for float value
- typedef gecode_boost::numeric::interval
+ typedef boost::numeric::interval
<FloatNum,
- gecode_boost::numeric::interval_lib::policies<R, P> >
+ boost::numeric::interval_lib::policies<R, P> >
FloatValImpType;
/// Implementation of float value
FloatValImpType x;
Index: gecode-6.2.0/gecode/float/num.hpp
===================================================================
--- gecode-6.2.0.orig/gecode/float/num.hpp 2019-12-15 17:13:56.971198754 +0200
+++ gecode-6.2.0/gecode/float/num.hpp 2019-12-15 17:13:56.967198885 +0200
@@ -35,27 +35,27 @@
forceinline FloatNum
pi_half_lower(void) {
- return gecode_boost::numeric::interval_lib::constants::pi_half_lower<FloatNum>();
+ return boost::numeric::interval_lib::constants::pi_half_lower<FloatNum>();
}
forceinline FloatNum
pi_half_upper(void) {
- return gecode_boost::numeric::interval_lib::constants::pi_half_upper<FloatNum>();
+ return boost::numeric::interval_lib::constants::pi_half_upper<FloatNum>();
}
forceinline FloatNum
pi_lower(void) {
- return gecode_boost::numeric::interval_lib::constants::pi_lower<FloatNum>();
+ return boost::numeric::interval_lib::constants::pi_lower<FloatNum>();
}
forceinline FloatNum
pi_upper(void) {
- return gecode_boost::numeric::interval_lib::constants::pi_upper<FloatNum>();
+ return boost::numeric::interval_lib::constants::pi_upper<FloatNum>();
}
forceinline FloatNum
pi_twice_lower(void) {
- return gecode_boost::numeric::interval_lib::constants::pi_twice_lower<FloatNum>();
+ return boost::numeric::interval_lib::constants::pi_twice_lower<FloatNum>();
}
forceinline FloatNum
pi_twice_upper(void) {
- return gecode_boost::numeric::interval_lib::constants::pi_twice_upper<FloatNum>();
+ return boost::numeric::interval_lib::constants::pi_twice_upper<FloatNum>();
}
}
Index: gecode-6.2.0/gecode/float/val.hpp
===================================================================
--- gecode-6.2.0.orig/gecode/float/val.hpp 2019-12-15 17:13:56.971198754 +0200
+++ gecode-6.2.0/gecode/float/val.hpp 2019-12-15 17:13:56.967198885 +0200
@@ -76,29 +76,29 @@
}
forceinline FloatNum
FloatVal::size(void) const {
- return gecode_boost::numeric::width(x);
+ return boost::numeric::width(x);
}
forceinline FloatNum
FloatVal::med(void) const {
- return gecode_boost::numeric::median(x);
+ return boost::numeric::median(x);
}
forceinline bool
FloatVal::tight(void) const {
- return (gecode_boost::numeric::singleton(x) ||
+ return (boost::numeric::singleton(x) ||
(nextafter(x.lower(),x.upper()) == x.upper()));
}
forceinline bool
FloatVal::singleton(void) const {
- return gecode_boost::numeric::singleton(x);
+ return boost::numeric::singleton(x);
}
forceinline bool
FloatVal::in(FloatNum n) const {
- return gecode_boost::numeric::in(n,x);
+ return boost::numeric::in(n,x);
}
forceinline bool
FloatVal::zero_in(void) const {
- return gecode_boost::numeric::zero_in(x);
+ return boost::numeric::zero_in(x);
}
forceinline FloatVal
@@ -107,17 +107,17 @@
}
forceinline FloatVal
FloatVal::pi_half(void) {
- FloatVal p(gecode_boost::numeric::interval_lib::pi_half<FloatValImpType>());
+ FloatVal p(boost::numeric::interval_lib::pi_half<FloatValImpType>());
return p;
}
forceinline FloatVal
FloatVal::pi(void) {
- FloatVal p(gecode_boost::numeric::interval_lib::pi<FloatValImpType>());
+ FloatVal p(boost::numeric::interval_lib::pi<FloatValImpType>());
return p;
}
forceinline FloatVal
FloatVal::pi_twice(void) {
- FloatVal p(gecode_boost::numeric::interval_lib::pi_twice<FloatValImpType>());
+ FloatVal p(boost::numeric::interval_lib::pi_twice<FloatValImpType>());
return p;
}
@@ -226,7 +226,7 @@
operator <(const FloatVal& x, const FloatVal& y) {
try {
return x.x < y.x;
- } catch (gecode_boost::numeric::interval_lib::comparison_error&) {
+ } catch (boost::numeric::interval_lib::comparison_error&) {
return false;
}
}
@@ -234,7 +234,7 @@
operator <(const FloatVal& x, const FloatNum& y) {
try {
return x.x < y;
- } catch (gecode_boost::numeric::interval_lib::comparison_error&) {
+ } catch (boost::numeric::interval_lib::comparison_error&) {
return false;
}
}
@@ -243,7 +243,7 @@
operator <=(const FloatVal& x, const FloatVal& y) {
try {
return x.x <= y.x;
- } catch (gecode_boost::numeric::interval_lib::comparison_error&) {
+ } catch (boost::numeric::interval_lib::comparison_error&) {
return false;
}
}
@@ -251,7 +251,7 @@
operator <=(const FloatVal& x, const FloatNum& y) {
try {
return x.x <= y;
- } catch (gecode_boost::numeric::interval_lib::comparison_error&) {
+ } catch (boost::numeric::interval_lib::comparison_error&) {
return false;
}
}
@@ -260,7 +260,7 @@
operator >(const FloatVal& x, const FloatVal& y) {
try {
return x.x > y.x;
- } catch (gecode_boost::numeric::interval_lib::comparison_error&) {
+ } catch (boost::numeric::interval_lib::comparison_error&) {
return false;
}
}
@@ -268,7 +268,7 @@
operator >(const FloatVal& x, const FloatNum& y) {
try {
return x.x > y;
- } catch (gecode_boost::numeric::interval_lib::comparison_error&) {
+ } catch (boost::numeric::interval_lib::comparison_error&) {
return false;
}
}
@@ -277,7 +277,7 @@
operator >=(const FloatVal& x, const FloatVal& y) {
try {
return x.x >= y.x;
- } catch (gecode_boost::numeric::interval_lib::comparison_error&) {
+ } catch (boost::numeric::interval_lib::comparison_error&) {
return false;
}
}
@@ -285,7 +285,7 @@
operator >=(const FloatVal& x, const FloatNum& y) {
try {
return x.x >= y;
- } catch (gecode_boost::numeric::interval_lib::comparison_error&) {
+ } catch (boost::numeric::interval_lib::comparison_error&) {
return false;
}
}
@@ -294,13 +294,13 @@
operator ==(const FloatVal& x, const FloatVal& y) {
try {
return x.x == y.x;
- } catch (gecode_boost::numeric::interval_lib::comparison_error&) {
+ } catch (boost::numeric::interval_lib::comparison_error&) {
return false;
}
}
inline bool
operator ==(const FloatVal& x, const FloatNum& y) {
- if (!gecode_boost::numeric::interval_lib::checking_strict<FloatNum>
+ if (!boost::numeric::interval_lib::checking_strict<FloatNum>
::is_empty(x.x.lower(), x.x.upper())) {
if ((x.x.lower() == y) && (x.x.upper() == y))
return true;
@@ -317,7 +317,7 @@
operator !=(const FloatVal& x, const FloatVal& y) {
try {
return x.x != y.x;
- } catch (gecode_boost::numeric::interval_lib::comparison_error&) {
+ } catch (boost::numeric::interval_lib::comparison_error&) {
return false;
}
}
@@ -325,7 +325,7 @@
operator !=(const FloatVal& x, const FloatNum& y) {
try {
return x.x != y;
- } catch (gecode_boost::numeric::interval_lib::comparison_error&) {
+ } catch (boost::numeric::interval_lib::comparison_error&) {
return false;
}
}
|
