Changeset 15841

Timestamp:

03/14/18 17:48:39 (7 years ago)

Author:

gkronber

Message:

#2886 fixed FLANNParameters structure

File:

• branches/2886_SymRegGrammarEnumeration/ExpressionClustering/Flann.cs (modified) (6 diffs)

branches/2886_SymRegGrammarEnumeration/ExpressionClustering/Flann.cs

@@ -86 +86 @@
       public int checks;                /* how many leafs (features) to check in one search */
       public float cb_index;            /* cluster boundary index. Used when searching the kmeans tree */
+      public float eps; 
 
       /*  kdtree index parameters */
       public int trees;                 /* number of randomized trees to use (for kdtree) */
+      public int leaf_max_size;
 
       /* kmeans index parameters */
@@ -100 +102 @@
       public float memory_weight;       /* index memory weigthing factor */
       public float sample_fraction;     /* what fraction of the dataset to use for autotuning */
+
+      public uint table_number_;
+      public uint key_size_;
+      public uint multi_probe_level_;
 
       /* other parameters */
@@ -137 +143 @@
 
     [DllImport("flann-1.7.1.dll")]
-    public static extern int flann_build_index(float[] dataset, int rows, int cols, ref float speedup, ref FLANNParameters flann_params);
+    public static extern IntPtr flann_build_index(float[] dataset, int rows, int cols, ref float speedup, ref FLANNParameters flann_params);
+
+    [DllImport("flann-1.7.1.dll")]
+    public static extern int flann_find_nearest_neighbors_index(IntPtr index_id, float[] testset, int trows, int[] indices, float[] dists, int nn, int checks, ref FLANNParameters flann_params);
 
     [DllImport("flann-1.7.1.dll")]
@@ -152 +161 @@
       var _dim = dataset.First().Length;
       FLANNParameters p = DEFAULT_FLANN_PARAMETERS;
-      p.algorithm = flann_algorithm_t.FLANN_INDEX_AUTOTUNED;
+      p.algorithm = flann_algorithm_t.FLANN_INDEX_LINEAR;
       p.centers_init = flann_centers_init_t.FLANN_CENTERS_RANDOM;
       p.target_precision = 0.9f;
@@ -172 +181 @@
 
       float speedup = -1.0f;
-      // _ds must be a rows × cols matrix stored in row-major order (one feature on each row) 
-      var index = flann_build_index(_ds, rows: dataset.Count, cols: _dim, speedup: ref speedup, flann_params: ref p);
+      // _ds must be a rows × cols matrix stored in row-major order (one feature on each row)                         
+      //var index = flann_build_index(_ds, rows: dataset.Count, cols: _dim, speedup: ref speedup, flann_params: ref p);
+      
 
       // copy testset
       var _testset = new float[_tRows * _dim];
       i = 0;
-      foreach (var e in queryset) {
-        foreach (var ei in e) {
-          _testset[i++] = (float)ei;
+      for(int d = 0; d < _dim; d++) {
+        foreach(var e in queryset) {
+          _testset[i++] = (float)e[d];
         }
       }
+
+      //var res = flann_find_nearest_neighbors_index(index, _testset, _tRows, _result, _dists, _nn, 10, ref p);
+
+
       var res =
         flann_find_nearest_neighbors(
@@ -194 +208 @@
       return res;
     }
-
-
   }
 }