continuing to debug boost and fix MSVC compile errors

diff --git a/modules/ml/include/opencv2/ml.hpp b/modules/ml/include/opencv2/ml.hpp
index f642f1f..a5ce301 100644 (file)
--- a/modules/ml/include/opencv2/ml.hpp
+++ b/modules/ml/include/opencv2/ml.hpp
@@ -496,7 +496,7 @@ public:
 *                                   Gradient Boosted Trees                               *
 \****************************************************************************************/
 
-class CV_EXPORTS_W GBTrees : public DTrees
+/*class CV_EXPORTS_W GBTrees : public DTrees
 {
 public:
     struct CV_EXPORTS_W_MAP Params : public DTrees::Params
@@ -516,10 +516,10 @@ public:
     virtual void setK(int k) = 0;
 
     virtual float predictSerial( InputArray samples,
-                                 OutputArray weakResponses, int flags) const;
+                                 OutputArray weakResponses, int flags) const = 0;
 
     static Ptr<GBTrees> create(const Params& p);
-};
+};*/
 
 /****************************************************************************************\
 *                              Artificial Neural Networks (ANN)                          *

diff --git a/modules/ml/src/rtrees.cpp b/modules/ml/src/rtrees.cpp
index abae817..7c9cbaf 100644 (file)
--- a/modules/ml/src/rtrees.cpp
+++ b/modules/ml/src/rtrees.cpp
@@ -280,7 +280,6 @@ public:
             if( calcOOBError && oobError < eps )
                 break;
         }
-        printf("done!\n");
 
         if( rparams.calcVarImportance )
         {

diff --git a/modules/ml/src/tree.cpp b/modules/ml/src/tree.cpp
index a75f4ba..f931d0f 100644 (file)
--- a/modules/ml/src/tree.cpp
+++ b/modules/ml/src/tree.cpp
@@ -452,6 +452,7 @@ int DTreesImpl::addNodeAndTrySplit( int parent, const vector<int>& sidx )
 
         w->wnodes[nidx].left = addNodeAndTrySplit( nidx, sleft );
         w->wnodes[nidx].right = addNodeAndTrySplit( nidx, sright );
+        CV_Assert( w->wnodes[nidx].left > 0 && w->wnodes[nidx].right > 0 );
     }
 
     return nidx;