segment_tree 0.0.1 → 0.0.2

data/.rspec

@@ -1,2 +1,2 @@
 --color
---format documentation
+--format progress

data/lib/segment_tree.rb

@@ -1,11 +1,10 @@
 require "forwardable"
-require "segment_tree/version"
 
 class SegmentTree
   # An abstract tree node
   class Node #:nodoc:all:
     extend Forwardable
-    def_delegators :@range, :cover?, :begin, :end
+    def_delegators :@range, :include?, :begin, :end
   end
 
   # An elementary intervals or nodes container
@@ -24,14 +23,14 @@ class SegmentTree
     # Find all intervals containing point +x+ within node's children. Returns array
     def find(x)
       [@left, @right].compact.
-                      select { |node| node.cover?(x) }.
+                      select { |node| node.include?(x) }.
                       map    { |node| node.find(x) }.
                       flatten
     end
 
     # Find first interval containing point +x+ within node's children
     def find_first(x)
-      subset = [@left, @right].compact.find { |node| node.cover?(x) }
+      subset = [@left, @right].compact.find { |node| node.include?(x) }
       subset && subset.find_first(x)
     end
 
@@ -56,7 +55,7 @@ class SegmentTree
     end
 
     def find_first(x)
-      cover?(x) ? self : nil
+      include?(x) ? self : nil
     end
   end
 

data/lib/segment_tree/version.rb

@@ -1,3 +1,3 @@
 class SegmentTree
-  VERSION = "0.0.1"
-end
+  VERSION = "0.0.2"
+end

data/segment_tree.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Tree data structure for storing segments. It allows querying which of the stored segments contain a given point.}
   gem.homepage      = "https://github.com/take-five/segment_tree"
 
-  gem.files         = `git ls-files`.split($\)
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.files         = `git ls-files`.split($\).grep(/lib|spec/)
+  gem.test_files    = gem.files.grep(/spec/)
   gem.name          = "segment_tree"
   gem.require_paths = %W(lib)
   gem.version       = SegmentTree::VERSION

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require "bundler/setup"
-require "simplecov"
 
 RSpec.configure do |config|
   # Run specs in random order to surface order dependencies. If you find an
@@ -9,4 +8,9 @@ RSpec.configure do |config|
   config.order = 'random'
 end
 
-SimpleCov.start
+if defined?(RUBY_ENGINE) &&
+    RUBY_ENGINE == "ruby" &&
+    RUBY_VERSION > "1.9"
+  require "simplecov"
+  SimpleCov.start
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: segment_tree
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-01 00:00:00.000000000Z
+date: 2012-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &84177160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *84177160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &84176910 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *84176910
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.11'
 description: Tree data structure for storing segments. It allows querying which of
   the stored segments contain a given point.
 email: amikhailov83@gmail.com
@@ -40,13 +50,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
 - .rspec
-- Gemfile
-- LICENSE
-- README.md
-- Rakefile
-- benchmark/benchmark.rb
 - lib/segment_tree.rb
 - lib/segment_tree/version.rb
 - segment_tree.gemspec
@@ -72,11 +76,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Tree data structure for storing segments. It allows querying which of the
   stored segments contain a given point.
 test_files:
+- .rspec
+- segment_tree.gemspec
 - spec/segment_tree_spec.rb
 - spec/spec_helper.rb

data/.gitignore

@@ -1,17 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp

data/Gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in segment_tree.gemspec
-gemspec
-
-gem "simplecov", "~> 0.6.4"

data/LICENSE

@@ -1,22 +0,0 @@
-Copyright (c) 2012 Alexei Mikhailov
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,94 +0,0 @@
-# SegmentTree
-
-Ruby implementation of [segment tree](http://en.wikipedia.org/wiki/Segment_tree) data structure.
-Segment tree is a tree data structure for storing intervals, or segments. It allows querying which of the stored segments contain a given point. It is, in principle, a static structure; that is, its content cannot be modified once the structure is built.
-
-Segment tree storage has the complexity of <tt>O(n log n)</tt>.
-Segment tree querying has the complexity of <tt>O(log n + k)</tt> where <tt>k</tt> is the number of reported intervals.
-
-It's pretty fast on querying trees with ~ 10 millions segments, though building of such big tree will take long.
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'segment_tree'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install segment_tree
-
-## Usage
-
-Segment tree consists of segments (in Ruby it's <tt>Range</tt> objects) and corresponding values. The easiest way to build a segment tree is to create it from hash where segments are keys:
-```ruby
-tree = SegmentTree.new(1..10 => "a", 11..20 => "b", 21..30 => "c") # => #<SegmentTree:0xa47eadc @root=#<SegmentTree::Container:0x523f3b6 @range=1..30>>
-```
-
-After that you can query the tree of which segments contain a given point:
-```ruby
-tree.find(5) # => [#<SegmentTree::Segment:0xa47ea8c @range=1..10, @value="a">]
-```
-
-Or fetch only one segment:
-```ruby
-segment = tree.find_first(5) # => #<SegmentTree::Segment:0xa47ea8c @range=1..10, @value="a">
-segment.value # => "a"
-```
-
-## Real world example
-
-Segment tree can be used in applications where IP-address geocoding is needed.
-
-```ruby
-data = [
-  [IPAddr.new('87.224.241.0/24').to_range, {:city => "YEKT"}],
-  [IPAddr.new('195.58.18.0/24').to_range, {:city => "MSK"}]
-  # and so on
-]
-ip_tree = SegmentTree.new(data)
-
-client_ip = IPAddr.new("87.224.241.66")
-ip_tree.find_first(client_ip).value # => {:city=>"YEKT"}
-```
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
-## TODO
-1. Fix README typos and grammatical errors (english speaking contributors are welcomed)
-2. Implement C binding for MRI.
-3. Test on different versions of Ruby.
-
-## LICENSE
-Copyright (c) 2012 Alexei Mikhailov
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,2 +0,0 @@
-#!/usr/bin/env rake
-require "bundler/gem_tasks"

data/benchmark/benchmark.rb

@@ -1,47 +0,0 @@
-#!/usr/bin/env ruby
-require "bundler/setup"
-require "benchmark"
-require "segment_tree"
-
-# generate a tree with +n+ number of intervals
-def tree(n)
-  SegmentTree.new list(n)
-end
-def list(n)
-  (0..n).map { |num| [(num * 10)..(num + 1) * 10 - 1, num] }
-end
-
-puts "Pregenerating data..."
-tests = [100, 1000, 10_000, 100_000, 1_000_000]
-
-lists = Hash[tests.map { |n| [n, list(n)] }]
-trees = Hash[tests.map { |n| [n, tree(n)] }]
-
-puts "Done"
-puts
-
-puts "Building a tree of N intervals"
-Benchmark.bmbm do |x|
-  tests.each do |n|
-    x.report(n.to_s) { tree(n) }
-  end
-end
-
-puts "Finding matching interval in tree of N intervals"
-Benchmark.bmbm do |x|
-  tests.each do |n|
-    t = trees[n]
-
-    x.report(n.to_s) { t.find_first(rand(n)) }
-  end
-end
-
-puts
-puts "Finding matching interval in list of N intervals"
-Benchmark.bmbm do |x|
-  tests.each do |n|
-    data = lists[n]
-
-    x.report(n.to_s) { data.find { |range, _| range.cover?(rand(n)) } }
-  end
-end