fix bugs in joint and tree

kitche1985 · Jul 21, 2015 · 285e684 · 285e684
1 parent 60794f9
commit 285e684
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/Joint/joint.h b/Joint/joint.h
@@ -3,7 +3,7 @@
 
 #include <vector>
 #include <string>
-#include "tree.h"
+#include "sample.h"
 
 using namespace std;
 using namespace cv;
@@ -19,8 +19,8 @@ struct GlobalParams
 	// total stages 
 	static int stages;
 
-	static double radius[10];
-	static int numFeats[10];
+	static double radius[5];
+	static int numFeats[5];
 	static int depth;
 	static int numTrees;
 

diff --git a/Joint/main.cpp b/Joint/main.cpp
@@ -7,6 +7,9 @@
 
 int GlobalParams::n_landmark = 68;
 int GlobalParams::n_initial = 5;
+int GlobalParams::depth = 5;
+double GlobalParams::radius[5] = { 0.4, 0.3, 0.2, 0.15, 0.12 };
+int GlobalParams::numFeats[5] = { 500, 500, 500, 300, 300 };
 
 int main() {
 	Joint joint;

diff --git a/Joint/tree.h b/Joint/tree.h
@@ -65,18 +65,18 @@ class Tree
 
 	void SplitNode(
 		const spliteType &sType,
-		const vector<Sample> &samples,
-		const Mat_<double> &meanShape,
-		const vector<int> &sample_idx,
+		const std::vector<Sample> &samples,
+		const cv::Mat_<double> &meanShape,
+		const std::vector<int> &sample_idx,
 		// output
 		double &threshold,
-		Point2d* feat,
-		vector<int> &lcID,
-		vector<int> &rcID
+		cv::Point2d* feat,
+		std::vector<int> &lcID,
+		std::vector<int> &rcID
 		);
 
-	void Train(vector<Sample> &samples,
-		const Mat_<double> &meanShape,
+	void Train(std::vector<Sample> &samples,
+		const cv::Mat_<double> &meanShape,
 		int stages,
 		int landmarkID);
 };