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

Fixing a line where integer data was treated as floating point data.

Browse Source
This commit is contained in:
Benoit Seguin 2014-09-18 14:03:13 +02:00
parent 26fd37b27d
commit 084835ec30
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,8 @@ using namespace std;
#define CV_CMP_FLOAT(a,b) ((a) < (b)) #define CV_CMP_FLOAT(a,b) ((a) < (b))
static CV_IMPLEMENT_QSORT_EX( icvSortFloat, float, CV_CMP_FLOAT, float) static CV_IMPLEMENT_QSORT_EX( icvSortFloat, float, CV_CMP_FLOAT, float)
#define CV_CMP_INT(a,b) ((a) < (b))
static CV_IMPLEMENT_QSORT_EX( icvSortInt, int, CV_CMP_INT, int)
//=========================================================================== //===========================================================================
static string ToString(int i) static string ToString(int i)
@ -282,6 +284,7 @@ CvGBTrees::train( const CvMat* _train_data, int _tflag,
sample_idx = cvCreateMat( 1, sample_idx_len, CV_32S ); sample_idx = cvCreateMat( 1, sample_idx_len, CV_32S );
for (int i=0; i<sample_idx_len; ++i) for (int i=0; i<sample_idx_len; ++i)
sample_idx->data.i[i] = _sample_idx->data.i[i]; sample_idx->data.i[i] = _sample_idx->data.i[i];
icvSortInt(sample_idx->data.i, sample_idx_len, 0);
} break; } break;
case CV_8S: case CV_8S:
case CV_8U: case CV_8U:
@ -298,7 +301,6 @@ CvGBTrees::train( const CvMat* _train_data, int _tflag,
} break; } break;
default: CV_Error(CV_StsUnmatchedFormats, "_sample_idx should be a 32sC1, 8sC1 or 8uC1 vector."); default: CV_Error(CV_StsUnmatchedFormats, "_sample_idx should be a 32sC1, 8sC1 or 8uC1 vector.");
} }
icvSortFloat(sample_idx->data.fl, sample_idx_len, 0);
} }
else else
{ {