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

bug with negative class labels is fixed

Browse Source
This commit is contained in:
P. Druzhkov 2010-11-29 21:58:52 +00:00
parent aef71a146e
commit 16f50dbe50
1 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
modules/ml/src/gbt.cpp
View File

@ -215,6 +215,7 @@ CvGBTrees::train( const CvMat* _train_data, int _tflag,
cvCopy( _responses, orig_response); cvCopy( _responses, orig_response);
orig_response->step = CV_ELEM_SIZE(_responses->type); orig_response->step = CV_ELEM_SIZE(_responses->type);
/*
if (!is_regression) if (!is_regression)
{ {
int max_label = -1; int max_label = -1;
@ -231,6 +232,38 @@ CvGBTrees::train( const CvMat* _train_data, int _tflag,
if (class_labels->data.i[i]) if (class_labels->data.i[i])
class_labels->data.i[i] = ++class_count; class_labels->data.i[i] = ++class_count;
} }
*/
if (!is_regression)
{
class_count = 0;
unsigned char * mask = new unsigned char[get_len(orig_response)];
for (int i=0; i<get_len(orig_response); ++i)
mask[i] = 0;
for (int i=0; i<get_len(orig_response); ++i)
if (!mask[i])
{
class_count++;
for (int j=i; j<get_len(orig_response); ++j)
if (int(orig_response->data.fl[j]) == int(orig_response->data.fl[i]))
mask[j] = 1;
}
delete[] mask;
class_labels = cvCreateMat(1, class_count, CV_32S);
class_labels->data.i[0] = int(orig_response->data.fl[0]);
int j = 1;
for (int i=1; i<get_len(orig_response); ++i)
{
int k = 0;
while ((int(orig_response->data.fl[i]) - class_labels->data.i[k]) && (k<j))
k++;
if (k == j)
{
class_labels->data.i[k] = int(orig_response->data.fl[i]);
j++;
}
}
}
data->is_classifier = false; data->is_classifier = false;
@ -443,8 +476,16 @@ void CvGBTrees::find_gradient(const int k)
exp_sfi += res; exp_sfi += res;
} }
int orig_label = int(resp_data[idx]); int orig_label = int(resp_data[idx]);
/*
grad_data[idx] = (float)(!(k-class_labels->data.i[orig_label]+1)) - grad_data[idx] = (float)(!(k-class_labels->data.i[orig_label]+1)) -
(float)(exp_fk / exp_sfi); (float)(exp_fk / exp_sfi);
*/
int ensemble_label = 0;
while (class_labels->data.i[ensemble_label] - orig_label)
ensemble_label++;
grad_data[idx] = (float)(!(k-ensemble_label)) -
(float)(exp_fk / exp_sfi);
} }
}; break; }; break;
@ -772,10 +813,13 @@ float CvGBTrees::predict( const CvMat* _sample, const CvMat* _missing,
delete[] sum; delete[] sum;
/*
int orig_class_label = -1; int orig_class_label = -1;
for (int i=0; i<get_len(class_labels); ++i) for (int i=0; i<get_len(class_labels); ++i)
if (class_labels->data.i[i] == class_label+1) if (class_labels->data.i[i] == class_label+1)
orig_class_label = i; orig_class_label = i;
*/
int orig_class_label = class_labels->data.i[class_label];
return float(orig_class_label); return float(orig_class_label);
} }