range_list 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbae62498893749767a5138f59caacd3de650bf62f566859d2ff16fc69e04a73
-  data.tar.gz: b5317ec465420963e3d392f89f22e2bf3a7a662a569c82084b4cbe5383eaab32
+  metadata.gz: c3bbec9e50fbfcf613d6371f9851c1410269819c738d362bbe0db73bf6ab1ed6
+  data.tar.gz: 48b42d5f37e67577cc92528b4f3e898b58f81f7781fa4ea388347572fb70d90a
 SHA512:
-  metadata.gz: 9f39a299e682ca947eeb1518cdba35eaad08b806433a849f1651ead445a7602fcb7c290611b8c3fa2601994003b74f3edbbe7909967d02064316db27d0d03a46
-  data.tar.gz: 286f03c1ecc1de6b5d0b5d4d271b0fcb2d3ea2f56c5a146d26e66b68a0fe168e0a8d093e781bb7c4a4551501682e8ea4534495a86f669470b73db52aa48a2028
+  metadata.gz: c6f784320a3ab3b9b1c7714c9c7350aef3824b222a28ca0b1278722a728564b91c6c40faf3bbb8ea8a2926795daa56ca8f3db740cec6fd8833371bb60214ddd8
+  data.tar.gz: 98c20d0456e3c84432dfa9d3d09438c4887606dead589cfb1006407569b3c7f1330e0e3401fba5562b0c1c0c3dba408ad43fa0ea18f99232775ce7dcef69c3ee

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    range_list (1.1.0)
-      treemap (~> 1.0)
+    range_list (1.2.0)
+      rbtree (~> 0.4.5)
 
 GEM
   remote: https://rubygems.org/
@@ -15,6 +15,7 @@ GEM
       ast (~> 2.4.1)
     rainbow (3.1.1)
     rake (13.0.6)
+    rbtree (0.4.5)
     regexp_parser (2.2.1)
     rexml (3.2.5)
     rubocop (1.25.1)
@@ -44,7 +45,6 @@ GEM
     standard (1.7.2)
       rubocop (= 1.25.1)
       rubocop-performance (= 1.13.2)
-    treemap (1.0.3)
     unicode-display_width (2.1.0)
     webrick (1.7.0)
     yard (0.9.27)

data/lib/range_list/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class RangeList
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/range_list.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "treemap"
+require "rbtree"
 require_relative "range_list/version"
 require_relative "range_list/errors"
 
@@ -8,7 +8,7 @@ class RangeList
   include Enumerable
 
   def initialize
-    @tree = TreeMap.new
+    @tree = RBTree.new
   end
 
   # Add range into current range list.
@@ -23,27 +23,27 @@ class RangeList
     return self if empty_range?(range)
 
     # Get real range start.
-    start_floor_entry = tree.floor_entry(range[0])
-    range_start = if !start_floor_entry.nil? && start_floor_entry.value >= range[0]
-      start_floor_entry.key
+    start_floor_entry = tree.upper_bound(range[0])
+    range_start = if !start_floor_entry.nil? && start_floor_entry[1] >= range[0]
+      start_floor_entry[0]
     else
       range[0]
     end
 
     # Get real range end.
-    end_floor_entry = tree.floor_entry(range[1])
-    range_end = if !end_floor_entry.nil? && end_floor_entry.value >= range[1]
-      end_floor_entry.value
+    end_floor_entry = tree.upper_bound(range[1])
+    range_end = if !end_floor_entry.nil? && end_floor_entry[1] >= range[1]
+      end_floor_entry[1]
     else
       range[1]
     end
 
     # Insert or replace new range.
-    tree.put(range_start, range_end)
+    tree[range_start] = range_end
 
     # Remove keys between range, exclude start, include end.
-    between_maps = tree.sub_map(range[0], false, range[1], true)
-    between_maps.keys.each { |key| tree.remove(key) }
+    between_maps = tree.bound(range[0] + 1, range[1])
+    between_maps.to_a.each { |key, _value| tree.delete(key) }
 
     self
   end
@@ -59,20 +59,20 @@ class RangeList
     return self if empty_range?(range)
 
     # Insert end lower entry
-    end_lower_entry = tree.lower_entry(range[1])
-    if !end_lower_entry.nil? && end_lower_entry.value > range[1]
-      tree.put(range[1], end_lower_entry.value)
+    end_lower_entry = tree.upper_bound(range[1] - 1)
+    if !end_lower_entry.nil? && end_lower_entry[1] > range[1]
+      tree[range[1]] = end_lower_entry[1]
     end
 
     # Relace start lower entry
-    start_lower_entry = tree.lower_entry(range[0])
-    if !start_lower_entry.nil? && start_lower_entry.value > range[0]
-      tree.put(start_lower_entry.key, range[0])
+    start_lower_entry = tree.upper_bound(range[0] - 1)
+    if !start_lower_entry.nil? && start_lower_entry[1] > range[0]
+      tree[start_lower_entry[0]] = range[0]
     end
 
     # Remove keys between range, include start, exclude end
-    between_maps = tree.sub_map(range[0], true, range[1], false)
-    between_maps.keys.each { |key| tree.remove(key) }
+    between_maps = tree.bound(range[0], range[1] - 1)
+    between_maps.to_a.each { |key, _value| tree.delete(key) }
 
     self
   end
@@ -94,8 +94,8 @@ class RangeList
     # Return false when range is empty.
     return false if empty_range?(range)
 
-    start_floor_entry = tree.floor_entry(range[0])
-    !start_floor_entry.nil? && start_floor_entry.value >= range[1]
+    start_floor_entry = tree.upper_bound(range[0])
+    !start_floor_entry.nil? && start_floor_entry[1] >= range[1]
   end
 
   # Returns true if current ranges contains any element of the range.
@@ -109,8 +109,8 @@ class RangeList
     # Return false when range is empty.
     return false if empty_range?(range)
 
-    end_lower_entry = tree.lower_entry(range[1])
-    !end_lower_entry.nil? && end_lower_entry.value > range[0]
+    end_lower_entry = tree.upper_bound(range[1] - 1)
+    !end_lower_entry.nil? && end_lower_entry[1] > range[0]
   end
 
   # Returns true if current ranges contains the element.
@@ -120,17 +120,15 @@ class RangeList
   def contains?(element)
     raise ArgumentError, "`element` should be `Integer` type." unless element.is_a?(Integer)
 
-    floor_entry = tree.floor_entry(element)
-    !floor_entry.nil? && floor_entry.value > element
+    floor_entry = tree.upper_bound(element)
+    !floor_entry.nil? && floor_entry[1] > element
   end
 
   # Give RangeList iterative ability.
   # @yield [range_start, range_end] give the range element to the block
   def each(&block)
     if block
-      # Iterating an empty tree will raise an error,
-      # see https://github.com/davidkellis/treemap/issues/1
-      tree.empty? ? self : tree.each(&block)
+      tree.each(&block)
     else
       enum_for(:each)
     end

data/range_list.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
 
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"
-  spec.add_dependency "treemap", "~> 1.0"
+  spec.add_dependency "rbtree", "~> 0.4.5"
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: range_list
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Song Huang
@@ -11,19 +11,19 @@ cert_chain: []
 date: 2022-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: treemap
+  name: rbtree
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.4.5
 description:
 email:
 - songhuangcn@gmail.com