fixed a couple of warnings and 2 possible bugs
authorVadim Pisarevsky <no@email>
Mon, 18 Oct 2010 09:03:54 +0000 (09:03 +0000)
committerVadim Pisarevsky <no@email>
Mon, 18 Oct 2010 09:03:54 +0000 (09:03 +0000)
modules/ml/src/gbt.cpp

index 2d4259b..446fe9c 100644 (file)
@@ -601,8 +601,8 @@ float CvGBTrees::find_optimal_value( const CvMat* _Idx )
     case ABSOLUTE_LOSS:\r
         {\r
             float* residuals = new float[n];\r
-            for (int i=0; i<n; ++i)\r
-                residuals[i] = (resp_data[*idx] - cur_data[*idx++]);\r
+            for (int i=0; i<n; ++i, ++idx)\r
+                residuals[i] = (resp_data[*idx] - cur_data[*idx]);\r
             icvSortFloat(residuals, n, 0.0f);\r
             if (n % 2) \r
                 gamma = residuals[n/2];\r
@@ -613,8 +613,8 @@ float CvGBTrees::find_optimal_value( const CvMat* _Idx )
     case HUBER_LOSS:\r
         {\r
             float* residuals = new float[n];\r
-            for (int i=0; i<n; ++i)\r
-                residuals[i] = (resp_data[*idx] - cur_data[*idx++]);\r
+            for (int i=0; i<n; ++i, ++idx)\r
+                residuals[i] = (resp_data[*idx] - cur_data[*idx]);\r
             icvSortFloat(residuals, n, 0.0f);\r
 \r
             int n_half = n >> 1;\r
@@ -781,9 +781,6 @@ float CvGBTrees::predict( const CvMat* _sample, const CvMat* _missing,
 \r
 void CvGBTrees::write_params( CvFileStorage* fs ) const\r
 {\r
-    CV_FUNCNAME( "CvGBTrees::write_params" );\r
-    __BEGIN__;\r
-    \r
     const char* loss_function_type_str =\r
         params.loss_function_type == SQUARED_LOSS ? "SquaredLoss" :\r
         params.loss_function_type == ABSOLUTE_LOSS ? "AbsoluteLoss" :\r
@@ -806,8 +803,6 @@ void CvGBTrees::write_params( CvFileStorage* fs ) const
     data->is_classifier = !problem_type();\r
     data->write_params( fs );\r
     data->is_classifier = 0;\r
-\r
-    __END__;\r
 }\r
 \r
 \r