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

Merge pull request #799 from SpecLad:boost-initial-weights

Browse Source
This commit is contained in:
Andrey Kamaev 2013-04-11 15:47:57 +04:00 committed by OpenCV Buildbot
commit a1fa63ffc9
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1253,6 +1253,8 @@ public:
protected: protected:
void update_weights_impl( CvBoostTree* tree, double initial_weights[2] );
virtual bool set_params( const CvBoostParams& params ); virtual bool set_params( const CvBoostParams& params );
virtual void update_weights( CvBoostTree* tree ); virtual void update_weights( CvBoostTree* tree );
virtual void trim_weights(); virtual void trim_weights();

11
modules/ml/src/boost.cpp
View File

@ -1117,9 +1117,9 @@ bool CvBoost::train( CvMLData* _data,
} }
void void
CvBoost::update_weights( CvBoostTree* tree ) CvBoost::update_weights_impl( CvBoostTree* tree, double initial_weights[2] )
{ {
CV_FUNCNAME( "CvBoost::update_weights" ); CV_FUNCNAME( "CvBoost::update_weights_impl" );
__BEGIN__; __BEGIN__;
@ -1161,7 +1161,7 @@ CvBoost::update_weights( CvBoostTree* tree )
// so we need to convert class labels to floating-point values // so we need to convert class labels to floating-point values
double w0 = 1./n; double w0 = 1./n;
double p[2] = { 1, 1 }; double p[2] = { initial_weights[0], initial_weights[1] };
cvReleaseMat( &orig_response ); cvReleaseMat( &orig_response );
cvReleaseMat( &sum_response ); cvReleaseMat( &sum_response );
@ -1414,6 +1414,11 @@ CvBoost::update_weights( CvBoostTree* tree )
__END__; __END__;
} }
void
CvBoost::update_weights( CvBoostTree* tree ) {
double initial_weights[2] = { 1, 1 };
update_weights_impl( tree, initial_weights );
}
static CV_IMPLEMENT_QSORT_EX( icvSort_64f, double, CV_LT, int ) static CV_IMPLEMENT_QSORT_EX( icvSort_64f, double, CV_LT, int )