dskiplist 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4ae3f9e4947138a5eff42cf7e5ba9d3880efdae
-  data.tar.gz: 11d5d9ef6b19298fa1a65cf89837ecf0d0197f02
+  metadata.gz: cb6861be71eb077b906f12316726cb693ae766f1
+  data.tar.gz: 5ec1bb7f07a7936d02fa7d3635899c018f599fa3
 SHA512:
-  metadata.gz: 28887ea80ed34d66a994d0cc6f055c399d8a14ba87b63be7885432d24d6a166b67bc6732eb5a7df46981b1d1370849dac15db03879314b9b88141681b0fe9519
-  data.tar.gz: 4002864d186702f36c99ab3679ef76d09c29aa425918c1bd5d2e971b0ea97a3686bdfbdad21e9cf383b1e77fc3d19fe8a612b04238f96376674d97c66b068c07
+  metadata.gz: eeb3eb32bfcca7b5e6b0577958178fdd42e1264de0ec21aecc634102132d2872e4b7a08bb975a683f2995f9723cdc25222725f2dca00b1d3a3f90792a18edc85
+  data.tar.gz: aee1b4ccc0bdaf0ca7f356894016599c70af9d40c883b963d075d0390efff88d69b91b7fa258858d7444b15e25daf9973fba01e7ea338baf8a59a1a05a30bb96

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+## DSkipList 1.0.0 (Feb 26, 2014) ##
+
+* Changed all range operations so that they do not include the first element specified (from)
+
+* Ranges now accept nonexistent start and endpoints and the list will still behave, which is more useful for
+* real world situations in which you dont know exactly what values are in your list
+

data/README.md

@@ -97,24 +97,28 @@ Ok, so why use this instead of hash? Order
 >> list.to_a
 => ["duck", "goose", "quail", "pidgin"]
 
-#or in an inclusive range
+#or in a range
 >> from = 1
->> to = 3
+>> through = 3
 #0 is the base layer of the list.  It contains all elements. default 0
 >> layer = 0
 #limit return size if desired
 >> limit = nil
 
->> list.to_a(from, to, limit, layer)
-=> ["duck", "goose", "quail"]
->> list.to_a(2, nil, 2)
+>> list.to_a(from, through, limit, layer)
 => ["goose", "quail"]
+#note that "duck" was omitted.  The range does not include the first element.  
+#You can also use nonexistent node keys like 1.5
+
+#with a start point, no endpoint, and a limit:
+>> list.to_a(2, nil, 2)
+=> ["quail", "pidgin"]
 >> list.to_a(nil, 3, nil)
 => ["duck", "goose", "quail"]
 
