Debian Codegraph @

debian/patches/precision.patch

raw
1 From 9fc3666d96505e0804ab7f5229d96c8ef6106f9e Mon Sep 17 00:00:00 2001
2 From: lrita <[email protected]>
3 Date: Tue, 30 Jul 2019 20:07:58 +0800
4 Subject: [PATCH] optimize the SampleXXX function and fixes #249
5 MIME-Version: 1.0
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
8
9 NB: I've stripped out the optimizations as they are not merged upstream. I did,
10 however, keep in the parts that fix the bitwise float comparison numerics. The
11 test-code now does a delta test instead which should work more reliably.
12
13 --- a/ewma_test.go
14 +++ b/ewma_test.go
15 @@ -15,67 +15,67 @@
16 a := NewEWMA1()
17 a.Update(3)
18 a.Tick()
19 - if rate := a.Rate(); 0.6 != rate {
20 + if rate := a.Rate(); float64NotEqual(0.6, rate) {
21 t.Errorf("initial a.Rate(): 0.6 != %v\n", rate)
22 }
23 elapseMinute(a)
24 - if rate := a.Rate(); 0.22072766470286553 != rate {
25 + if rate := a.Rate(); float64NotEqual(0.22072766470286553, rate) {
26 t.Errorf("1 minute a.Rate(): 0.22072766470286553 != %v\n", rate)
27 }
28 elapseMinute(a)
29 - if rate := a.Rate(); 0.08120116994196772 != rate {
30 + if rate := a.Rate(); float64NotEqual(0.08120116994196772, rate) {
31 t.Errorf("2 minute a.Rate(): 0.08120116994196772 != %v\n", rate)
32 }
33 elapseMinute(a)
34 - if rate := a.Rate(); 0.029872241020718428 != rate {
35 + if rate := a.Rate(); float64NotEqual(0.029872241020718428, rate) {
36 t.Errorf("3 minute a.Rate(): 0.029872241020718428 != %v\n", rate)
37 }
38 elapseMinute(a)
39 - if rate := a.Rate(); 0.01098938333324054 != rate {
40 + if rate := a.Rate(); float64NotEqual(0.01098938333324054, rate) {
41 t.Errorf("4 minute a.Rate(): 0.01098938333324054 != %v\n", rate)
42 }
43 elapseMinute(a)
44 - if rate := a.Rate(); 0.004042768199451294 != rate {
45 + if rate := a.Rate(); float64NotEqual(0.004042768199451294, rate) {
46 t.Errorf("5 minute a.Rate(): 0.004042768199451294 != %v\n", rate)
47 }
48 elapseMinute(a)
49 - if rate := a.Rate(); 0.0014872513059998212 != rate {
50 + if rate := a.Rate(); float64NotEqual(0.0014872513059998212, rate) {
51 t.Errorf("6 minute a.Rate(): 0.0014872513059998212 != %v\n", rate)
52 }
53 elapseMinute(a)
54 - if rate := a.Rate(); 0.0005471291793327122 != rate {
55 + if rate := a.Rate(); float64NotEqual(0.0005471291793327122, rate) {
56 t.Errorf("7 minute a.Rate(): 0.0005471291793327122 != %v\n", rate)
57 }
58 elapseMinute(a)
59 - if rate := a.Rate(); 0.00020127757674150815 != rate {
60 + if rate := a.Rate(); float64NotEqual(0.00020127757674150815, rate) {
61 t.Errorf("8 minute a.Rate(): 0.00020127757674150815 != %v\n", rate)
62 }
63 elapseMinute(a)
64 - if rate := a.Rate(); 7.404588245200814e-05 != rate {
65 + if rate := a.Rate(); float64NotEqual(7.404588245200814e-05, rate) {
66 t.Errorf("9 minute a.Rate(): 7.404588245200814e-05 != %v\n", rate)
67 }
68 elapseMinute(a)
69 - if rate := a.Rate(); 2.7239957857491083e-05 != rate {
70 + if rate := a.Rate(); float64NotEqual(2.7239957857491083e-05, rate) {
71 t.Errorf("10 minute a.Rate(): 2.7239957857491083e-05 != %v\n", rate)
72 }
73 elapseMinute(a)
74 - if rate := a.Rate(); 1.0021020474147462e-05 != rate {
75 + if rate := a.Rate(); float64NotEqual(1.0021020474147462e-05, rate) {
76 t.Errorf("11 minute a.Rate(): 1.0021020474147462e-05 != %v\n", rate)
77 }
78 elapseMinute(a)
79 - if rate := a.Rate(); 3.6865274119969525e-06 != rate {
80 + if rate := a.Rate(); float64NotEqual(3.6865274119969525e-06, rate) {
81 t.Errorf("12 minute a.Rate(): 3.6865274119969525e-06 != %v\n", rate)
82 }
83 elapseMinute(a)
84 - if rate := a.Rate(); 1.3561976441886433e-06 != rate {
85 + if rate := a.Rate(); float64NotEqual(1.3561976441886433e-06, rate) {
86 t.Errorf("13 minute a.Rate(): 1.3561976441886433e-06 != %v\n", rate)
87 }
88 elapseMinute(a)
89 - if rate := a.Rate(); 4.989172314621449e-07 != rate {
90 + if rate := a.Rate(); float64NotEqual(4.989172314621449e-07, rate) {
91 t.Errorf("14 minute a.Rate(): 4.989172314621449e-07 != %v\n", rate)
92 }
93 elapseMinute(a)
94 - if rate := a.Rate(); 1.8354139230109722e-07 != rate {
95 + if rate := a.Rate(); float64NotEqual(1.8354139230109722e-07, rate) {
96 t.Errorf("15 minute a.Rate(): 1.8354139230109722e-07 != %v\n", rate)
97 }
98 }
99 @@ -84,67 +84,67 @@
100 a := NewEWMA5()
101 a.Update(3)
102 a.Tick()
103 - if rate := a.Rate(); 0.6 != rate {
104 + if rate := a.Rate(); float64NotEqual(0.6, rate) {
105 t.Errorf("initial a.Rate(): 0.6 != %v\n", rate)
106 }
107 elapseMinute(a)
108 - if rate := a.Rate(); 0.49123845184678905 != rate {
109 + if rate := a.Rate(); float64NotEqual(0.49123845184678905, rate) {
110 t.Errorf("1 minute a.Rate(): 0.49123845184678905 != %v\n", rate)
111 }
112 elapseMinute(a)
113 - if rate := a.Rate(); 0.4021920276213837 != rate {
114 + if rate := a.Rate(); float64NotEqual(0.4021920276213837, rate) {
115 t.Errorf("2 minute a.Rate(): 0.4021920276213837 != %v\n", rate)
116 }
117 elapseMinute(a)
118 - if rate := a.Rate(); 0.32928698165641596 != rate {
119 + if rate := a.Rate(); float64NotEqual(0.32928698165641596, rate) {
120 t.Errorf("3 minute a.Rate(): 0.32928698165641596 != %v\n", rate)
121 }
122 elapseMinute(a)
123 - if rate := a.Rate(); 0.269597378470333 != rate {
124 + if rate := a.Rate(); float64NotEqual(0.269597378470333, rate) {
125 t.Errorf("4 minute a.Rate(): 0.269597378470333 != %v\n", rate)
126 }
127 elapseMinute(a)
128 - if rate := a.Rate(); 0.2207276647028654 != rate {
129 + if rate := a.Rate(); float64NotEqual(0.2207276647028654, rate) {
130 t.Errorf("5 minute a.Rate(): 0.2207276647028654 != %v\n", rate)
131 }
132 elapseMinute(a)
133 - if rate := a.Rate(); 0.18071652714732128 != rate {
134 + if rate := a.Rate(); float64NotEqual(0.18071652714732128, rate) {
135 t.Errorf("6 minute a.Rate(): 0.18071652714732128 != %v\n", rate)
136 }
137 elapseMinute(a)
138 - if rate := a.Rate(); 0.14795817836496392 != rate {
139 + if rate := a.Rate(); float64NotEqual(0.14795817836496392, rate) {
140 t.Errorf("7 minute a.Rate(): 0.14795817836496392 != %v\n", rate)
141 }
142 elapseMinute(a)
143 - if rate := a.Rate(); 0.12113791079679326 != rate {
144 + if rate := a.Rate(); float64NotEqual(0.12113791079679326, rate) {
145 t.Errorf("8 minute a.Rate(): 0.12113791079679326 != %v\n", rate)
146 }
147 elapseMinute(a)
148 - if rate := a.Rate(); 0.09917933293295193 != rate {
149 + if rate := a.Rate(); float64NotEqual(0.09917933293295193, rate) {
150 t.Errorf("9 minute a.Rate(): 0.09917933293295193 != %v\n", rate)
151 }
152 elapseMinute(a)
153 - if rate := a.Rate(); 0.08120116994196763 != rate {
154 + if rate := a.Rate(); float64NotEqual(0.08120116994196763, rate) {
155 t.Errorf("10 minute a.Rate(): 0.08120116994196763 != %v\n", rate)
156 }
157 elapseMinute(a)
158 - if rate := a.Rate(); 0.06648189501740036 != rate {
159 + if rate := a.Rate(); float64NotEqual(0.06648189501740036, rate) {
160 t.Errorf("11 minute a.Rate(): 0.06648189501740036 != %v\n", rate)
161 }
162 elapseMinute(a)
163 - if rate := a.Rate(); 0.05443077197364752 != rate {
164 + if rate := a.Rate(); float64NotEqual(0.05443077197364752, rate) {
165 t.Errorf("12 minute a.Rate(): 0.05443077197364752 != %v\n", rate)
166 }
167 elapseMinute(a)
168 - if rate := a.Rate(); 0.04456414692860035 != rate {
169 + if rate := a.Rate(); float64NotEqual(0.04456414692860035, rate) {
170 t.Errorf("13 minute a.Rate(): 0.04456414692860035 != %v\n", rate)
171 }
172 elapseMinute(a)
173 - if rate := a.Rate(); 0.03648603757513079 != rate {
174 + if rate := a.Rate(); float64NotEqual(0.03648603757513079, rate) {
175 t.Errorf("14 minute a.Rate(): 0.03648603757513079 != %v\n", rate)
176 }
177 elapseMinute(a)
178 - if rate := a.Rate(); 0.0298722410207183831020718428 != rate {
179 + if rate := a.Rate(); float64NotEqual(0.0298722410207183831020718428, rate) {
180 t.Errorf("15 minute a.Rate(): 0.0298722410207183831020718428 != %v\n", rate)
181 }
182 }
183 @@ -153,67 +153,67 @@
184 a := NewEWMA15()
185 a.Update(3)
186 a.Tick()
187 - if rate := a.Rate(); 0.6 != rate {
188 + if rate := a.Rate(); float64NotEqual(0.6, rate) {
189 t.Errorf("initial a.Rate(): 0.6 != %v\n", rate)
190 }
191 elapseMinute(a)
192 - if rate := a.Rate(); 0.5613041910189706 != rate {
193 + if rate := a.Rate(); float64NotEqual(0.5613041910189706, rate) {
194 t.Errorf("1 minute a.Rate(): 0.5613041910189706 != %v\n", rate)
195 }
196 elapseMinute(a)
197 - if rate := a.Rate(); 0.5251039914257684 != rate {
198 + if rate := a.Rate(); float64NotEqual(0.5251039914257684, rate) {
199 t.Errorf("2 minute a.Rate(): 0.5251039914257684 != %v\n", rate)
200 }
201 elapseMinute(a)
202 - if rate := a.Rate(); 0.4912384518467888184678905 != rate {
203 + if rate := a.Rate(); float64NotEqual(0.4912384518467888184678905, rate) {
204 t.Errorf("3 minute a.Rate(): 0.4912384518467888184678905 != %v\n", rate)
205 }
206 elapseMinute(a)
207 - if rate := a.Rate(); 0.459557003018789 != rate {
208 + if rate := a.Rate(); float64NotEqual(0.459557003018789, rate) {
209 t.Errorf("4 minute a.Rate(): 0.459557003018789 != %v\n", rate)
210 }
211 elapseMinute(a)
212 - if rate := a.Rate(); 0.4299187863442732 != rate {
213 + if rate := a.Rate(); float64NotEqual(0.4299187863442732, rate) {
214 t.Errorf("5 minute a.Rate(): 0.4299187863442732 != %v\n", rate)
215 }
216 elapseMinute(a)
217 - if rate := a.Rate(); 0.4021920276213831 != rate {
218 + if rate := a.Rate(); float64NotEqual(0.4021920276213831, rate) {
219 t.Errorf("6 minute a.Rate(): 0.4021920276213831 != %v\n", rate)
220 }
221 elapseMinute(a)
222 - if rate := a.Rate(); 0.37625345116383313 != rate {
223 + if rate := a.Rate(); float64NotEqual(0.37625345116383313, rate) {
224 t.Errorf("7 minute a.Rate(): 0.37625345116383313 != %v\n", rate)
225 }
226 elapseMinute(a)
227 - if rate := a.Rate(); 0.3519877317060185 != rate {
228 + if rate := a.Rate(); float64NotEqual(0.3519877317060185, rate) {
229 t.Errorf("8 minute a.Rate(): 0.3519877317060185 != %v\n", rate)
230 }
231 elapseMinute(a)
232 - if rate := a.Rate(); 0.3292869816564153165641596 != rate {
233 + if rate := a.Rate(); float64NotEqual(0.3292869816564153165641596, rate) {
234 t.Errorf("9 minute a.Rate(): 0.3292869816564153165641596 != %v\n", rate)
235 }
236 elapseMinute(a)
237 - if rate := a.Rate(); 0.3080502714195546 != rate {
238 + if rate := a.Rate(); float64NotEqual(0.3080502714195546, rate) {
239 t.Errorf("10 minute a.Rate(): 0.3080502714195546 != %v\n", rate)
240 }
241 elapseMinute(a)
242 - if rate := a.Rate(); 0.2881831806538789 != rate {
243 + if rate := a.Rate(); float64NotEqual(0.2881831806538789, rate) {
244 t.Errorf("11 minute a.Rate(): 0.2881831806538789 != %v\n", rate)
245 }
246 elapseMinute(a)
247 - if rate := a.Rate(); 0.26959737847033216 != rate {
248 + if rate := a.Rate(); float64NotEqual(0.26959737847033216, rate) {
249 t.Errorf("12 minute a.Rate(): 0.26959737847033216 != %v\n", rate)
250 }
251 elapseMinute(a)
252 - if rate := a.Rate(); 0.2522102307052083 != rate {
253 + if rate := a.Rate(); float64NotEqual(0.2522102307052083, rate) {
254 t.Errorf("13 minute a.Rate(): 0.2522102307052083 != %v\n", rate)
255 }
256 elapseMinute(a)
257 - if rate := a.Rate(); 0.23594443252115815 != rate {
258 + if rate := a.Rate(); float64NotEqual(0.23594443252115815, rate) {
259 t.Errorf("14 minute a.Rate(): 0.23594443252115815 != %v\n", rate)
260 }
261 elapseMinute(a)
262 - if rate := a.Rate(); 0.2207276647028646247028654470286553 != rate {
263 + if rate := a.Rate(); float64NotEqual(0.2207276647028646247028654470286553, rate) {
264 t.Errorf("15 minute a.Rate(): 0.2207276647028646247028654470286553 != %v\n", rate)
265 }
266 }
267 --- a/histogram_test.go
268 +++ b/histogram_test.go
269 @@ -76,20 +76,20 @@
270 if max := h.Max(); 10000 != max {
271 t.Errorf("h.Max(): 10000 != %v\n", max)
272 }
273 - if mean := h.Mean(); 5000.5 != mean {
274 + if mean := h.Mean(); float64NotEqual(5000.5, mean) {
275 t.Errorf("h.Mean(): 5000.5 != %v\n", mean)
276 }
277 - if stdDev := h.StdDev(); 2886.751331514372 != stdDev {
278 + if stdDev := h.StdDev(); float64NotEqual(2886.751331514372, stdDev) {
279 t.Errorf("h.StdDev(): 2886.751331514372 != %v\n", stdDev)
280 }
281 ps := h.Percentiles([]float64{0.5, 0.75, 0.99})
282 - if 5000.5 != ps[0] {
283 + if float64NotEqual(5000.5, ps[0]) {
284 t.Errorf("median: 5000.5 != %v\n", ps[0])
285 }
286 - if 7500.75 != ps[1] {
287 + if float64NotEqual(7500.75, ps[1]) {
288 t.Errorf("75th percentile: 7500.75 != %v\n", ps[1])
289 }
290 - if 9900.99 != ps[2] {
291 + if float64NotEqual(9900.99, ps[2]) {
292 t.Errorf("99th percentile: 9900.99 != %v\n", ps[2])
293 }
294 }
295 --- a/sample_test.go
296 +++ b/sample_test.go
297 @@ -1,12 +1,21 @@
298 package metrics
299
300 import (
301 + "math"
302 "math/rand"
303 "runtime"
304 "testing"
305 "time"
306 )
307
308 +func float64NotEqual(a, b float64) bool {
309 + v := math.Abs(a - b)
310 + if b == 0.0 && v > 0.00001 {
311 + return false
312 + }
313 + return math.Abs(v/b) > 0.00001
314 +}
315 +
316 // Benchmark{Compute,Copy}{1000,1000000} demonstrate that, even for relatively
317 // expensive computations like Variance, the cost of copying the Sample, as
318 // approximated by a make and copy, is much greater than the cost of the
319 @@ -285,20 +336,20 @@
320 if max := s.Max(); 10000 != max {
321 t.Errorf("s.Max(): 10000 != %v\n", max)
322 }
323 - if mean := s.Mean(); 4965.98 != mean {
324 + if mean := s.Mean(); float64NotEqual(4965.98, mean) {
325 t.Errorf("s.Mean(): 4965.98 != %v\n", mean)
326 }
327 - if stdDev := s.StdDev(); 2959.825156930727 != stdDev {
328 + if stdDev := s.StdDev(); float64NotEqual(2959.825156930727, stdDev) {
329 t.Errorf("s.StdDev(): 2959.825156930727 != %v\n", stdDev)
330 }
331 ps := s.Percentiles([]float64{0.5, 0.75, 0.99})
332 - if 4615 != ps[0] {
333 + if float64NotEqual(4615, ps[0]) {
334 t.Errorf("median: 4615 != %v\n", ps[0])
335 }
336 - if 7672 != ps[1] {
337 + if float64NotEqual(7672, ps[1]) {
338 t.Errorf("75th percentile: 7672 != %v\n", ps[1])
339 }
340 - if 9998.99 != ps[2] {
341 + if float64NotEqual(9998.99, ps[2]) {
342 t.Errorf("99th percentile: 9998.99 != %v\n", ps[2])
343 }
344 }
345 @@ -313,20 +364,20 @@
346 if max := s.Max(); 9989 != max {
347 t.Errorf("s.Max(): 9989 != %v\n", max)
348 }
349 - if mean := s.Mean(); 4748.14 != mean {
350 + if mean := s.Mean(); float64NotEqual(4748.14, mean) {
351 t.Errorf("s.Mean(): 4748.14 != %v\n", mean)
352 }
353 - if stdDev := s.StdDev(); 2826.684117548333 != stdDev {
354 + if stdDev := s.StdDev(); float64NotEqual(2826.684117548333, stdDev) {
355 t.Errorf("s.StdDev(): 2826.684117548333 != %v\n", stdDev)
356 }
357 ps := s.Percentiles([]float64{0.5, 0.75, 0.99})
358 - if 4599 != ps[0] {
359 + if float64NotEqual(4599, ps[0]) {
360 t.Errorf("median: 4599 != %v\n", ps[0])
361 }
362 - if 7380.5 != ps[1] {
363 + if float64NotEqual(7380.5, ps[1]) {
364 t.Errorf("75th percentile: 7380.5 != %v\n", ps[1])
365 }
366 - if 9986.429999999998 != ps[2] {
367 + if float64NotEqual(9986.429999999998, ps[2]) {
368 t.Errorf("99th percentile: 9986.429999999998 != %v\n", ps[2])
369 }
370 }
371 --- a/timer_test.go
372 +++ b/timer_test.go
373 @@ -27,7 +27,7 @@
374 tm := NewTimer()
375 tm.Update(math.MaxInt64)
376 tm.Update(0)
377 - if stdDev := tm.StdDev(); 4.611686018427388e+18 != stdDev {
378 + if stdDev := tm.StdDev(); float64NotEqual(4.611686018427388e+18, stdDev) {
379 t.Errorf("tm.StdDev(): 4.611686018427388e+18 != %v\n", stdDev)
380 }
381 }