From 817f861b63bbc7719872888674c6cd21ac937caa Mon Sep 17 00:00:00 2001 From: matlabbe Date: Thu, 6 Sep 2012 20:28:12 +0000 Subject: [PATCH] Added missing FLANN "search" parameters (like number of leafs checked) git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@173 620bd6b2-0a58-f614-fd9a-1bd335dccda9 --- src/Settings.cpp | 5 ++++- src/Settings.h | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Settings.cpp b/src/Settings.cpp index c41cb94c..67e0a66a 100644 --- a/src/Settings.cpp +++ b/src/Settings.cpp @@ -470,6 +470,9 @@ cvflann::flann_distance_t Settings::getFlannDistanceType() cv::flann::SearchParams Settings::getFlannSearchParams() { - return cv::flann::SearchParams(); + return cv::flann::SearchParams( + getNearestNeighbor_7search_checks(), + getNearestNeighbor_8search_eps(), + getNearestNeighbor_9search_sorted()); } diff --git a/src/Settings.h b/src/Settings.h index e3628d55..53e732cd 100644 --- a/src/Settings.h +++ b/src/Settings.h @@ -126,6 +126,10 @@ class Settings PARAMETER(NearestNeighbor, 5minDistanceUsed, bool, false); PARAMETER(NearestNeighbor, 6minDistance, float, 1.6f); + PARAMETER(NearestNeighbor, 7search_checks, int, 32); + PARAMETER(NearestNeighbor, 8search_eps, float, 0); + PARAMETER(NearestNeighbor, 9search_sorted, bool, true); + PARAMETER(NearestNeighbor, KDTree_trees, int, 4); PARAMETER(NearestNeighbor, Composite_trees, int, 4);