range_set 0.0.1 → 0.0.2

data/lib/range_set.rb

@@ -1,21 +1,30 @@
+require 'rbtree'
+
 class RangeSet
-  attr_accessor :ranges
+
+  def ranges
+    @rbtree.values
+  end
 
   def initialize(*ranges)
-    @ranges = []
+    @rbtree = RBTree.new
     ranges.each do |r|
       union_with_range!(r)
     end
     self
   end
+
+  def clone
+    result = super
+    result.send(:rbtree=, result.send(:rbtree).clone)
+    result
+  end
   
   def intersect!(r)
     if r.is_a?(Range)
       intersect_with_range!(r)
     elsif r.is_a?(RangeSet)
-      @ranges = r.ranges.inject(RangeSet.new) do |accum, range|
-        accum + (self & range)
-      end.ranges
+      intersect_with_rangeset!(r)
     end
     self
   end
@@ -28,7 +37,7 @@ class RangeSet
     if r.is_a?(Range)
       subtract_range!(r)
     elsif r.is_a?(RangeSet)
-      r.each {|r| subtract_range!(r)}
+      subtract_rangeset!(r)
     end
     self
   end
@@ -41,7 +50,7 @@ class RangeSet
     if r.is_a?(Range)
       union_with_range!(r)
     elsif r.is_a?(RangeSet)
-      r.each {|r| union_with_range!(r)}
+      union_with_rangeset!(r)
     end
     self
   end
@@ -51,61 +60,52 @@ class RangeSet
   end
   
   def each
-    @ranges.each {|r| yield r}
+    @rbtree.each_value {|r| yield r}
   end
   
-  #returns an array of RangeSets
-  def split_at(*boundaries)
-    result = []
-    rs = RangeSet.new
-    ranges = @ranges.clone
-    boundaries.compact.sort.uniq.each do |boundary|
-      
-      while (range = ranges.shift)
-        if range.end <= boundary
-          rs += range
-        elsif range.begin >= boundary
-          ranges.unshift(range)
-          break
-        else
-          rs += (range.begin .. boundary)
-          ranges.unshift(boundary .. range.end)
-          break
-        end
-      end
-      
-      unless rs.empty?
-        result << rs
-        rs = RangeSet.new
-      end
-    end
-    result << RangeSet.new(*ranges) unless ranges.empty?
-    result
-  end
+  # #returns an array of RangeSets
+  # def split_at(*boundaries)
+  #   result = []
+  #   rs = RangeSet.new
+  #   ranges = @rbtree.clone
+  #   boundaries.compact.sort.uniq.each do |boundary|
+  #     while (range = ranges.shift)
+  #       if range.end <= boundary
+  #         rs += range
+  #       elsif range.begin >= boundary
+  #         ranges.unshift(range)
+  #         break
+  #       else
+  #         rs += (range.begin .. boundary)
+  #         ranges.unshift(boundary .. range.end)
+  #         break
+  #       end
+  #     end
+  #     unless rs.empty?
+  #       result << rs
+  #       rs = RangeSet.new
+  #     end
+  #   end
+  #   result << RangeSet.new(*ranges) unless ranges.empty?
+  #   result
+  # end
   
   # TODO : need to be more explicit and careful about
   # whether or not a range's end is inclusive. For now,
   # we just assume that it's NOT inclusive.
   def include?(v)
-    if v.is_a?(Range)
-      each do |range|
-        return true if range.begin <= v.begin && v.begin <= v.end && v.end <= range.end
-      end
-    elsif v.is_a?(RangeSet)
-      v.ranges.each do |range|
-        return false unless self.include?(range)
-      end
-      return true
+    case v
+    when Range
+      include_range?(v)
+    when RangeSet
+      include_rangeset?(v)
     else
-      each do |range|
-        return true if range.begin <= v && v < range.end
-      end
+      include_scalar?(v)
     end
-    false
   end
   
   def empty?
-    @ranges.empty?
+    @rbtree.empty?
   end
   
   alias :- :subtract
@@ -114,60 +114,89 @@ class RangeSet
   alias :& :intersect
   
   private
+
+  attr_accessor :rbtree
   
   def subtract_range!(r)
     return if r.begin == r.end
     r = (r.end .. r.begin) unless r.begin < r.end
