btree 0.0.0 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 64a14900f4f059a6341312729643c101a88d19ea
+  data.tar.gz: da8ab66ed5bdf738658f2ef7ecb1421c9d58d1dc
+SHA512:
+  metadata.gz: 0a1929ec3cb16b36af5ef5cbc1546bf59652f4aeddf6765b9ff70c7ea502c77827e29fb41ce7b556d7bb93c3cf6f293b46ce1ae06dcd79551cfe4b8e5d74924c
+  data.tar.gz: 26fc63048a49802026ba22661f025fc904d295ff0198c277dfd410650bbf539efb2477203e778d13e3328af2ed0247d6aeee1083d39bfaa5d88d545e5eb4d7f3

data/Gemfile

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+source "https://rubygems.org"
+#repo_name "seifertd/Ruby-BTree"
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+
+# gem "rails"
+
+# Added at 2017-11-09 08:39:45 -0800 by doug:
+gem "rake", "~> 12.2", :group => [:development, :test]
+
+# Added at 2017-11-09 08:40:02 -0800 by doug:
+gem "bones", "~> 3.8", :group => [:development, :test]
+
+# Added at 2017-11-09 08:40:12 -0800 by doug:
+gem "shoulda", "~> 3.5", :group => [:development, :test]

data/Gemfile.lock

@@ -0,0 +1,41 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    bones (3.8.4)
+      little-plugger (~> 1.1)
+      loquacious (~> 1.9)
+      rake (~> 12.0)
+      rdoc (~> 5.0)
+    concurrent-ruby (1.0.5)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
+    little-plugger (1.1.4)
+    loquacious (1.9.1)
+    minitest (5.10.3)
+    rake (12.2.1)
+    rdoc (5.1.0)
+    shoulda (3.5.0)
+      shoulda-context (~> 1.0, >= 1.0.1)
+      shoulda-matchers (>= 1.4.1, < 3.0)
+    shoulda-context (1.2.2)
+    shoulda-matchers (2.8.0)
+      activesupport (>= 3.0.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.4)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bones (~> 3.8)
+  rake (~> 12.2)
+  shoulda (~> 3.5)
+
+BUNDLED WITH
+   1.15.3

data/README.md

@@ -1,5 +1,5 @@
-Ruby-BTree
-==========
+btree
+=====
 
 Pure ruby implementation of a btree as described in Introduction to Algorithms by 
 Cormen, Leiserson, Rivest and Stein, Chapter 18.

data/Rakefile

@@ -12,7 +12,8 @@ Bones {
   name  'btree'
   authors  'Douglas A. Seifert'
   email    'doug@dseifert.net'
-  url      'http://www.dseifert.net/btree'
+  url      'https://github.com/seifertd/Ruby-BTree'
   readme_file 'README.md'
+  exclude ['.bnsignore', '.gitignore', '.ruby-gemset', '.ruby-version', '.travis.yml', 'vendor', '.git']
 }
 

data/lib/btree/node.rb

@@ -1,18 +1,16 @@
 class Btree::Node
-  attr_accessor :leaf
   def initialize(degree)
     @degree = degree
     @keys = []
     @children = []
-    @leaf = true
   end
 
   def dump(level = 0)
     @keys.each_with_index do |key, idx|
+      puts "LEVEL: #{level} => #{key.first}: full? #{full?} leaf? #{leaf?} children: #{values.inspect}"
       if @children[idx]
          @children[idx].dump(level + 1)
       end
-      puts "#{level}: #{key.first}: full? #{full?} leaf? #{leaf?}"
     end
     (@children[@keys.size..-1] || []).each do |c|
       c.dump(level+1)
@@ -41,24 +39,51 @@ class Btree::Node
   end
 
   def leaf?
-    @leaf
+    @children.length == 0
   end
 
   def size
     @keys.size
   end
 
+  def values_of(range)
+
+    result = Array.new
+
+    i = 1
+    while i <= size && range.end >= @keys[i-1].first
+      if range.cover? @keys[i-1].first
+        result << @keys[i-1].last
+        child = @children[i-1].values_of(range) unless leaf?
+        result += child if child
+      end
+      i += 1
+    end
+
+    result
+
+  end
+
+
   def value_of(key)
+
+    return values_of(key) if key.kind_of? Range
+
     i = 1
     while i <= size && key > @keys[i-1].first
       i += 1
     end
 
+    #puts "Getting value of key #{key}, i = #{i}, keys = #{@keys.inspect}, leaf? #{leaf?}, numchildren: #{@children.size}"
+
     if i <= size && key == @keys[i-1].first
+      #puts "Found key: #{key.inspect}"
       return @keys[i-1].last
     elsif leaf?
+      #puts "We are a leaf, no more children, so val is nil"
       return nil
     else
+      #puts "Looking into child #{i}"
       return @children[i-1].value_of(key)
     end
   end
