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

modified default var_type values

Browse Source
This commit is contained in:
Maria Dimashova 2010-06-24 08:34:47 +00:00
parent 4a05af684f
commit c15934dd2b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/ml/src/ertrees.cpp
View File

@ -72,7 +72,7 @@ void CvERTreeTrainData::set_data( const CvMat* _train_data, int _tflag,
__BEGIN__; __BEGIN__;
int sample_all = 0, r_type = 0, cv_n; int sample_all = 0, r_type, cv_n;
int total_c_count = 0; int total_c_count = 0;
int tree_block_size, temp_block_size, max_split_size, nv_size, cv_size = 0; int tree_block_size, temp_block_size, max_split_size, nv_size, cv_size = 0;
int ds_step, dv_step, ms_step = 0, mv_step = 0; // {data|mask}{sample|var}_step int ds_step, dv_step, ms_step = 0, mv_step = 0; // {data|mask}{sample|var}_step
@ -148,11 +148,11 @@ void CvERTreeTrainData::set_data( const CvMat* _train_data, int _tflag,
if ( sample_count < 65536 ) if ( sample_count < 65536 )
is_buf_16u = true; is_buf_16u = true;
r_type = CV_VAR_CATEGORICAL;
if( _var_type ) if( _var_type )
CV_CALL( var_type0 = cvPreprocessVarType( _var_type, var_idx, var_count, &r_type )); CV_CALL( var_type0 = cvPreprocessVarType( _var_type, var_idx, var_count, &r_type ));
CV_CALL( var_type = cvCreateMat( 1, var_count+2, CV_32SC1 )); CV_CALL( var_type = cvCreateMat( 1, var_count+2, CV_32SC1 ));
cat_var_count = 0; cat_var_count = 0;
ord_var_count = -1; ord_var_count = -1;

4
modules/ml/src/tree.cpp
View File

@ -149,7 +149,7 @@ void CvDTreeTrainData::set_data( const CvMat* _train_data, int _tflag,
__BEGIN__; __BEGIN__;
int sample_all = 0, r_type = 0, cv_n; int sample_all = 0, r_type, cv_n;
int total_c_count = 0; int total_c_count = 0;
int tree_block_size, temp_block_size, max_split_size, nv_size, cv_size = 0; int tree_block_size, temp_block_size, max_split_size, nv_size, cv_size = 0;
int ds_step, dv_step, ms_step = 0, mv_step = 0; // {data|mask}{sample|var}_step int ds_step, dv_step, ms_step = 0, mv_step = 0; // {data|mask}{sample|var}_step
@ -252,11 +252,11 @@ void CvDTreeTrainData::set_data( const CvMat* _train_data, int _tflag,
"floating-point vector containing as many elements as " "floating-point vector containing as many elements as "
"the total number of samples in the training data matrix" ); "the total number of samples in the training data matrix" );
r_type = CV_VAR_CATEGORICAL;
if( _var_type ) if( _var_type )
CV_CALL( var_type0 = cvPreprocessVarType( _var_type, var_idx, var_count, &r_type )); CV_CALL( var_type0 = cvPreprocessVarType( _var_type, var_idx, var_count, &r_type ));
CV_CALL( var_type = cvCreateMat( 1, var_count+2, CV_32SC1 )); CV_CALL( var_type = cvCreateMat( 1, var_count+2, CV_32SC1 ));
cat_var_count = 0; cat_var_count = 0;
ord_var_count = -1; ord_var_count = -1;