-    result = []
-    each do |range|
-      if range.end < r.begin
-        result << range
-      elsif range.begin > r.end
-        result << range
-      else
-        result << (range.begin .. r.begin) if range.begin < r.begin
-        result << (r.end .. range.end) if range.end > r.end
-      end
+    x, previous_range = @rbtree.upper_bound(r.begin)
+    @rbtree.bound([x,r.begin].compact.min, r.end).each do |key, range|
+      @rbtree.delete(key)
+      front_range = (range.begin .. [r.begin, range.end].min)
+      back_range = ([range.begin,r.end].max .. range.end)
+      @rbtree[front_range.begin] = front_range if front_range.begin < front_range.end
+      @rbtree[back_range.begin] = back_range if back_range.begin < back_range.end
+    end
+  end
+
+  def subtract_rangeset!(r)
+    r.each do |range|
+      subtract_range!(range)
     end
-    @ranges = result
   end
   
   def intersect_with_range!(r)
     if r.begin == r.end
-      @ranges = []
+      @rbtree = RBTree.new
       return
     elsif r.begin > r.end
       r = (r.end .. r.begin)
     end
-    result = []
-    each do |range|
-      r2 = ([range.begin, r.begin].max .. [range.end, r.end].min)
-      if (r2.begin < r2.end)
-        result << r2
-      end
+    replacement = RBTree.new
+    x, previous_range = @rbtree.upper_bound(r.begin)
+    @rbtree.bound([x,r.begin].compact.min, r.end) do |key, range|
+      range = ([range.begin,r.begin].max .. [range.end,r.end].min)
+      replacement[range.begin] = range if range.begin < range.end
+    end
+    @rbtree = replacement
+  end
+
+  def intersect_with_rangeset!(r)
+    #TODO: This could be greatly optimized!
+    replacement = RangeSet.new
+    r.each do |range|
+      replacement += self & range
     end
-    @ranges = result    
+    @rbtree = replacement.send(:rbtree)
   end
   
   def union_with_range!(r)
     return if r.begin == r.end
-    joined = (r.begin < r.end) ? r : (r.end .. r.begin)
-    still_need_joined = true
-    result = []
-    each do |range|
-      if range.end < joined.begin
-        result << range
-      elsif range.end == joined.begin
-        joined = (range.begin .. joined.end)
-      elsif range.begin > joined.end
-        result << joined if still_need_joined
-        still_need_joined = false
-        result << range
-      else
-        joined = ([range.begin,joined.begin].min .. [range.end,joined.end].max)
-      end
+    r = (r.begin < r.end) ? r : (r.end .. r.begin)
+    @rbtree.bound(r.begin, r.end) do |key, range|
+      range = @rbtree.delete(key)
+      r = ([r.begin, range.begin].min .. [r.end, range.end].max)
+    end
+    x, previous_range = @rbtree.upper_bound(r.begin)
+    if previous_range && previous_range.end >= r.begin
+      @rbtree.delete(x)
+      r = (x .. r.end)
+    end
+    @rbtree[r.begin] = r
+  end
+
+  def union_with_rangeset!(r)
+    r.each do |range|
+      union_with_range!(range)
+    end
+  end
+
+  def include_scalar?(v)
+    x, previous_range = @rbtree.upper_bound(v)
+    previous_range && v < previous_range.end
+  end
+
+  def include_range?(r)
+    x, previous_range = @rbtree.upper_bound(r.begin)
+    previous_range && r.end <= previous_range.end
+  end
+
+  def include_rangeset?(r)
+    r.each do |range|
+      return false unless include_range?(range)
     end
-    result << joined if still_need_joined
-    @ranges = result
+    true
   end
+
 end

data/lib/range_set/version.rb

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

data/range_set.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+  s.add_dependency "rbtree-pure", "~> 0.1"
   s.add_development_dependency "rspec", "~> 2.6"
   s.add_development_dependency "simplecov", "~> 0.4"
   s.add_development_dependency("rb-fsevent", "~> 0.4") if RUBY_PLATFORM =~ /darwin/i

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: range_set
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Chris Johnson
@@ -15,13 +15,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-02 00:00:00 -05:00
+date: 2011-08-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rbtree-pure
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 1
+        version: "0.1"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -32,11 +47,11 @@ dependencies:
         - 6
         version: "2.6"
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: simplecov
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -47,11 +62,11 @@ dependencies:
         - 4
         version: "0.4"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rb-fsevent
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -62,11 +77,11 @@ dependencies:
         - 4
         version: "0.4"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: guard
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,11 +92,11 @@ dependencies:
         - 5
         version: "0.5"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: guard-bundler
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -92,11 +107,11 @@ dependencies:
         - 1
         version: "0.1"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: guard-rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -107,7 +122,7 @@ dependencies:
         - 4
         version: "0.4"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 description: Set implementation based on ranges
 email: 
 - chris@kindkid.com