@@ -94,7 +119,6 @@ class Btree::Node
     splitee = @children[child_idx]
     y = Btree::Node.new(@degree)
     z = Btree::Node.new(@degree)
-    z.leaf = splitee.leaf
     (@degree-1).times do |j|
       z._keys[j] = splitee._keys[j+@degree]
       y._keys[j] = splitee._keys[j]

data/lib/btree/tree.rb

@@ -6,7 +6,6 @@ class Btree::Tree
   def initialize(degree = 2)
     @degree = degree
     @root = Btree::Node.new(@degree)
-    @root.leaf = true
     @size = 0
   end
 
@@ -15,7 +14,6 @@ class Btree::Tree
     node = @root
     if node.full?  
       @root = Btree::Node.new(@degree)
-      @root.leaf = false
       @root.add_child(node)
       @root.split(@root.children.size - 1)
       #puts "After split, root = #{@root.inspect}"

data/lib/insert_alot.rb

@@ -0,0 +1,7 @@
+require "./lib/btree"
+
+t = Btree.create(2)
+45.times {|n| t.insert n, n*n}
+puts "tree size = #{t.size}"
+puts "Value of 0: #{t.value_of(0).inspect}"
+t.dump

data/test/test_btree.rb

@@ -1,8 +1,8 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'btree'
 require 'shoulda'
 
-class TestBtree < Test::Unit::TestCase
+class TestBtree < MiniTest::Test
   def test_insert_notfull
     t = Btree.create(5)
     t.insert(5, "5")
@@ -26,6 +26,17 @@ class TestBtree < Test::Unit::TestCase
     end
   end
 
+  def test_insert_a_lot
+    t = Btree.create(2)
+    45.times do |i|
+      t.insert i, i*i
+    end
+    assert_equal 45, t.size
+    45.times do |i|
+      assert_equal i*i, t.value_of(i)
+    end
+  end
+
   def test_value_of
     t = Btree.create(5)
     t.insert(1, "foo")
@@ -38,6 +49,7 @@ class TestBtree < Test::Unit::TestCase
     assert_equal "foo", t.value_of(1)
     assert_nil t.value_of(11)
     assert_equal 4, t.size
+    assert_equal ["findme", "bar"], t.value_of(3..6)
   end
 
   def test_fill_root

data/version.txt

@@ -1 +1 @@
-0.0.0
+1.0.0

metadata

@@ -1,96 +1,73 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: btree
-version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 0
-  version: 0.0.0
+version: !ruby/object:Gem::Version
+  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - Douglas A. Seifert
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-20 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2017-11-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bones
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 3
-        - 5
-        - 4
-        version: 3.5.4
+      - !ruby/object:Gem::Version
+        version: 3.8.4
   type: :development
-  version_requirements: *id001
-description: |-
-  Pure ruby implementation of a btree as described in Introduction to Algorithms by 
-  Cormen, Leiserson, Rivest and Stein, Chapter 18.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.8.4
+description: "Pure ruby implementation of a btree as described in Introduction to
+  Algorithms by \nCormen, Leiserson, Rivest and Stein, Chapter 18."
 email: doug@dseifert.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
-- lib/btree/.node.rb.swp
-- version.txt
-files: 
-- .bnsignore
+files:
+- Gemfile
+- Gemfile.lock
 - History.txt
 - README.md
 - Rakefile
 - lib/btree.rb
-- lib/btree/.node.rb.swp
 - lib/btree/node.rb
 - lib/btree/tree.rb
+- lib/insert_alot.rb
 - test/test_btree.rb
 - version.txt
-has_rdoc: true
-homepage: http://www.dseifert.net/btree
+homepage: https://github.com/seifertd/Ruby-BTree
 licenses: []
-
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --main
+rdoc_options:
+- "--main"
 - README.md
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: btree
-rubygems_version: 1.3.7
+rubygems_version: 2.6.12
 signing_key: 
-specification_version: 3
-summary: Pure ruby implementation of a btree as described in Introduction to Algorithms by  Cormen, Leiserson, Rivest and Stein, Chapter 18.
-test_files: 
+specification_version: 4
+summary: Pure ruby implementation of a btree as described in Introduction to Algorithms
+  by  Cormen, Leiserson, Rivest and Stein, Chapter 18.
+test_files:
 - test/test_btree.rb

data/.bnsignore

@@ -1,18 +0,0 @@
-# The list of files that should be ignored by Mr Bones.
-# Lines that start with '#' are comments.
-#
-# A .gitignore file can be used instead by setting it as the ignore
-# file in your Rakefile:
-#
-#   Bones {
-#     ignore_file  '.gitignore'
-#   }
-#
-# For a project with a C extension, the following would be a good set of
-# exclude patterns (uncomment them if you want to use them):
-# *.[oa]
-# *~
-announcement.txt
-coverage
-doc
-pkg