Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(759)

Side by Side Diff: webrtc/test/random.cc

Issue 1413053002: Change to use local Random object instead of global rand() in the RtcEventLog unit test. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Updated WebRTC unit tests to use the new functions in Random Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« webrtc/test/random.h ('K') | « webrtc/test/random.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/test/random.h" 11 #include "webrtc/test/random.h"
12 12
13 #include <math.h> 13 #include <math.h>
14 14
15 #include "webrtc/base/checks.h" 15 #include "webrtc/base/checks.h"
16 16
17 namespace webrtc { 17 namespace webrtc {
18 18
19 namespace test { 19 namespace test {
20 20
21 Random::Random(uint32_t seed) : a_(0x531FDB97 ^ seed), b_(0x6420ECA8 + seed) { 21 Random::Random(uint32_t seed) : a_(0x531FDB97 ^ seed), b_(0x6420ECA8 + seed) {
22 } 22 }
23 23
24 float Random::Rand() { 24 float Random::Rand() {
25 const double kScale = 1.0f / (static_cast<uint64_t>(1) << 32); 25 const double kScale = 1.0f / (static_cast<uint64_t>(1) << 32);
26 double result = kScale * b_; 26 double result = kScale * b_;
27 a_ ^= b_; 27 a_ ^= b_;
28 b_ += a_; 28 b_ += a_;
29 return static_cast<float>(result); 29 return static_cast<float>(result);
30 } 30 }
stefan-webrtc 2015/10/22 09:41:22 Should this be implemented using Uniform() instead
the sun 2015/10/22 12:30:38 Maybe the a_ ^= b_; b_ += a_; part could be put in
terelius 2015/10/26 18:18:41 Using Uniform(MAX_INT) would give the exact same r
terelius 2015/10/26 18:18:41 Considering it is only 2 simple lines I think it i
31 31
32 int Random::Rand(int low, int high) { 32 uint32_t Random::Uniform(uint32_t t) {
33 uint64_t result = t;
34 result = b_ * (result + 1);
35 result = result >> 32;
the sun 2015/10/22 12:30:38 Nice!
36 a_ ^= b_;
37 b_ += a_;
38 return result;
39 }
40
41 uint32_t Random::Uniform(uint32_t low, uint32_t high) {
33 RTC_DCHECK(low <= high); 42 RTC_DCHECK(low <= high);
34 float uniform = Rand() * (high - low + 1) + low; 43 return Uniform(high - low) + low;
35 return static_cast<int>(uniform);
36 } 44 }
37 45
38 int Random::Gaussian(int mean, int standard_deviation) { 46 int Random::Gaussian(int mean, int standard_deviation) {
39 // Creating a Normal distribution variable from two independent uniform 47 // Creating a Normal distribution variable from two independent uniform
40 // variables based on the Box-Muller transform, which is defined on the 48 // variables based on the Box-Muller transform, which is defined on the
41 // interval (0, 1], hence the mask+add below. 49 // interval (0, 1], hence the mask+add below.
42 const double kPi = 3.14159265358979323846; 50 const double kPi = 3.14159265358979323846;
43 const double kScale = 1.0 / 0x80000000ul; 51 const double kScale = 1.0 / 0x80000000ul;
44 double u1 = kScale * ((a_ & 0x7ffffffful) + 1); 52 double u1 = kScale * ((a_ & 0x7ffffffful) + 1);
45 double u2 = kScale * ((b_ & 0x7ffffffful) + 1); 53 double u2 = kScale * ((b_ & 0x7ffffffful) + 1);
46 a_ ^= b_; 54 a_ ^= b_;
47 b_ += a_; 55 b_ += a_;
48 return static_cast<int>( 56 return static_cast<int>(
49 mean + standard_deviation * sqrt(-2 * log(u1)) * cos(2 * kPi * u2)); 57 mean + standard_deviation * sqrt(-2 * log(u1)) * cos(2 * kPi * u2));
50 } 58 }
51 59
52 int Random::Exponential(float lambda) { 60 int Random::Exponential(float lambda) {
53 float uniform = Rand(); 61 float uniform = Rand();
54 return static_cast<int>(-log(uniform) / lambda); 62 return static_cast<int>(-log(uniform) / lambda);
55 } 63 }
56 } // namespace test 64 } // namespace test
57 } // namespace webrtc 65 } // namespace webrtc
OLDNEW
« webrtc/test/random.h ('K') | « webrtc/test/random.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698