-#or count the elements between two elements(plus two to include the endpoints)
->> list.count(from, to)
-=> 3
+#or count the elements between two values (+1 because endpoint is counted) from 1 to 3
+>> list.count(from, through)
+=> 2
 
 ```
 
@@ -131,4 +135,5 @@ Ok, so why use this instead of hash? Order
 
 ToDo: 
 - Jruby multithreading and locking with mutexes for multi-core support.
-- Lazy operations
+- Lazy operations.  For now you can just do them yourself by using find_node to get your start point and calling forward[0] to get the following nodes in O(1) time
+- considering making count O(1) instead of O(log n) by just keeping track of the size 

data/dskiplist.gemspec

@@ -16,6 +16,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  spec.add_runtime_dependency "facter"
+  spec.add_runtime_dependency "thread_safe"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

data/lib/dskiplist/version.rb

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

data/lib/dskiplist.rb

@@ -36,6 +36,7 @@ class DSkipList
       @key = k 
       @value = v.nil? ? k : v 
       @forward = []
+      
     end
   end
 
@@ -62,10 +63,10 @@ class DSkipList
         x = x.forward[i]
       end
     end 
-    x = x.forward[0] if x.forward[0].key == search_key
+    x = x.forward[0] if x.forward[0] and x.forward[0].key == search_key
     return x
   end
-  
+
   def [] key
     node = self.find_node(key)
     if node and node.key == key
@@ -144,10 +145,11 @@ class DSkipList
   end
 
   def count(from = nil, to = nil, level = 0)
-    walk(from, to, nil, level, nil)
+    each(from, to, nil, level, nil)
   end 
 
-  def walk(from, to, limit, level, output)
+  #accepts a block which is run on each element 
+  def each(from=nil, to=nil, limit=nil, level=0, output=nil)
     if from 
       x = find_node(from)
       x = x.forward[level] if x.forward[level]
@@ -182,11 +184,11 @@ class DSkipList
   end
 
   def to_h(from = nil, to = nil, limit = nil, level = 0)
-    walk(from, to, limit, level, {}) {|n, hash| hash[n.key] = n.value}
+    each(from, to, limit, level, {}) {|n, hash| hash[n.key] = n.value}
   end
 
   def to_a(from = nil, to = nil, limit = nil, level = 0)
-    walk(from, to, limit, level, []) {|n, arr| arr.push(n.value)}
+    each(from, to, limit, level, []) {|n, arr| arr.push(n.value)}
   end
   alias_method :to_ary, :to_a
 
@@ -216,9 +218,9 @@ class DSkipList
     return "SkipList level #{@max_level}"
   end
 
-  def each(&block)
-    self.to_a.each(&block)
-  end
+  #def each(&block)
+  #  self.walk(nil, nil, nil, 0, nil) @block
+  #  return self
+  #end
 
 end
-

data/skiplist-test.rb

@@ -5,13 +5,13 @@ list = DSkipList.new
 otherList = SkipList.new 100
 hash = {}
 Benchmark.bm(30) do |b| 
-  #b.report('Insert time: ') {1.upto(100000) {|i| list[i] = i}}
+  b.report('Insert time: ') {1.upto(10000) {|i| list[i] = i}}
   #b.report('Other list insert: ') {1.upto(10000) {|i| otherList[i] = i}}
-  #b.report('Search time: ') {1.upto(10000) {|i| list[i]}}
+  b.report('Search time: ') {1.upto(10000) {|i| list[i]}}
   #b.report('Other list search: ') {1.upto(10000) {|i| otherList[i]}}
   #b.report('List insert million elements: ') {10000.upto(1010000) {|i| list[i] = i}}
   #b.report('Hash insert million elements: ') {1.upto(1000000) {|i| hash[i] = i}}
-  #b.report('List search 10000') {1000000.upto(1010000) {|i| list[i]}}
+  b.report('List search 10000') {1.upto(10000) {|i| list[i]}}
   #b.report('Hash search 10000') {900000.upto(1000000) {|i| hash[i]}}
   #b.report('List +10000: ') {1040000.upto(1050000) {|i| list[i] = i}}
   #b.report('Search time: ') {1000000.upto(1010000) {|i| list[i]}}

data/test/skiplist_spec.rb

@@ -1,6 +1,9 @@
+#Be sure to run 'gem install dskiplist --development' before running 
+#require 'method_profiler'
 require 'rspec'
 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
@@ -22,8 +25,11 @@ describe "The skiplist" do
     check_integrity(@list)
   end 
 
+  it "sets up the observer", :time => true do
+    #@profiler = MethodProfiler.observe(@list)
+  end
+
   it "should lookup value correctly" do
-    puts "30 returned #{@list[30]}"
     expect(@list[30]).to eq(30)
   end
 
@@ -48,6 +54,9 @@ describe "The skiplist" do
     end
   end
 
+  it "should return nil if key not found" do
+    expect(@list[99999999989].nil?).to eq(true)
+  end
   it "should convert to hash" do
     expect(@list.to_h.count).to eq(100)
     expect(@list.to_h(50,75).count).to eq(25)
@@ -68,4 +77,14 @@ describe "The skiplist" do
     #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
+
+  it "should accept a block" do
+    object_count = 0 
+    @list.each { object_count +=1 } 
+    expect(object_count).to eq(100)
+  end
+ 
+  it "reports the observer", :time => true do
+    #puts @profiler.report
+  end
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: dskiplist
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Forrest Allison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-03-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: facter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thread_safe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +123,7 @@ files:
 - ".git-new/objects/ae/ee3428c017916e5cc0e57d387224f33ed0b990"
 - ".git-new/objects/d8/7d4be66f458acd52878902bbf1391732ad21e1"
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -105,6 +134,7 @@ files:
 - lib/dskiplist/version.rb
 - skiplist-test.rb
 - test/skiplist_spec.rb
+- test/time_spec.rb
 homepage: https://github.com/light24bulbs/dynamic-skiplist/
 licenses:
 - MIT
@@ -131,3 +161,4 @@ specification_version: 4
 summary: High speed skiplist gem
 test_files:
 - test/skiplist_spec.rb
+- test/time_spec.rb