Merge branch 'master' of https://github.com/mohawkjohn/flann

Author: Marius Muja

src/ruby/lib/flann.rb

@@ -105,9 +105,19 @@ class Parameters < InitializableStruct
 
     DEFAULT       = {algorithm: :kdtree,
                      checks: 32, eps: 0.0,
-                     sorted: 0, max_neighbors: -1, cores: 0,
-                     trees: 4, leaf_max_size: 4,
-                     log_level: :none, random_seed: 0}
+                     sorted: 1, max_neighbors: -1, cores: 0,
+                     trees: 1, leaf_max_size: 4,
+                     branching: 32, iterations: 5,
+                     centers_init: :random,
+                     cluster_boundary_index: 0.5,
+                     target_precision: 0.9,
+                     build_weight: 0.01,
+                     memory_weight: 0.0,
+                     sample_fraction: 0.1,
+                     table_number: 12,
+                     key_size: 20,
+                     multi_probe_level: 2,
+                     log_level: :warn, random_seed: -1}
 
 
   end
@@ -271,11 +281,9 @@ def cluster dataset, clusters, parameters = {}
   attach_function :flann_free_index_double, [:index_ptr, :index_params_ptr], :int
 
   attach_function :flann_set_distance_type, [:distance_type, :int], :void
-  begin
-    attach_function :flann_get_distance_type, [], :distance_type
-    attach_function :flann_get_distance_order, [], :int
-  rescue FFI::NotFoundError
-  end
+
+  attach_function :flann_get_distance_type, [], :distance_type
+  attach_function :flann_get_distance_order, [], :int
 
   attach_function :flann_compute_cluster_centers_byte,    [:pointer, :int, :int, :int, :pointer, :index_params_ptr], :int
   attach_function :flann_compute_cluster_centers_int,     [:pointer, :int, :int, :int, :pointer, :index_params_ptr], :int

src/ruby/lib/flann/version.rb

@@ -30,7 +30,7 @@ module VERSION
     MAJOR = 1
     MINOR = 8
     TINY  = 4
-    MINISCULE = 1
+    MINISCULE = 2
 
     STRING = [MAJOR, MINOR, TINY, MINISCULE].compact.join('.')
   end

src/ruby/spec/index_spec.rb

@@ -48,6 +48,37 @@
         it "runs without error" do
           @index.nearest_neighbors @testset, 5
         end
+
+        if dtype == :float32
+          it "runs a :kdtree_single search correctly" do
+            @dataset = read_dataset "test.dataset"
+            @testset = @dataset[0,:*].clone
+            @index   = Flann::Index.new(@dataset) do |t|
+              t[:algorithm] = :kdtree_single
+            end
+            @index.build!
+            indices, distances = @index.nearest_neighbors @testset, 11
+            #expect(indices).to eq([0,1,256,257,2,512,258,513,514,3,768])
+            expect(indices[0]).to eq(0)
+            expect(indices[1..2].sort).to eq([1,256])
+            expect(indices[3]).to eq(257)
+            expect(indices[4..5].sort).to eq([2,512])
+            expect(indices[6..7].sort).to eq([258,513])
+            expect(indices[8]).to eq(514)
+            expect(indices[9..10].sort).to eq([3,768])
+
+            expect(distances[0]).to be_within(1E-16).of(0.0)
+            expect(distances[1]).to be_within(1E-4).of(2.614689)
+            expect(distances[2]).to be_within(1E-4).of(2.614689)
+            expect(distances[3]).to be_within(1E-4).of(5.229378)
+            expect(distances[4]).to be_within(1E-4).of(10.465225)
+            expect(distances[5]).to be_within(1E-4).of(10.465225)
+            expect(distances[6]).to be_within(1E-4).of(13.079914)
+            expect(distances[7]).to be_within(1E-4).of(13.079914)
+            expect(distances[8]).to be_within(1E-4).of(20.93045)
+            expect(distances[9]).to be_within(1E-4).of(23.541904)
+          end
+        end
       end
 
 

src/ruby/spec/spec_helper.rb

@@ -28,4 +28,23 @@
 require 'rspec'
 require 'rspec/longrun'
 
-require "./lib/flann"
+require "./lib/flann"
+
+# Helper function for reading a test dataset so we can test nearest neighbors
+# and radius search and such.
+def read_dataset filename
+  Dir.chdir("spec") do
+    f = File.new(filename, 'r')
+    n = NMatrix.new([65536, 3], dtype: :float32)
+    i = 0
+    while line = f.gets
+      line.chomp!
+      fields = line.split
+      n[i,:*] = fields.map { |field| field.to_f }
+
+      i += 1
+    end
+
+    n
+  end
+end