Updated search parameters for python/matlab bindings

Author: mariusmuja

src/cpp/flann/flann.cpp

@@ -33,10 +33,10 @@
 
 struct FLANNParameters DEFAULT_FLANN_PARAMETERS = {
     FLANN_INDEX_KDTREE,
-    32, 0.2f, 0.0f,
+    32, 0.0f,
     0, -1, 0,
     4, 4,
-    32, 11, FLANN_CENTERS_RANDOM,
+    32, 11, FLANN_CENTERS_RANDOM, 0.2f,
     0.9f, 0.01f, 0, 0.1f,
     FLANN_LOG_NONE, 0
 };

src/cpp/flann/flann.h

@@ -46,7 +46,6 @@ struct FLANNParameters
 
     /* search time parameters */
     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 */
@@ -60,6 +59,7 @@ struct FLANNParameters
     int branching;             /* branching factor (for kmeans tree) */
     int iterations;            /* max iterations to perform in one kmeans cluetering (kmeans tree) */
     enum flann_centers_init_t centers_init;  /* algorithm used for picking the initial cluster centers for kmeans tree */
+    float cb_index;            /* cluster boundary index. Used when searching the kmeans tree */
 
     /* autotuned index parameters */
     float target_precision;    /* precision desired (used for autotuning, -1 otherwise) */

src/matlab/flann_build_index.m

@@ -23,7 +23,7 @@
         id = map.(value);
     end
 
-    default_params = struct('algorithm', 'kdtree' ,'checks', 32,  'cb_index', 0.4, 'trees', 4, 'branching', 32, 'iterations', 5, 'centers_init', 'random', 'target_precision', 0.9,'build_weight', 0.01, 'memory_weight', 0, 'sample_fraction', 0.1, 'log_level', 'warning', 'random_seed', 0);
+    default_params = struct('algorithm', 'kdtree' ,'checks', 32, 'eps', 0.0, 'sorted', 1, 'max_neighbors', -1, 'cores', 1, 'trees', 4, 'branching', 32, 'iterations', 5, 'centers_init', 'random', 'cb_index', 0.4, 'target_precision', 0.9,'build_weight', 0.01, 'memory_weight', 0, 'sample_fraction', 0.1, 'log_level', 'warning', 'random_seed', 0);
 
     if ~isstruct(build_params)
         error('The "build_params" argument must be a structure');

src/matlab/flann_search.m

@@ -51,7 +51,8 @@
         id = map.(value);
     end
 
-    default_params = struct('algorithm', 'kdtree' ,'checks', 32,  'trees', 4, 'branching', 32, 'iterations', 5, 'centers_init', 'random', 'cb_index', 0.4, 'target_precision', -1, 'build_weight', 0.01, 'memory_weight', 0, 'sample_fraction', 0.1, 'log_level', 'warning', 'random_seed', 0);
+    default_params = struct('algorithm', 'kdtree' ,'checks', 32, 'eps', 0.0, 'sorted', 1, 'max_neighbors', -1, 'cores', 1, 'trees', 4, 'branching', 32, 'iterations', 5, 'centers_init', 'random', 'cb_index', 0.4, 'target_precision', 0.9,'build_weight', 0.01, 'memory_weight', 0, 'sample_fraction', 0.1, 'log_level', 'warning', 'random_seed', 0);
+
 
     if ~isstruct(search_params)
         error('The "search_params" argument must be a structure');

src/matlab/nearest_neighbors.cpp

@@ -81,21 +81,33 @@ static void matlabStructToFlannStruct( const mxArray* mexParams, FLANNParameters
 
     // search
     flannParams.checks = (int)*(mxGetPr(mxGetField(mexParams, 0,"checks")));
+    flannParams.eps = (float)*(mxGetPr(mxGetField(mexParams, 0,"eps")));
+    flannParams.sorted = (int)*(mxGetPr(mxGetField(mexParams, 0,"sorted")));
+    flannParams.max_neighbors = (int)*(mxGetPr(mxGetField(mexParams, 0,"max_neighbors")));
+    flannParams.cores = (int)*(mxGetPr(mxGetField(mexParams, 0,"cores")));
 }
 
