splaytree 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d251409b924ce93ff916bf31539babb39da6ff50
-  data.tar.gz: 96ce8b423c24cc2cdc21d8e9a3afe04f89aaae78
+  metadata.gz: c63b99bb2fb5b4964f06f89b6d30ee8aec87b00a
+  data.tar.gz: b04a5e1d21bd39e3e0b5a237104b8c43f36811c6
 SHA512:
-  metadata.gz: 9815b103c477f5fccde78d85fd48c00b89b13aa0162495fe53eeb843c96cb4bb36721d260d687ae35d41fbf2981e8a5f68fe452b5d46663f908d171a319da07a
-  data.tar.gz: ac6a350fd0a2a98df6bf46dde19837c84fd8ed34499410629f3840bdb3b365896aacedd75971298423f052e020d93ddfb9f702386d582c693334be9fa349dbcb
+  metadata.gz: ddfb60c119269a6105ee7656aec1143dec67d465031f02df748981778703c781c3313d213fd927eb4222ec2e9b6d70a3c0eee1b78461057194ea486251612e52
+  data.tar.gz: cb55c77d73bfabed3183cf6281ec2453f2445ee3ce188a7f6b610a186a71de7db8e511cbbc9953e4e7faf8350a95022b555e5298eb19d9d1e099f3def02fef92

data/lib/splaytree/node.rb

@@ -26,8 +26,8 @@ class Splaytree
       deleted
     end
 
-    def has_duplicates?
-      @duplicates.length > 0
+    def duplicates?
+      !@duplicates.empty?
     end
 
     def root?
@@ -67,18 +67,18 @@ class Splaytree
         self.parent = nil
       end
 
-      if self.object_id == parent.left.object_id
-        parent.set_left(self.right)
-        self.set_right(parent)
+      if object_id == parent.left.object_id
+        parent.set_left(right)
+        set_right(parent)
       else
-        parent.set_right(self.left)
-        self.set_left(parent)
+        parent.set_right(left)
+        set_left(parent)
       end
     end
 
     def zigzig?
-      (self.object_id == parent.left.object_id && parent.object_id == gparent.left.object_id) ||
-        (self.object_id == parent.right.object_id && parent.object_id == gparent.right.object_id)
+      (object_id == parent.left.object_id && parent.object_id == gparent.left.object_id) ||
+        (object_id == parent.right.object_id && parent.object_id == gparent.right.object_id)
     end
 
     def to_s
@@ -94,9 +94,9 @@ class Splaytree
       [key, value]
     end
 
-    def <=>(node)
-      return unless node
-      self.key <=> node.key
+    def <=>(other)
+      return unless other
+      key <=> other.key
     end
 
   end

data/lib/splaytree/version.rb

@@ -1,3 +1,3 @@
 class Splaytree
-  VERSION = "0.1.0"
+  VERSION = '0.2.0'
 end

data/lib/splaytree.rb

@@ -4,23 +4,19 @@ require 'splaytree/node'
 class Splaytree
   include Enumerable
 
-  attr_reader :root
+  attr_reader :root, :size
+  alias_method :length, :size
 
   def initialize
     @root = nil
     @size = 0
   end
 
-  def size
-    @size
-  end
-  alias_method :length, :size
-
   def empty?
     @root.nil?
   end
 
-  def has_key?(key)
+  def key?(key)
     !!get(key)
   end
 
@@ -55,9 +51,7 @@ class Splaytree
   def min
     return if empty?
     node = @root
-    while node.left
-      node = node.left
-    end
+    node = node.left while node.left
     splay(node)
     node.to_h
   end
@@ -65,9 +59,7 @@ class Splaytree
   def max
     return if empty?
     node = @root
-    while node.right
-      node = node.right
-    end
+    node = node.right while node.right
     splay(node)
     node.to_h
   end
@@ -76,7 +68,7 @@ class Splaytree
     height_recursive(@root)
   end
 
-  def get_with_duplicates(key)
+  def duplicates(key)
     return if empty?
     get(key)
     return if @root.key != key
@@ -99,7 +91,7 @@ class Splaytree
         break if node.right.nil?
         node = node.right
       else
-        fail
+        raise TypeError, 'Keys should be comparable!'
       end
     end
     splay(node)
@@ -118,25 +110,25 @@ class Splaytree
           node.add_duplicate!(value)
           break
         when -1
-          if !current.left
+          unless current.left
             current.set_left(node)
             break
           end
           current = current.left
         when 1
-          if !current.right
+          unless current.right
             current.set_right(node)
             break
           end
           current = current.right
         else
-          fail
+          raise TypeError, 'Keys should be comparable!'
         end
       end
     end
     splay(node)
     @size += 1
-    return true
+    true
   end
   alias_method :[]=, :insert
 
@@ -145,14 +137,14 @@ class Splaytree
     get(key)
     return false if @root.key != key
     @root.value = value
-    return true
+    true
   end
 
   def remove(key)
     return if empty?
     get(key)
     return if @root.key != key
-    if @root.has_duplicates?
+    if @root.duplicates?
       deleted = @root.remove_duplicate!
     else
       deleted = @root.value
@@ -177,7 +169,7 @@ class Splaytree
   end
 
   def each
-    return if self.empty?
+    return if empty?
     stack = []
     node = @root
     loop do
@@ -196,11 +188,11 @@ class Splaytree
     end
   end
 
-  def each_key(&block)
+  def each_key
     each { |node| yield node.key }
   end
 
-  def each_value(&block)
+  def each_value
     each { |node| yield node.value }
   end
 
@@ -215,8 +207,14 @@ class Splaytree
   def report
     return if empty?
     result = []
-    each_with_index do |node, index|
-      result << { node: node.key, parent: node.parent&.key, left: node.left&.key, right: node.right&.key }
+    each do |node|
+      item = {
+        node: node.key,
+        parent: node.parent && node.parent.key,
+        left: node.left && node.left.key,
+        right: node.right && node.right.key
+      }
+      result << item
     end
     result
   end
@@ -226,11 +224,7 @@ class Splaytree
     def get_one_higher_of_root
       return if @root.right.nil?
       node = @root.right
-      while node.left do
-        if node.left
-          node = node.left
-        end
-      end
+      node = node.left while node.left
       splay(node)
       node.to_h
     end
@@ -238,9 +232,7 @@ class Splaytree
     def get_one_lower_of_root
       return if @root.left.nil?
       node = @root.left
-      while node.right do
-        node = node.right
-      end
+      node = node.right while node.right
       splay(node)
       node.to_h
     end
@@ -254,7 +246,7 @@ class Splaytree
     end
 
     def splay(node)
-      while !node.root? do
+      until node.root?
         parent = node.parent
         if parent.root?
           node.rotate

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: splaytree
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Artur Babagulyyev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-22 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,9 +80,11 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-description: A splay tree is a self-adjusting binary search tree with the additional
-  property that recently accessed elements are quick to access again. It performs
-  basic operations such as insertion, look-up and removal in O(log n) amortized time.
+description: |-
+  Splay tree is an efficient implementation of a balanced
+      binary search tree that takes advantage of locality
+      in the keys used in incoming lookup requests.
+      For many applications, there is excellent key locality.
 email:
 - artur.babagulyyev@gmail.com
 executables: []