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

Use global RNG for training RTrees.

Browse Source
This commit is contained in:
Peter Würtz 2019-12-28 13:34:08 +01:00
parent 9572895da0
commit 8aebef2459
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/ml/src/rtrees.cpp
View File

@ -90,12 +90,12 @@ public:
CV_TRACE_FUNCTION(); CV_TRACE_FUNCTION();
DTreesImpl::clear(); DTreesImpl::clear();
oobError = 0.; oobError = 0.;
rng = RNG((uint64)-1);
} }
const vector<int>& getActiveVars() CV_OVERRIDE const vector<int>& getActiveVars() CV_OVERRIDE
{ {
CV_TRACE_FUNCTION(); CV_TRACE_FUNCTION();
RNG &rng = theRNG();
int i, nvars = (int)allVars.size(), m = (int)activeVars.size(); int i, nvars = (int)allVars.size(), m = (int)activeVars.size();
for( i = 0; i < nvars; i++ ) for( i = 0; i < nvars; i++ )
{ {
@ -134,6 +134,7 @@ public:
bool train( const Ptr<TrainData>& trainData, int flags ) CV_OVERRIDE bool train( const Ptr<TrainData>& trainData, int flags ) CV_OVERRIDE
{ {
CV_TRACE_FUNCTION(); CV_TRACE_FUNCTION();
RNG &rng = theRNG();
CV_Assert(!trainData.empty()); CV_Assert(!trainData.empty());
startTraining(trainData, flags); startTraining(trainData, flags);
int treeidx, ntrees = (rparams.termCrit.type & TermCriteria::COUNT) != 0 ? int treeidx, ntrees = (rparams.termCrit.type & TermCriteria::COUNT) != 0 ?
@ -424,7 +425,6 @@ public:
double oobError; double oobError;
vector<float> varImportance; vector<float> varImportance;
vector<int> allVars, activeVars; vector<int> allVars, activeVars;
RNG rng;
}; };