-static void flannStructToMatlabStruct( const FLANNParameters& flannParams, mxArray* mexParams )
+static mxArray* flannStructToMatlabStruct( const FLANNParameters& flannParams )
 {
+    const char* fieldnames[] = {"algorithm", "checks", "eps", "sorted", "max_neighbors", "cores", "trees", "leaf_max_size", "branching", "iterations", "centers_init", "cb_index"};
+    mxArray* mexParams = mxCreateStructMatrix(1, 1, sizeof(fieldnames)/sizeof(const char*), fieldnames);
+
     mxSetField(mexParams, 0, "algorithm", to_mx_array(flannParams.algorithm));
     mxSetField(mexParams, 0, "checks", to_mx_array(flannParams.checks));
-    mxSetField(mexParams, 0, "cb_index", to_mx_array(flannParams.cb_index));
     mxSetField(mexParams, 0, "eps", to_mx_array(flannParams.eps));
+    mxSetField(mexParams, 0, "sorted", to_mx_array(flannParams.sorted));
+    mxSetField(mexParams, 0, "max_neighbors", to_mx_array(flannParams.max_neighbors));
+    mxSetField(mexParams, 0, "cores", to_mx_array(flannParams.cores));
 
     mxSetField(mexParams, 0, "trees", to_mx_array(flannParams.trees));
     mxSetField(mexParams, 0, "leaf_max_size", to_mx_array(flannParams.trees));
 
     mxSetField(mexParams, 0, "branching", to_mx_array(flannParams.branching));
     mxSetField(mexParams, 0, "iterations", to_mx_array(flannParams.iterations));
     mxSetField(mexParams, 0, "centers_init", to_mx_array(flannParams.centers_init));
+    mxSetField(mexParams, 0, "cb_index", to_mx_array(flannParams.cb_index));
+
+    return mexParams;
 }
 
 
@@ -388,9 +400,7 @@ static void _build_index(int nOutArray, mxArray* OutArray[], int nInArray, const
     pOut[0] = typedIndex;
 
     if (nOutArray > 1) {
-        const char* fieldnames[] = {"algorithm", "checks", "cb_index", "eps", "trees", "leaf_max_size", "branching", "iterations", "centers_init"};
-        OutArray[1] = mxCreateStructMatrix(1, 1, sizeof(fieldnames)/sizeof(const char*), fieldnames);
-        flannStructToMatlabStruct(p, OutArray[1]);
+        OutArray[1] = flannStructToMatlabStruct(p);
     }
     if (nOutArray > 2) {
         OutArray[2] = mxCreateDoubleMatrix(1, 1, mxREAL);

src/python/pyflann/flann_ctypes.py

@@ -83,7 +83,6 @@ class FLANNParameters(CustomStructure):
     _fields_ = [
         ('algorithm', c_int),
         ('checks', c_int),
-        ('cb_index', c_float),
         ('eps', c_float),
         ('sorted', c_int),
         ('max_neighbors', c_int),
@@ -93,6 +92,7 @@ class FLANNParameters(CustomStructure):
         ('branching', c_int),
         ('iterations', c_int),
         ('centers_init', c_int),
+        ('cb_index', c_float),
         ('target_precision', c_float),
         ('build_weight', c_float),
         ('memory_weight', c_float),
@@ -107,7 +107,6 @@ class FLANNParameters(CustomStructure):
         'algorithm' : 'kdtree',
         'checks' : 32,
         'eps' : 0.0,
-        'cb_index' : 0.5,
         'sorted' : 1,
         'max_neighbors' : -1,
         'cores' : 0,
@@ -116,6 +115,7 @@ class FLANNParameters(CustomStructure):
         'branching' : 32,
         'iterations' : 5,
         'centers_init' : 'random',
+        'cb_index' : 0.5,
         'target_precision' : 0.9,
         'build_weight' : 0.01,
         'memory_weight' : 0.0,

test/CMakeLists.txt

@@ -24,7 +24,7 @@ if (GTEST_FOUND AND HDF5_FOUND)
 
     set(TEST_LIBRARIES "${HDF5_LIBRARIES}")
     if (HDF5_IS_PARALLEL)
-        set(TEST_LINK_LIBRARIES "${TEST_LIBRARIES} ${MPI_LIBRARIES}")
+        set(TEST_LIBRARIES "${TEST_LIBRARIES};${MPI_LIBRARIES}")
     endif()
 
     flann_add_gtest(flann_linear_test flann_linear_test.cpp)