fixed (e)rtrees bug

git-svn-id: https://code.ros.org/svn/opencv/trunk@2193 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/src/ml/mlertrees.cpp b/opencv/src/ml/mlertrees.cpp
index 1c2eb48a37cf20c827f22ace30176735026b7dea..262d4521a2fc77d44a8404ed30b428449c86e90c 100644 (file)
--- a/opencv/src/ml/mlertrees.cpp
+++ b/opencv/src/ml/mlertrees.cpp
@@ -1881,13 +1881,12 @@ bool CvERTrees::grow_forest( const CvTermCriteria term_crit )
         if( term_crit.type != CV_TERMCRIT_ITER && oob_error < max_oob_err )\r
             break;\r
     }\r
-    if ( is_oob_or_vimportance )\r
+    if( var_importance )\r
     {\r
         for ( int vi = 0; vi < var_importance->cols; vi++ )\r
                 var_importance->data.fl[vi] = ( var_importance->data.fl[vi] > 0 ) ?\r
                     var_importance->data.fl[vi] : 0;\r
-        if( var_importance )\r
-            cvNormalize( var_importance, var_importance, 1., 0, CV_L1 );\r
+        cvNormalize( var_importance, var_importance, 1., 0, CV_L1 );\r
     }\r
 \r
     result = true;\r

diff --git a/opencv/src/ml/mlrtrees.cpp b/opencv/src/ml/mlrtrees.cpp
index 4a75886c638a7e7dbb0721bc2f8ca4032c6999db..97a92ed9391bd17544b6d239ccf232e6907f8974 100644 (file)
--- a/opencv/src/ml/mlrtrees.cpp
+++ b/opencv/src/ml/mlrtrees.cpp
@@ -510,13 +510,12 @@ bool CvRTrees::grow_forest( const CvTermCriteria term_crit )
             break;
     }
 
-    if ( is_oob_or_vimportance )
+    if( var_importance )
     {
         for ( int vi = 0; vi < var_importance->cols; vi++ )
                 var_importance->data.fl[vi] = ( var_importance->data.fl[vi] > 0 ) ?
                     var_importance->data.fl[vi] : 0;
-        if( var_importance )
-            cvNormalize( var_importance, var_importance, 1., 0, CV_L1 );
+        cvNormalize( var_importance, var_importance, 1., 0, CV_L1 );
     }
 
     cvFree( &oob_samples_perm_ptr );