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

Merge remote-tracking branch 'upstream/master' into svm_hog

Browse Source
This commit is contained in:
Mathieu Barnachon
2013-11-24 13:24:39 +01:00
parent e1955759af 3ab47300ce
commit 63c23cce65
2649 changed files with 192484 additions and 87403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -944,6 +944,8 @@ protected:
CvDTreeNode* root;
CvMat* var_importance;
CvDTreeTrainData* data;
CvMat train_data_hdr, responses_hdr;
cv::Mat train_data_mat, responses_mat;
public:
int pruned_tree_idx;
@@ -1055,6 +1057,8 @@ protected:
// array of the trees of the forest
CvForestTree** trees;
CvDTreeTrainData* data;
CvMat train_data_hdr, responses_hdr;
cv::Mat train_data_mat, responses_mat;
int ntrees;
int nclasses;
double oob_error;
@@ -1270,6 +1274,8 @@ protected:
virtual void initialize_weights(double (&p)[2]);
CvDTreeTrainData* data;
CvMat train_data_hdr, responses_hdr;
cv::Mat train_data_mat, responses_mat;
CvBoostParams params;
CvSeq* weak;
@@ -2144,7 +2150,7 @@ typedef CvANN_MLP NeuralNet_MLP;
typedef CvGBTreesParams GradientBoostingTreeParams;
typedef CvGBTrees GradientBoostingTrees;
template<> CV_EXPORTS void Ptr<CvDTreeSplit>::delete_obj();
template<> CV_EXPORTS void DefaultDeleter<CvDTreeSplit>::operator ()(CvDTreeSplit* obj) const;
CV_EXPORTS bool initModule_ml(void);
}