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
This commit is contained in:
matlabbe 2012-10-29 14:35:12 +00:00
parent 597a137854
commit c9e52fdbae
2 changed files with 3 additions and 3 deletions

View File

@ -98,7 +98,7 @@ int main(int argc, char * argv[])
// Binary descriptors detected (from ORB or Brief) // Binary descriptors detected (from ORB or Brief)
// Create Flann LSH index // 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()); printf("Time creating FLANN index = %d ms\n", time.restart());
results = cv::Mat(objectDescriptors.rows, k, CV_32SC1); // Results index 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... dists = cv::Mat(objectDescriptors.rows, k, CV_32FC1); // Distance results are CV_32FC1 ?!?!? NOTE OpenCV doc is not clear about that...

View File

@ -148,8 +148,8 @@ class Settings
PARAMETER(NearestNeighbor, KMeans_centers_init, QString, "0:RANDOM;GONZALES;KMEANSPP"); PARAMETER(NearestNeighbor, KMeans_centers_init, QString, "0:RANDOM;GONZALES;KMEANSPP");
PARAMETER(NearestNeighbor, KMeans_cb_index, double, 0.2); PARAMETER(NearestNeighbor, KMeans_cb_index, double, 0.2);
PARAMETER(NearestNeighbor, Lsh_table_number, int, 20); PARAMETER(NearestNeighbor, Lsh_table_number, int, 12);
PARAMETER(NearestNeighbor, Lsh_key_size, int, 10); PARAMETER(NearestNeighbor, Lsh_key_size, int, 20);
PARAMETER(NearestNeighbor, Lsh_multi_probe_level, int, 2); PARAMETER(NearestNeighbor, Lsh_multi_probe_level, int, 2);
PARAMETER(General, autoStartCamera, bool, false); PARAMETER(General, autoStartCamera, bool, false);