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

removed unnecessary param

Browse Source
This commit is contained in:
Maria Dimashova
2012-04-11 13:48:20 +00:00
parent d8cec20e1b
commit 3db7823682
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/legacy/src/em.cpp
View File

@@ -102,15 +102,12 @@ double CvEM::calcLikelihood( const Mat &input_sample ) const
}
float
CvEM::predict( const CvMat* _sample, CvMat* _probs, bool isNormalize ) const
CvEM::predict( const CvMat* _sample, CvMat* _probs ) const
{
Mat prbs0 = cvarrToMat(_probs), prbs = prbs0, sample = cvarrToMat(_sample);
int cls = emObj.predict(sample, _probs ? _OutputArray(prbs) : cv::noArray());
if(_probs)
{
if(isNormalize)
normalize(prbs, prbs, 1, 0, NORM_L1);
if( prbs.data != prbs0.data )
{
CV_Assert( prbs.size == prbs0.size );
@@ -236,12 +233,9 @@ bool CvEM::train( const Mat& _samples, const Mat& _sample_idx,
}
float
CvEM::predict( const Mat& _sample, Mat* _probs, bool isNormalize ) const
CvEM::predict( const Mat& _sample, Mat* _probs ) const
{
int cls = emObj.predict(_sample, _probs ? _OutputArray(*_probs) : cv::noArray());
if(_probs && isNormalize)
normalize(*_probs, *_probs, 1, 0, NORM_L1);
return (float)cls;
}