Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fixed the RandomNumberGenerator, where it numbers greater than 1.0 could be returned

Browse Source 
- activated the corresponding unit tests

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@727 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Isaak Lim
2012-10-01 09:12:43 +00:00
parent 849ee4d293
commit 4a49deb7ad
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/OpenMesh/Core/Utils/RandomNumberGenerator.cc
View File

@@ -66,7 +66,7 @@ namespace OpenMesh {
RandomNumberGenerator::RandomNumberGenerator(const double _resolution) : RandomNumberGenerator::RandomNumberGenerator(const double _resolution) :
resolution_(_resolution), resolution_(_resolution),
iterations_(1), iterations_(1),
maxNum_(RAND_MAX) maxNum_(RAND_MAX + 1.0)
{ {
double tmp = resolution_; double tmp = resolution_;
while (tmp > (double(RAND_MAX) + 1.0) ) { while (tmp > (double(RAND_MAX) + 1.0) ) {

10
src/Unittests/unittests_randomNumberGenerator.hh
View File

@@ -53,8 +53,8 @@ TEST_F(RandomNumberGenerator, RandomNumberGeneratorMaxTestHighres) {
average /= 100000000.0; average /= 100000000.0;
// EXPECT_EQ(0u, lowerZero ) << "Below zero!"; EXPECT_EQ(0u, lowerZero ) << "Below zero!";
// EXPECT_EQ(0u, above1 ) << "Above zero!"; EXPECT_EQ(0u, above1 ) << "Above zero!";
EXPECT_TRUE( (average - 0.5) < 0.01 ) << "Expected value not 0.5"; EXPECT_TRUE( (average - 0.5) < 0.01 ) << "Expected value not 0.5";
} }
@@ -76,8 +76,6 @@ TEST_F(RandomNumberGenerator, RandomNumberGeneratorMaxTestLowres) {
if ( randomNumber > 1.0 ) { if ( randomNumber > 1.0 ) {
above1++; above1++;
std::cerr << "randomNumber " << randomNumber << std::endl;
std::cerr << "resolution " << rng.resolution() << std::endl;
} }
average += randomNumber; average += randomNumber;
@@ -85,8 +83,8 @@ TEST_F(RandomNumberGenerator, RandomNumberGeneratorMaxTestLowres) {
average /= 10000000.0; average /= 10000000.0;
// EXPECT_EQ(0u, lowerZero ) << "Below zero!"; EXPECT_EQ(0u, lowerZero ) << "Below zero!";
// EXPECT_EQ(0u, above1 ) << "Above zero!"; EXPECT_EQ(0u, above1 ) << "Above zero!";
EXPECT_TRUE( (average - 0.5) < 0.01 ) << "Expected value not 0.5"; EXPECT_TRUE( (average - 0.5) < 0.01 ) << "Expected value not 0.5";
} }