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

Merge pull request #2214 from cosminBoaca:add_returnDFVal_parallel_predict

Browse Source
This commit is contained in:
Roman Donchenko 2014-01-29 17:12:48 +04:00
commit 9b9eadc941
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ml/doc/support_vector_machines.rst
View File

@ -242,7 +242,7 @@ Predicts the response for input sample(s).
.. ocv:function:: float CvSVM::predict( const CvMat* sample, bool returnDFVal=false ) const .. ocv:function:: float CvSVM::predict( const CvMat* sample, bool returnDFVal=false ) const
.. ocv:function:: float CvSVM::predict( const CvMat* samples, CvMat* results ) const .. ocv:function:: float CvSVM::predict( const CvMat* samples, CvMat* results, bool returnDFVal=false ) const
.. ocv:pyfunction:: cv2.SVM.predict(sample[, returnDFVal]) -> retval .. ocv:pyfunction:: cv2.SVM.predict(sample[, returnDFVal]) -> retval

2
modules/ml/include/opencv2/ml.hpp
View File

@ -490,7 +490,7 @@ public:
bool balanced=false ); bool balanced=false );
virtual float predict( const CvMat* sample, bool returnDFVal=false ) const; virtual float predict( const CvMat* sample, bool returnDFVal=false ) const;
virtual float predict( const CvMat* samples, CV_OUT CvMat* results ) const; virtual float predict( const CvMat* samples, CV_OUT CvMat* results, bool returnDFVal=false ) const;
CV_WRAP CvSVM( const cv::Mat& trainData, const cv::Mat& responses, CV_WRAP CvSVM( const cv::Mat& trainData, const cv::Mat& responses,
const cv::Mat& varIdx=cv::Mat(), const cv::Mat& sampleIdx=cv::Mat(), const cv::Mat& varIdx=cv::Mat(), const cv::Mat& sampleIdx=cv::Mat(),

10
modules/ml/src/svm.cpp
View File

@ -2194,18 +2194,20 @@ float CvSVM::predict( const CvMat* sample, bool returnDFVal ) const
} }
struct predict_body_svm : ParallelLoopBody { struct predict_body_svm : ParallelLoopBody {
predict_body_svm(const CvSVM* _pointer, float* _result, const CvMat* _samples, CvMat* _results) predict_body_svm(const CvSVM* _pointer, float* _result, const CvMat* _samples, CvMat* _results, bool _returnDFVal)
{ {
pointer = _pointer; pointer = _pointer;
result = _result; result = _result;
samples = _samples; samples = _samples;
results = _results; results = _results;
returnDFVal = _returnDFVal;
} }
const CvSVM* pointer; const CvSVM* pointer;
float* result; float* result;
const CvMat* samples; const CvMat* samples;
CvMat* results; CvMat* results;
bool returnDFVal;
void operator()( const cv::Range& range ) const void operator()( const cv::Range& range ) const
{ {
@ -2213,7 +2215,7 @@ struct predict_body_svm : ParallelLoopBody {
{ {
CvMat sample; CvMat sample;
cvGetRow( samples, &sample, i ); cvGetRow( samples, &sample, i );
int r = (int)pointer->predict(&sample); int r = (int)pointer->predict(&sample, returnDFVal);
if (results) if (results)
results->data.fl[i] = (float)r; results->data.fl[i] = (float)r;
if (i == 0) if (i == 0)
@ -2222,11 +2224,11 @@ struct predict_body_svm : ParallelLoopBody {
} }
}; };
float CvSVM::predict(const CvMat* samples, CV_OUT CvMat* results) const float CvSVM::predict(const CvMat* samples, CV_OUT CvMat* results, bool returnDFVal) const
{ {
float result = 0; float result = 0;
cv::parallel_for_(cv::Range(0, samples->rows), cv::parallel_for_(cv::Range(0, samples->rows),
predict_body_svm(this, &result, samples, results) predict_body_svm(this, &result, samples, results, returnDFVal)
); );
return result; return result;
} }