generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Backport of setRNGSeed implementation and python test randomness fix

Browse Source
This commit is contained in:
Vitaly Tuzov 2016-03-29 17:59:48 +03:00
parent 12a8f5486d
commit 64f02aa72d
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/core/include/opencv2/core/core.hpp
View File

@ -2593,6 +2593,9 @@ CV_EXPORTS_W double kmeans( InputArray data, int K, CV_OUT InputOutputArray best
//! returns the thread-local Random number generator //! returns the thread-local Random number generator
CV_EXPORTS RNG& theRNG(); CV_EXPORTS RNG& theRNG();
//! sets state of the thread-local Random number generator
CV_EXPORTS_W void setRNGSeed(int seed);
//! returns the next unifomly-distributed random number of the specified type //! returns the next unifomly-distributed random number of the specified type
template<typename _Tp> static inline _Tp randu() { return (_Tp)theRNG(); } template<typename _Tp> static inline _Tp randu() { return (_Tp)theRNG(); }

5
modules/core/src/rand.cpp
View File

@ -806,6 +806,11 @@ RNG& theRNG()
} }
void cv::setRNGSeed(int seed)
{
theRNG() = RNG(static_cast<uint64>(seed));
}
void cv::randu(InputOutputArray dst, InputArray low, InputArray high) void cv::randu(InputOutputArray dst, InputArray low, InputArray high)
{ {
theRNG().fill(dst, RNG::UNIFORM, low, high); theRNG().fill(dst, RNG::UNIFORM, low, high);

1
modules/python/test/tests_common.py
View File

@ -42,6 +42,7 @@ class NewOpenCVTests(unittest.TestCase):
return self.image_cache[filename] return self.image_cache[filename]
def setUp(self): def setUp(self):
cv2.setRNGSeed(10)
self.image_cache = {} self.image_cache = {}
def hashimg(self, im): def hashimg(self, im):