dskiplist 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89e285ab3fac883f1ad22f5959e1a85672c9412f
-  data.tar.gz: 8ed03b7fda7c621f0f806840958eeaa85e03759f
+  metadata.gz: d4ae3f9e4947138a5eff42cf7e5ba9d3880efdae
+  data.tar.gz: 11d5d9ef6b19298fa1a65cf89837ecf0d0197f02
 SHA512:
-  metadata.gz: f3f1318ad48db40ee5aff1cde484508a3e8707f0d99a5433088b13a822cfa81010c9ed3ba24c856aa61db1c988104141edcb18bacec79c019b1f29caccbcac24
-  data.tar.gz: 7a218abfea5cc99740a54ba22b15f16ab8b2c8a42200433f8107b6ee2bd4649b4a8daf9fe32edfbf3c44ca7ea341933a46946c418f0e42727e8e3c9a0cbf0510
+  metadata.gz: 28887ea80ed34d66a994d0cc6f055c399d8a14ba87b63be7885432d24d6a166b67bc6732eb5a7df46981b1d1370849dac15db03879314b9b88141681b0fe9519
+  data.tar.gz: 4002864d186702f36c99ab3679ef76d09c29aa425918c1bd5d2e971b0ea97a3686bdfbdad21e9cf383b1e77fc3d19fe8a612b04238f96376674d97c66b068c07

data/README.md

@@ -1,6 +1,6 @@
 # DSkipList
 
-Warning: This software is alpha.
+Warning: This software is alpha. If you find a bug, please file the issue on github
 
 This is a ruby skiplist much faster than the ruby skiplist gem here https://github.com/metanest/ruby-skiplist
 Benchmarks below
@@ -27,6 +27,7 @@ require 'dskiplist'
 
 list = DSkipList.new
 
+#strings and symbols are also valid keys, just keep it consistent
 list[1] = 'dog'
 list[2] = 'cat'
 

data/dskiplist.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "pry"
 end

data/lib/dskiplist/version.rb

@@ -1,3 +1,3 @@
 module Dskiplist
-  VERSION = "0.0.2"
+  VERSION = "1.0.0"
 end

data/lib/dskiplist.rb

@@ -51,25 +51,28 @@ class DSkipList
     initialize(@max_level)
     return self
   end
-
+  
+  #returns previous node if exact key match is not found
   def find_node(search_key)
     x = @header
     @level.downto(0) do |i|
+      #puts "on level #{i}"
       while x.forward[i] and x.forward[i].key < search_key
+        #puts "walked node #{x.key} on level #{i}"
         x = x.forward[i]
       end
     end 
-    x = x.forward[0]
-    if x and x.key == search_key
-      return x
-    else
-      return nil
-    end
+    x = x.forward[0] if x.forward[0].key == search_key
+    return x
   end
   
   def [] key
     node = self.find_node(key)
-    return node.value if node
+    if node and node.key == key
+      return node.value
+    else
+      return nil
+    end
   end 
 
   def random_level
@@ -147,29 +150,25 @@ class DSkipList
   def walk(from, to, limit, level, output)
     if from 
       x = find_node(from)
-      raise 'start node not found' if !x
+      x = x.forward[level] if x.forward[level]
     else
       x = @header.forward[level]
     end
-    if to 
-      to_node = find_node(to)
-      raise 'stop node not found' if !to_node
-    end
-    #if no block is given, assume we are trying to count
+    #if no block is given, assume we are trying to count and avoid the expensive yield below
     if !block_given? 
       count = 0
       while x
+        break if to && x.key >= to
         count += 1
-        break if to_node == x
         x = x.forward[level]
       end
       return count
-    elsif to_node or limit
+    elsif to or limit
       count = 0 
-      while x
+      while !x.nil?
         yield(x, output) 
         count += 1
-        break if to_node and x == to_node 
+        break if to and x.key >= to 
         break if limit and count == limit 
         x = x.forward[level]
       end

data/test/skiplist_spec.rb

@@ -1,5 +1,6 @@
 require 'rspec'
-require 'dskiplist'
+require './lib/dskiplist.rb'
+require 'pry' 
 #Checks for stray links in the upper levels. There may be a more exhaustive way to check integrity. 
 def check_integrity(list)
   complete = list.to_a
@@ -12,6 +13,7 @@ def check_integrity(list)
 end
 
 describe "The skiplist" do
+  puts "test suite launching"
   before :each do
     @list = DSkipList.new
     100.times {|n| @list[n] = n}
@@ -21,6 +23,7 @@ describe "The skiplist" do
   end 
 
   it "should lookup value correctly" do
+    puts "30 returned #{@list[30]}"
     expect(@list[30]).to eq(30)
   end
 
@@ -31,14 +34,14 @@ describe "The skiplist" do
 
   it "should count correctly" do
     expect(@list.count).to eq(100)
-    expect(@list.count(50,99)).to eq(50)
-    expect(@list.count(1,1)).to eq(1)
+    expect(@list.count(50,99)).to eq(48)
+    expect(@list.count(1,1)).to eq(0)
   end
 
   it "should convert to array" do
     entire = @list.to_a
     expect(entire.count).to eq(100)
-    subset = @list.to_a(26,50)
+    subset = @list.to_a(25,50)
     expect(subset.count).to eq(25)
     26.upto(50) do |n|
       expect(subset.include? n).to eq(true)
@@ -47,9 +50,9 @@ describe "The skiplist" do
 
   it "should convert to hash" do
     expect(@list.to_h.count).to eq(100)
-    expect(@list.to_h(51,75).count).to eq(25)
+    expect(@list.to_h(50,75).count).to eq(25)
     subset = @list.to_h(25,50)
-    25.upto(50) do |n|
+    26.upto(50) do |n|
       expect(subset[n]).to eq(n)
     end 
   end
@@ -62,5 +65,7 @@ describe "The skiplist" do
   it "should delete multiple elements properly" do 
     (25..75).each {|n| @list.delete n}
     (25..75).each {|n| expect(@list[n]).to eq(nil)}
+    #check sizes of each level to make sure we aren't chopping off the tail when we delete.  Seems fine
+    #@list.level.downto(0) {|l| puts "level #{l} contains #{@list.count(nil, nil, l)}"}
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dskiplist
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Forrest Allison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - light24bulbs@gmail.com
@@ -59,7 +73,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".dskiplist.gemspec.swo"
 - ".git-new/HEAD"
 - ".git-new/config"
 - ".git-new/description"
@@ -82,7 +95,6 @@ files:
 - ".git-new/objects/ae/ee3428c017916e5cc0e57d387224f33ed0b990"
 - ".git-new/objects/d8/7d4be66f458acd52878902bbf1391732ad21e1"
 - ".gitignore"
-- ".skiplist-test.rb.swo"
 - Gemfile
 - LICENSE.txt
 - README.md