From c9e52fdbae320c5ddf5c2960eba7bc003709788a Mon Sep 17 00:00:00 2001 From: matlabbe Date: Mon, 29 Oct 2012 14:35:12 +0000 Subject: [PATCH] Updated default LSH parameters (as set in LSH default constructor) git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@178 620bd6b2-0a58-f614-fd9a-1bd335dccda9 --- example/main.cpp | 2 +- src/Settings.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/example/main.cpp b/example/main.cpp index 7ed950bd..3ad567c6 100644 --- a/example/main.cpp +++ b/example/main.cpp @@ -98,7 +98,7 @@ int main(int argc, char * argv[]) // Binary descriptors detected (from ORB or Brief) // Create Flann LSH index - cv::flann::Index flannIndex(sceneDescriptors, cv::flann::LshIndexParams(20, 10, 2)); + cv::flann::Index flannIndex(sceneDescriptors, cv::flann::LshIndexParams(12, 20, 2)); printf("Time creating FLANN index = %d ms\n", time.restart()); results = cv::Mat(objectDescriptors.rows, k, CV_32SC1); // Results index dists = cv::Mat(objectDescriptors.rows, k, CV_32FC1); // Distance results are CV_32FC1 ?!?!? NOTE OpenCV doc is not clear about that... diff --git a/src/Settings.h b/src/Settings.h index 53e732cd..e1a4150d 100644 --- a/src/Settings.h +++ b/src/Settings.h @@ -148,8 +148,8 @@ class Settings PARAMETER(NearestNeighbor, KMeans_centers_init, QString, "0:RANDOM;GONZALES;KMEANSPP"); PARAMETER(NearestNeighbor, KMeans_cb_index, double, 0.2); - PARAMETER(NearestNeighbor, Lsh_table_number, int, 20); - PARAMETER(NearestNeighbor, Lsh_key_size, int, 10); + PARAMETER(NearestNeighbor, Lsh_table_number, int, 12); + PARAMETER(NearestNeighbor, Lsh_key_size, int, 20); PARAMETER(NearestNeighbor, Lsh_multi_probe_level, int, 2); PARAMETER(General, autoStartCamera, bool, false);