vptree 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 534808a7c6d591abce5f9b3f1ba41fa76b771dae
-  data.tar.gz: 0cd5cace4294ca05b8927d69ffe129e08fce5504
+  metadata.gz: ab1cad55c67c31419c094b75e69ff8c644975588
+  data.tar.gz: 767372d59512610d1afc4735af743c8e9a6abae0
 SHA512:
-  metadata.gz: 84f1f056af48753b5b1be567a2ab3b4d111c398157ef455a4334509051ee855c7cf9edf41389c7986674c3a7f61f130f45317052341d89be96f9f4576645ecb9
-  data.tar.gz: df913be4c58b93a13ef74c501741ad619a1da22b9c21b78807a24ca498081f83f8c6571bb0de3f082262a934d1ca0b296ffa71076a4955c41ed32d40df2c91bf
+  metadata.gz: dde8685d96b68f50349e574bbebaec071c18f6860db08daf04843be5196646db7fb349d7979e4d3ae1d10c09a97611966ef21e15ec5687f77060c9ed59d3f820
+  data.tar.gz: 1a3316078b12f532b3e1cc9debff1cabf85b73c9d620190126de64579ee4e27d8f060461cb3d545a348e13e9183bbedbaf336b4e5663ab57b35d3bfad1ce9075

data/lib/vptree.rb

@@ -1,9 +1,11 @@
-require "vptree/version"
-require 'distance_measures'
+require 'vptree/version'
+#require 'distance_measures'
+#require 'measurable'
 require 'algorithms'
 
 module Vptree
-
+  # Implementation of queue with fixed size.
+  # Will store elements with low priority
   class FixedLengthQueue < Containers::PriorityQueue
     def initialize(limit = 4) # 4 for example
       super()
@@ -25,18 +27,31 @@ module Vptree
       end
     end
 
-    def dump()
-      size.times.map{ @heap.pop }
+    def dump
+      size.times.map { @heap.pop }
+    end
+  end
+
+  # Mixin for calculating distance in VPNode and VPTree
+  # compatable with Distance-measure gem
+  module CalcDistance
+    def calc_dist(obj1, obj2)
+      return @is_block ? obj1.distance(obj2, &@distance_measure) : obj1.distance(obj2, @distance_measure)
+    rescue
+      # old fasion distance gem, for arrays only
+      return @is_block ? @distance_measure.call(obj1, obj2) : obj1.send(@distance_measure, obj2)
     end
   end
 
+  # Implementation of node of VP-tree
   class VPNode
-    attr_accessor :is_block, :distance_measure, :data, :vp_point, :left_node, :right_node, :mu
+    attr_accessor :is_block, :distance_measure, :data
+    attr_accessor :vp_point, :left_node, :right_node, :mu
 
-    def initialize(data, options={}, &block)
+    def initialize(data, options = {}, &block)
       @data = data
-      @is_block = block != nil
-      @distance_measure = block || options[:distance_measure]  || :euclidean_distance
+      @is_block = block_given?
+      @distance_measure = block || options[:distance_measure] || :euclidean_distance
       @left_node = nil
       @right_node = nil
       @mu = 0
@@ -47,31 +62,26 @@ module Vptree
       @distance_measure = other_node.distance_measure
     end
 
-    def calc_dist(obj1, obj2)
-      begin
-        return  @is_block ? obj1.calc_distance(obj2, &@distance_measure) : obj1.calc_distance(obj2, @distance_measure)
-      rescue
-        return @is_block ? @distance_measure.call(obj1, obj2) : obj1.send(@distance_measure, obj2) # old fasion distance gem, for arrays only
-      end
-    end
-
-    def separate()
+    include CalcDistance
 
+    def separate
       if @data.size <= 2
         @vp_point = @data.first
         @right_node = nil
         if @data.size == 2
-          @mu = calc_dist(@data[0],@data[1])/2
+          @mu = calc_dist(@data[0], @data[1]) / 2
           @left_node = VPNode.new([@data[1]])
         end
       else
         @vp_point = @data.sample
         # all sorted nodes
-        next_node_data = @data.sort_by{ |a| calc_dist(a, @vp_point) }[1..-1]
+        next_node_data = @data.sort_by { |a| calc_dist(a, @vp_point) }[1..-1]
         len = next_node_data.size
-        r_points = next_node_data[0..(len/2 - 1)];
-        l_points = next_node_data[(len/2)..-1]
-        @mu = (calc_dist(r_points.last, @vp_point) + calc_dist(l_points.first, @vp_point))/2.0
+        r_points = next_node_data[0..(len / 2 - 1)]
+        l_points = next_node_data[(len / 2)..-1]
+        @mu = calc_dist(r_points.last, @vp_point)
+        @mu += calc_dist(l_points.first, @vp_point)
+        @mu /= 2.0
         @right_node = VPNode.new(r_points)
         @left_node  = VPNode.new(l_points)
       end
@@ -82,30 +92,22 @@ module Vptree
       @left_node.separate if @left_node
       @data = nil
     end
-
   end
 
+  # Implementation of VP-tree
   class VPTree
-
     attr_accessor :root
 
-    def initialize(data, options={}, &block)
+    def initialize(data, options = {}, &block)
       @data = data
-      @is_block = block != nil
-      @distance_measure = block || options[:distance_measure]  || :euclidean_distance
+      @is_block = block_given?
+      @distance_measure = block || options[:distance_measure] || :euclidean_distance
       @root = VPNode.new(data, options, &block)
     end
 
-    def calc_dist(obj1, obj2)
-      begin
-        return  @is_block ? obj1.calc_distance(obj2, &@distance_measure) : obj1.calc_distance(obj2, @distance_measure)
-      rescue
-        return @is_block ? @distance_measure.call(obj1, obj2) : obj1.send(@distance_measure, obj2) # old fasion distance gem, for arrays only
-      end
-    end
-
+    include CalcDistance
 
-    def build_tree()
+    def build_tree
       @root.separate
     end
 
@@ -118,13 +120,13 @@ module Vptree
       # sorted from closest to farthest neighbor
       neighbors = FixedLengthQueue.new(k)
 
-      while nodes_to_visit.size() > 0 do
-        node = nodes_to_visit.pop()
+      while nodes_to_visit.size > 0
+        node = nodes_to_visit.pop
         d = calc_dist(obj, node.vp_point)
         if d < tau
           # store node.vp_point as a neighbor if it's closer than any other point
           # seen so far
-          neighbors.push(node.vp_point, d)
+          neighbors.push([d, node.vp_point], d)
           # shrink tau
           tau = neighbors.max_priority
         end
@@ -141,7 +143,8 @@ module Vptree
         end
       end
 
-      return neighbors.dump
+      return neighbors.dump.reverse
     end
+
   end
 end

data/lib/vptree/version.rb

@@ -1,3 +1,3 @@
 module Vptree
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/vptree.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |spec|
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.
-  #if spec.respond_to?(:metadata)
-  #  spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
-  #else
-  #  raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
-  #end
+  if spec.respond_to?(:metadata)
+   # spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
+  else
+    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
+  end
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vptree
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - generall
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-27 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler