Updating search parameters in the C and Python bindings

Author: mariusmuja

src/cpp/flann/flann.cpp

@@ -34,6 +34,7 @@
 struct FLANNParameters DEFAULT_FLANN_PARAMETERS = {
     FLANN_INDEX_KDTREE,
     32, 0.2f, 0.0f,
+    0, -1, 0,
     4, 4,
     32, 11, FLANN_CENTERS_RANDOM,
     0.9f, 0.01f, 0, 0.1f,
@@ -101,7 +102,17 @@ flann::IndexParams create_parameters(FLANNParameters* p)
     return params;
 }
 
+flann::SearchParams create_search_params(FLANNParameters* p)
+{
+    flann::SearchParams params;
+    params.checks = p->checks;
+    params.eps = p->eps;
+    params.sorted = p->sorted;
+    params.max_neighbors = p->max_neighbors;
+    params.cores = p->cores;
 
+    return params;
+}
 
 
 void update_flann_parameters(const IndexParams& params, FLANNParameters* flann_params)
@@ -429,9 +440,10 @@ int __flann_find_nearest_neighbors(typename Distance::ElementType* dataset,  int
         index->buildIndex();
         Matrix<int> m_indices(result,tcount, nn);
         Matrix<DistanceType> m_dists(dists,tcount, nn);
+        SearchParams search_params = create_search_params(flann_params);
         index->knnSearch(Matrix<ElementType>(testset, tcount, index->veclen()),
                          m_indices,
-                         m_dists, nn, SearchParams(flann_params->checks) );
+                         m_dists, nn, search_params );
         delete index;
         return 0;
     }
@@ -517,9 +529,10 @@ int __flann_find_nearest_neighbors_index(flann_index_t index_ptr, typename Dista
         Matrix<int> m_indices(result,tcount, nn);
         Matrix<DistanceType> m_dists(dists, tcount, nn);
 
+        SearchParams search_params = create_search_params(flann_params);
         index->knnSearch(Matrix<ElementType>(testset, tcount, index->veclen()),
                          m_indices,
-                         m_dists, nn, SearchParams(flann_params->checks) );
+                         m_dists, nn, search_params );
 
         return 0;
     }
@@ -610,9 +623,10 @@ int __flann_radius_search(flann_index_t index_ptr,
 
         Matrix<int> m_indices(indices, 1, max_nn);
         Matrix<DistanceType> m_dists(dists, 1, max_nn);
+        SearchParams search_params = create_search_params(flann_params);
         int count = index->radiusSearch(Matrix<ElementType>(query, 1, index->veclen()),
                                         m_indices,
-                                        m_dists, radius, SearchParams(flann_params->checks) );
+                                        m_dists, radius, search_params );
 
 
         return count;

src/cpp/flann/flann.h

@@ -48,6 +48,9 @@ struct FLANNParameters
     int checks;                /* how many leafs (features) to check in one search */
     float cb_index;            /* cluster boundary index. Used when searching the kmeans tree */
     float eps;     /* eps parameter for eps-knn search */
+    int sorted;     /* indicates if results returned by radius search should be sorted or not */
+    int max_neighbors;  /* limits the maximum number of neighbors should be returned by radius search */
+    int cores;      /* number of paralel cores to use for searching */
 
     /*  kdtree index parameters */
     int trees;                 /* number of randomized trees to use (for kdtree) */

src/python/pyflann/flann_ctypes.py

@@ -85,6 +85,9 @@ class FLANNParameters(CustomStructure):
         ('checks', c_int),
         ('cb_index', c_float),
         ('eps', c_float),
+        ('sorted', c_int),
+        ('max_neighbors', c_int),
+        ('cores', c_int),
         ('trees', c_int),
         ('leaf_max_size', c_int),
         ('branching', c_int),
@@ -105,6 +108,9 @@ class FLANNParameters(CustomStructure):
         'checks' : 32,
         'eps' : 0.0,
         'cb_index' : 0.5,
+        'sorted' : 1,
+        'max_neighbors' : -1,
+        'cores' : 0,
         'trees' : 1,
         'leaf_max_size' : 4,
         'branching' : 32,