Add threshold for stopping criterion

hgaiser · Oct 22, 2014 · f92293f · f92293f
1 parent 3bc4956
commit f92293f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/random/CMakeLists.txt b/random/CMakeLists.txt
@@ -14,7 +14,7 @@ find_package(PythonLibs REQUIRED)
 find_package(NumPy REQUIRED)
 find_package(Objectness REQUIRED)
 
-set(CMAKE_CXX_FLAGS "-std=c++11 -g")
+set(CMAKE_CXX_FLAGS "-std=c++11 -O3")
 
 include_directories(
 	include

diff --git a/random/src/.main.cpp.swo b/random/src/.main.cpp.swo
diff --git a/random/src/levels.cpp b/random/src/levels.cpp
@@ -18,7 +18,7 @@ typedef std::vector<std::shared_ptr<Segment>> LevelSegments;
 std::random_device rd_;
 std::mt19937 gen_(rd_());
 
-cv::Mat get_bboxes_(const std::vector<cv::Mat> & levels, int n) {
+cv::Mat get_bboxes_(const std::vector<cv::Mat> & levels, int n, float thresh) {
 #ifdef DEBUG
 	cv::namedWindow("Image", cv::WINDOW_NORMAL);
 	for (const auto & lev: levels) {
@@ -96,6 +96,7 @@ cv::Mat get_bboxes_(const std::vector<cv::Mat> & levels, int n) {
 		prior.push_back(lp.computeSelectionPrior(levels[i], level_segments[i]));
 	}
 
+	RandomStoppingCriterion stop(thresh);
 	for (int i = 0; i < n; i++) {
 		int sid = rand() % segments_sum;
 
@@ -108,7 +109,6 @@ cv::Mat get_bboxes_(const std::vector<cv::Mat> & levels, int n) {
 			}
 
 			std::shared_ptr<Segment> s = lev[prior[j].poll()];
-			RandomStoppingCriterion stop;
 
 			while (s->neighbours.size() && stop.stop(seg, s->bbox()) == false) {
 #ifdef DEBUG
@@ -173,7 +173,7 @@ cv::Mat get_bboxes_(const std::vector<cv::Mat> & levels, int n) {
 	return bboxes;
 }
 
-PyObject * get_bboxes(PyObject * levels_, int n) {
+PyObject * get_bboxes(PyObject * levels_, int n, float thresh) {
 	NDArrayConverter cvt;
 	std::vector<cv::Mat> levels;
 
@@ -182,7 +182,7 @@ PyObject * get_bboxes(PyObject * levels_, int n) {
 	for (int i = 0; i < nrlevels; i++)
 		levels.push_back(cvt.toMat(data[i]));
 
-	return cvt.toNDArray(get_bboxes_(levels, n));
+	return cvt.toNDArray(get_bboxes_(levels, n, thresh));
 }
 
 static void init_ar() {

diff --git a/random/src/random_stopping_criterion.h b/random/src/random_stopping_criterion.h
@@ -4,7 +4,7 @@
 
 class RandomStoppingCriterion : public StoppingCriterion {
 public:
-	RandomStoppingCriterion() : threshold(0.95f) {//threshold(dis(gen)) {
+	RandomStoppingCriterion(float thresh = 0.85f) : threshold(thresh) {//threshold(dis(gen)) {
 	}
 
 	bool stop(const cv::Mat & image, cv::Rect roi) {