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

continuing to debug boost and fix MSVC compile errors

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-08-03 21:21:11 +04:00
parent 98a1181240
commit 24b01a8e4f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/ml/include/opencv2/ml.hpp
View File

@ -496,7 +496,7 @@ public:
* Gradient Boosted Trees * * Gradient Boosted Trees *
\****************************************************************************************/ \****************************************************************************************/
class CV_EXPORTS_W GBTrees : public DTrees /*class CV_EXPORTS_W GBTrees : public DTrees
{ {
public: public:
struct CV_EXPORTS_W_MAP Params : public DTrees::Params struct CV_EXPORTS_W_MAP Params : public DTrees::Params
@ -516,10 +516,10 @@ public:
virtual void setK(int k) = 0; virtual void setK(int k) = 0;
virtual float predictSerial( InputArray samples, virtual float predictSerial( InputArray samples,
OutputArray weakResponses, int flags) const; OutputArray weakResponses, int flags) const = 0;
static Ptr<GBTrees> create(const Params& p); static Ptr<GBTrees> create(const Params& p);
}; };*/
/****************************************************************************************\ /****************************************************************************************\
* Artificial Neural Networks (ANN) * * Artificial Neural Networks (ANN) *

1
modules/ml/src/rtrees.cpp
View File

@ -280,7 +280,6 @@ public:
if( calcOOBError && oobError < eps ) if( calcOOBError && oobError < eps )
break; break;
} }
printf("done!\n");
if( rparams.calcVarImportance ) if( rparams.calcVarImportance )
{ {

1
modules/ml/src/tree.cpp
View File

@ -452,6 +452,7 @@ int DTreesImpl::addNodeAndTrySplit( int parent, const vector<int>& sidx )
w->wnodes[nidx].left = addNodeAndTrySplit( nidx, sleft ); w->wnodes[nidx].left = addNodeAndTrySplit( nidx, sleft );
w->wnodes[nidx].right = addNodeAndTrySplit( nidx, sright ); w->wnodes[nidx].right = addNodeAndTrySplit( nidx, sright );
CV_Assert( w->wnodes[nidx].left > 0 && w->wnodes[nidx].right > 0 );
} }
return nidx; return nidx;