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

fixed CvGBTrees

Browse Source
This commit is contained in:
Maria Dimashova 2011-04-30 18:02:56 +00:00
parent 481d0b2c56
commit 5c9e6b7059
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/gbt.cpp
View File

@ -1114,15 +1114,15 @@ bool CvGBTrees::train( const cv::Mat& trainData, int tflag,
CvMat _varIdx = varIdx, _sampleIdx = sampleIdx, _varType = varType; CvMat _varIdx = varIdx, _sampleIdx = sampleIdx, _varType = varType;
CvMat _missingDataMask = missingDataMask; CvMat _missingDataMask = missingDataMask;
return train(&_trainData, tflag, &_responses, varIdx.empty() ? &_varIdx : 0, return train( &_trainData, tflag, &_responses, varIdx.empty() ? 0 : &_varIdx,
sampleIdx.empty() ? &_sampleIdx : 0, varType.empty() ? &_varType : 0, sampleIdx.empty() ? 0 : &_sampleIdx, varType.empty() ? 0 : &_varType,
missingDataMask.empty() ? &_missingDataMask : 0, params, update); missingDataMask.empty() ? 0 : &_missingDataMask, params, update);
} }
float CvGBTrees::predict( const cv::Mat& sample, const cv::Mat& missing, float CvGBTrees::predict( const cv::Mat& sample, const cv::Mat& missing,
const cv::Range& slice, int k ) const const cv::Range& slice, int k ) const
{ {
CvMat _sample = sample, _missing = missing; CvMat _sample = sample, _missing = missing;
return predict(&_sample, missing.empty() ? &_missing : 0, 0, return predict(&_sample, missing.empty() ? 0 : &_missing, 0,
slice==cv::Range::all() ? CV_WHOLE_SEQ : cvSlice(slice.start, slice.end), k); slice==cv::Range::all() ? CV_WHOLE_SEQ : cvSlice(slice.start, slice.end), k);
} }