From bfa893b9577b27d3becb0e50eac2cf4283a4137d Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 7 Sep 2014 00:57:21 +0200 Subject: [PATCH] Fixed signed integer and float linearRand results #230 --- glm/gtc/random.inl | 16 ++-- test/gtc/gtc_random.cpp | 192 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 190 insertions(+), 18 deletions(-) diff --git a/glm/gtc/random.inl b/glm/gtc/random.inl index dff1789c..38b7faa7 100644 --- a/glm/gtc/random.inl +++ b/glm/gtc/random.inl @@ -131,7 +131,7 @@ namespace detail { GLM_FUNC_QUALIFIER static vecType call(vecType const & Min, vecType const & Max) { - return (vecType(compute_rand::call()) % (Max - Min)) + Min; + return (vecType(compute_rand::call() % vecType(Max + static_cast(1) - Min))) + Min; } }; @@ -140,7 +140,7 @@ namespace detail { GLM_FUNC_QUALIFIER static vecType call(vecType const & Min, vecType const & Max) { - return (compute_rand::call() % (Max - Min)) + Min; + return (compute_rand::call() % (Max + static_cast(1) - Min)) + Min; } }; @@ -149,7 +149,7 @@ namespace detail { GLM_FUNC_QUALIFIER static vecType call(vecType const & Min, vecType const & Max) { - return (vecType(compute_rand::call()) % (Max - Min)) + Min; + return (vecType(compute_rand::call() % vecType(Max + static_cast(1) - Min))) + Min; } }; @@ -158,7 +158,7 @@ namespace detail { GLM_FUNC_QUALIFIER static vecType call(vecType const & Min, vecType const & Max) { - return (compute_rand::call() % (Max - Min)) + Min; + return (compute_rand::call() % (Max + static_cast(1) - Min)) + Min; } }; @@ -167,7 +167,7 @@ namespace detail { GLM_FUNC_QUALIFIER static vecType call(vecType const & Min, vecType const & Max) { - return (vecType(compute_rand::call()) % (Max - Min)) + Min; + return (vecType(compute_rand::call() % vecType(Max + static_cast(1) - Min))) + Min; } }; @@ -176,7 +176,7 @@ namespace detail { GLM_FUNC_QUALIFIER static vecType call(vecType const & Min, vecType const & Max) { - return (compute_rand::call() % (Max - Min)) + Min; + return (compute_rand::call() % (Max + static_cast(1) - Min)) + Min; } }; @@ -185,7 +185,7 @@ namespace detail { GLM_FUNC_QUALIFIER static vecType call(vecType const & Min, vecType const & Max) { - return (vecType(compute_rand::call()) % (Max - Min)) + Min; + return (vecType(compute_rand::call() % vecType(Max + static_cast(1) - Min))) + Min; } }; @@ -194,7 +194,7 @@ namespace detail { GLM_FUNC_QUALIFIER static vecType call(vecType const & Min, vecType const & Max) { - return (compute_rand::call() % (Max - Min)) + Min; + return (compute_rand::call() % (Max + static_cast(1) - Min)) + Min; } }; diff --git a/test/gtc/gtc_random.cpp b/test/gtc/gtc_random.cpp index 0e97b7a9..5e2333ec 100644 --- a/test/gtc/gtc_random.cpp +++ b/test/gtc/gtc_random.cpp @@ -18,23 +18,195 @@ int test_linearRand() { int Error = 0; + glm::int32 const Min = 16; + glm::int32 const Max = 32; + { - glm::i8vec2 A = glm::linearRand(glm::i8vec2(16), glm::i8vec2(32)); - glm::i16vec2 B = glm::linearRand(glm::i16vec2(16), glm::i16vec2(32)); - glm::i32vec2 C = glm::linearRand(glm::i32vec2(16), glm::i32vec2(32)); - glm::i64vec2 D = glm::linearRand(glm::i64vec2(16), glm::i64vec2(32)); + glm::u8vec2 AMin(std::numeric_limits::max()); + glm::u8vec2 AMax(std::numeric_limits::min()); + { + for(std::size_t i = 0; i < 100000; ++i) + { + glm::u8vec2 A = glm::linearRand(glm::u8vec2(Min), glm::u8vec2(Max)); + AMin = glm::min(AMin, A); + AMax = glm::max(AMax, A); + + if(!glm::all(glm::lessThanEqual(A, glm::u8vec2(Max)))) + ++Error; + if(!glm::all(glm::greaterThanEqual(A, glm::u8vec2(Min)))) + ++Error; + assert(!Error); + } + + Error += glm::all(glm::equal(AMin, glm::u8vec2(Min))) ? 0 : 1; + Error += glm::all(glm::equal(AMax, glm::u8vec2(Max))) ? 0 : 1; + assert(!Error); + } + + glm::u16vec2 BMin(std::numeric_limits::max()); + glm::u16vec2 BMax(std::numeric_limits::min()); + { + for(std::size_t i = 0; i < 100000; ++i) + { + glm::u16vec2 B = glm::linearRand(glm::u16vec2(Min), glm::u16vec2(Max)); + BMin = glm::min(BMin, B); + BMax = glm::max(BMax, B); + + if(!glm::all(glm::lessThanEqual(B, glm::u16vec2(Max)))) + ++Error; + if(!glm::all(glm::greaterThanEqual(B, glm::u16vec2(Min)))) + ++Error; + assert(!Error); + } + + Error += glm::all(glm::equal(BMin, glm::u16vec2(Min))) ? 0 : 1; + Error += glm::all(glm::equal(BMax, glm::u16vec2(Max))) ? 0 : 1; + assert(!Error); + } + + glm::u32vec2 CMin(std::numeric_limits::max()); + glm::u32vec2 CMax(std::numeric_limits::min()); + { + for(std::size_t i = 0; i < 100000; ++i) + { + glm::u32vec2 C = glm::linearRand(glm::u32vec2(Min), glm::u32vec2(Max)); + CMin = glm::min(CMin, C); + CMax = glm::max(CMax, C); + + if(!glm::all(glm::lessThanEqual(C, glm::u32vec2(Max)))) + ++Error; + if(!glm::all(glm::greaterThanEqual(C, glm::u32vec2(Min)))) + ++Error; + assert(!Error); + } + + Error += glm::all(glm::equal(CMin, glm::u32vec2(Min))) ? 0 : 1; + Error += glm::all(glm::equal(CMax, glm::u32vec2(Max))) ? 0 : 1; + assert(!Error); + } + + glm::u64vec2 DMin(std::numeric_limits::max()); + glm::u64vec2 DMax(std::numeric_limits::min()); + { + for(std::size_t i = 0; i < 100000; ++i) + { + glm::u64vec2 D = glm::linearRand(glm::u64vec2(Min), glm::u64vec2(Max)); + DMin = glm::min(DMin, D); + DMax = glm::max(DMax, D); + + if(!glm::all(glm::lessThanEqual(D, glm::u64vec2(Max)))) + ++Error; + if(!glm::all(glm::greaterThanEqual(D, glm::u64vec2(Min)))) + ++Error; + assert(!Error); + } + + Error += glm::all(glm::equal(DMin, glm::u64vec2(Min))) ? 0 : 1; + Error += glm::all(glm::equal(DMax, glm::u64vec2(Max))) ? 0 : 1; + assert(!Error); + } } { - glm::u8vec2 A = glm::linearRand(glm::u8vec2(16), glm::u8vec2(32)); - glm::u16vec2 B = glm::linearRand(glm::u16vec2(16), glm::u16vec2(32)); - glm::u32vec2 C = glm::linearRand(glm::u32vec2(16), glm::u32vec2(32)); - glm::u64vec2 D = glm::linearRand(glm::u64vec2(16), glm::u64vec2(32)); + glm::i8vec2 AMin(std::numeric_limits::max()); + glm::i8vec2 AMax(std::numeric_limits::min()); + { + for(std::size_t i = 0; i < 100000; ++i) + { + glm::i8vec2 A = glm::linearRand(glm::i8vec2(Min), glm::i8vec2(Max)); + AMin = glm::min(AMin, A); + AMax = glm::max(AMax, A); + + if(!glm::all(glm::lessThanEqual(A, glm::i8vec2(Max)))) + ++Error; + if(!glm::all(glm::greaterThanEqual(A, glm::i8vec2(Min)))) + ++Error; + assert(!Error); + } + + Error += glm::all(glm::equal(AMin, glm::i8vec2(Min))) ? 0 : 1; + Error += glm::all(glm::equal(AMax, glm::i8vec2(Max))) ? 0 : 1; + assert(!Error); + } + + glm::i16vec2 BMin(std::numeric_limits::max()); + glm::i16vec2 BMax(std::numeric_limits::min()); + { + for(std::size_t i = 0; i < 100000; ++i) + { + glm::i16vec2 B = glm::linearRand(glm::i16vec2(Min), glm::i16vec2(Max)); + BMin = glm::min(BMin, B); + BMax = glm::max(BMax, B); + + if(!glm::all(glm::lessThanEqual(B, glm::i16vec2(Max)))) + ++Error; + if(!glm::all(glm::greaterThanEqual(B, glm::i16vec2(Min)))) + ++Error; + assert(!Error); + } + + Error += glm::all(glm::equal(BMin, glm::i16vec2(Min))) ? 0 : 1; + Error += glm::all(glm::equal(BMax, glm::i16vec2(Max))) ? 0 : 1; + assert(!Error); + } + + glm::i32vec2 CMin(std::numeric_limits::max()); + glm::i32vec2 CMax(std::numeric_limits::min()); + { + for(std::size_t i = 0; i < 100000; ++i) + { + glm::i32vec2 C = glm::linearRand(glm::i32vec2(Min), glm::i32vec2(Max)); + CMin = glm::min(CMin, C); + CMax = glm::max(CMax, C); + + if(!glm::all(glm::lessThanEqual(C, glm::i32vec2(Max)))) + ++Error; + if(!glm::all(glm::greaterThanEqual(C, glm::i32vec2(Min)))) + ++Error; + assert(!Error); + } + + Error += glm::all(glm::equal(CMin, glm::i32vec2(Min))) ? 0 : 1; + Error += glm::all(glm::equal(CMax, glm::i32vec2(Max))) ? 0 : 1; + assert(!Error); + } + + glm::i64vec2 DMin(std::numeric_limits::max()); + glm::i64vec2 DMax(std::numeric_limits::min()); + { + for(std::size_t i = 0; i < 100000; ++i) + { + glm::i64vec2 D = glm::linearRand(glm::i64vec2(Min), glm::i64vec2(Max)); + DMin = glm::min(DMin, D); + DMax = glm::max(DMax, D); + + if(!glm::all(glm::lessThanEqual(D, glm::i64vec2(Max)))) + ++Error; + if(!glm::all(glm::greaterThanEqual(D, glm::i64vec2(Min)))) + ++Error; + assert(!Error); + } + + Error += glm::all(glm::equal(DMin, glm::i64vec2(Min))) ? 0 : 1; + Error += glm::all(glm::equal(DMax, glm::i64vec2(Max))) ? 0 : 1; + assert(!Error); + } } + for(std::size_t i = 0; i < 100000; ++i) { - glm::f32vec2 A = glm::linearRand(glm::f32vec2(16), glm::f32vec2(32)); - glm::f64vec2 B = glm::linearRand(glm::f64vec2(16), glm::f64vec2(32)); + glm::f32vec2 const A(glm::linearRand(glm::f32vec2(Min), glm::f32vec2(Max))); + if(!glm::all(glm::lessThanEqual(A, glm::f32vec2(Max)))) + ++Error; + if(!glm::all(glm::greaterThanEqual(A, glm::f32vec2(Min)))) + ++Error; + + glm::f64vec2 const B(glm::linearRand(glm::f64vec2(Min), glm::f64vec2(Max))); + if(!glm::all(glm::lessThanEqual(B, glm::f64vec2(Max)))) + ++Error; + if(!glm::all(glm::greaterThanEqual(B, glm::f64vec2(Min)))) + ++Error; + assert(!Error); } {