mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 06:26:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

revert to using fixed RNG in EM, otherwise the algorithm becomes non-deterministic and the test fails sometimes. in the meantime, EM needs to switch to more robust cv::kmeans instead of CvEM::kmeans.

Browse Source
This commit is contained in:
Vadim Pisarevsky 2010-12-06 09:41:28 +00:00
parent e6aba3e51c
commit bc21cc6fe9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/ml/src/em.cpp
View File

@ -581,7 +581,7 @@ void CvEM::kmeans( const CvVectors& train_data, int nclusters, CvMat* labels,
__BEGIN__; __BEGIN__;
cv::RNG* rng = &cv::theRNG(); cv::RNG rng(0xFFFFFFFF);
int i, j, k, nsamples, dims; int i, j, k, nsamples, dims;
int iter = 0; int iter = 0;
double max_dist = DBL_MAX; double max_dist = DBL_MAX;
@ -605,7 +605,7 @@ void CvEM::kmeans( const CvVectors& train_data, int nclusters, CvMat* labels,
{ {
for( i = 0; i < nsamples; i++ ) for( i = 0; i < nsamples; i++ )
labels->data.i[i] = i*nclusters/nsamples; labels->data.i[i] = i*nclusters/nsamples;
cvRandShuffle( labels, &rng->state ); cvRandShuffle( labels, &rng.state );
} }
for( ;; ) for( ;; )
@ -702,7 +702,7 @@ void CvEM::kmeans( const CvVectors& train_data, int nclusters, CvMat* labels,
const float* s; const float* s;
for( j = 0; j < 10; j++ ) for( j = 0; j < 10; j++ )
{ {
i = (*rng)(nsamples); i = rng(nsamples);
if( counters->data.i[labels->data.i[i]] > 1 ) if( counters->data.i[labels->data.i[i]] > 1 )
break; break;
} }
@ -738,7 +738,7 @@ void CvEM::kmeans( const CvVectors& train_data, int nclusters, CvMat* labels,
if( counters->data.i[k] == 0 ) if( counters->data.i[k] == 0 )
for(;;) for(;;)
{ {
i = (*rng)(nsamples); i = rng(nsamples);
j = labels->data.i[i]; j = labels->data.i[i];
if( counters->data.i[j] > 1 ) if( counters->data.i[j] > 1 )
{ {