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

fixed case of var_type==0 (ticket 397)

Browse Source
This commit is contained in:
Maria Dimashova 2010-06-23 17:00:12 +00:00
parent b481f12de8
commit 122a1c2bff
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,8 +148,8 @@ 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;
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 ));
@ -162,8 +162,8 @@ void CvERTreeTrainData::set_data( const CvMat* _train_data, int _tflag,
// step 0. calc the number of categorical vars // step 0. calc the number of categorical vars
for( vi = 0; vi < var_count; vi++ ) for( vi = 0; vi < var_count; vi++ )
{ {
var_type->data.i[vi] = var_type0->data.ptr[vi] == CV_VAR_CATEGORICAL ? char vt = var_type0 ? var_type0->data.ptr[vi] : CV_VAR_ORDERED;
cat_var_count++ : ord_var_count--; var_type->data.i[vi] = vt == CV_VAR_CATEGORICAL ? cat_var_count++ : ord_var_count--;
} }
ord_var_count = ~ord_var_count; ord_var_count = ~ord_var_count;

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

@ -252,8 +252,8 @@ 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" );
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 ));
@ -266,8 +266,8 @@ void CvDTreeTrainData::set_data( const CvMat* _train_data, int _tflag,
// step 0. calc the number of categorical vars // step 0. calc the number of categorical vars
for( vi = 0; vi < var_count; vi++ ) for( vi = 0; vi < var_count; vi++ )
{ {
var_type->data.i[vi] = var_type0->data.ptr[vi] == CV_VAR_CATEGORICAL ? char vt = var_type0 ? var_type0->data.ptr[vi] : CV_VAR_ORDERED;
cat_var_count++ : ord_var_count--; var_type->data.i[vi] = vt == CV_VAR_CATEGORICAL ? cat_var_count++ : ord_var_count--;
} }
ord_var_count = ~ord_var_count; ord_var_count = ~ord_var_count;