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

Trunk: moved contructors implementations from .hpp to .cpp

Browse Source
This commit is contained in:
Ilya Lysenkov 2011-06-24 12:48:00 +00:00
parent 2c958b2598
commit 10065d3321
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -552,19 +552,11 @@ protected:
struct CV_EXPORTS_W_MAP CvEMParams struct CV_EXPORTS_W_MAP CvEMParams
{ {
CvEMParams() : nclusters(10), cov_mat_type(1/*CvEM::COV_MAT_DIAGONAL*/), CvEMParams();
start_step(0/*CvEM::START_AUTO_STEP*/), probs(0), weights(0), means(0), covs(0) CvEMParams( int nclusters, int cov_mat_type=1/*CvEM::COV_MAT_DIAGONAL*/,
{ int start_step=0/*CvEM::START_AUTO_STEP*/,
term_crit=cvTermCriteria( CV_TERMCRIT_ITER+CV_TERMCRIT_EPS, 100, FLT_EPSILON ); CvTermCriteria term_crit=cvTermCriteria(CV_TERMCRIT_ITER+CV_TERMCRIT_EPS, 100, FLT_EPSILON),
} const CvMat* probs=0, const CvMat* weights=0, const CvMat* means=0, const CvMat** covs=0 );
CvEMParams( int _nclusters, int _cov_mat_type=1/*CvEM::COV_MAT_DIAGONAL*/,
int _start_step=0/*CvEM::START_AUTO_STEP*/,
CvTermCriteria _term_crit=cvTermCriteria(CV_TERMCRIT_ITER+CV_TERMCRIT_EPS, 100, FLT_EPSILON),
const CvMat* _probs=0, const CvMat* _weights=0, const CvMat* _means=0, const CvMat** _covs=0 ) :
nclusters(_nclusters), cov_mat_type(_cov_mat_type), start_step(_start_step),
probs(_probs), weights(_weights), means(_means), covs(_covs), term_crit(_term_crit)
{}
CV_PROP_RW int nclusters; CV_PROP_RW int nclusters;
CV_PROP_RW int cov_mat_type; CV_PROP_RW int cov_mat_type;

12
modules/ml/src/em.cpp
View File

@ -68,6 +68,18 @@
Symbol ' means transposition. Symbol ' means transposition.
*/ */
CvEMParams::CvEMParams() : nclusters(10), cov_mat_type(1/*CvEM::COV_MAT_DIAGONAL*/),
start_step(0/*CvEM::START_AUTO_STEP*/), probs(0), weights(0), means(0), covs(0)
{
term_crit=cvTermCriteria( CV_TERMCRIT_ITER+CV_TERMCRIT_EPS, 100, FLT_EPSILON );
}
CvEMParams::CvEMParams( int _nclusters, int _cov_mat_type, int _start_step,
CvTermCriteria _term_crit, const CvMat* _probs,
const CvMat* _weights, const CvMat* _means, const CvMat** _covs ) :
nclusters(_nclusters), cov_mat_type(_cov_mat_type), start_step(_start_step),
probs(_probs), weights(_weights), means(_means), covs(_covs), term_crit(_term_crit)
{}
CvEM::CvEM() CvEM::CvEM()
{ {