range_list 1.1.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbae62498893749767a5138f59caacd3de650bf62f566859d2ff16fc69e04a73
-  data.tar.gz: b5317ec465420963e3d392f89f22e2bf3a7a662a569c82084b4cbe5383eaab32
+  metadata.gz: bac3ba3fced62c57e3d3fafa0f1999667172d7083defe6ec6404ca8ecfb83af0
+  data.tar.gz: 12708960354b2930dd49ff8ee80e8b809340c8b8447953baac65351a914ad73b
 SHA512:
-  metadata.gz: 9f39a299e682ca947eeb1518cdba35eaad08b806433a849f1651ead445a7602fcb7c290611b8c3fa2601994003b74f3edbbe7909967d02064316db27d0d03a46
-  data.tar.gz: 286f03c1ecc1de6b5d0b5d4d271b0fcb2d3ea2f56c5a146d26e66b68a0fe168e0a8d093e781bb7c4a4551501682e8ea4534495a86f669470b73db52aa48a2028
+  metadata.gz: ebfdde12a2eca743326ffd44db017c23ff1ed796af325b4c0c0b1953cee76c427dd1a0ebf3d91e3a5674a2767332925881978292569fed01fca9ee30f5f55c28
+  data.tar.gz: dc711a4f3cf7a4157b11d9b0d7976f5411801f330daf7d501c427518434b3d3eb113f6d7aa3a65f019662bf230cf7f50f67b18266e4cc217ff3d6b2315d2c28b

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    range_list (1.1.0)
-      treemap (~> 1.0)
+    range_list (1.3.1)
+      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/README.md

@@ -10,7 +10,6 @@ RangeList use AVL Tree processing internally, so range operations are very fast.
 [![Gem Version](https://badge.fury.io/rb/range_list.svg)](https://rubygems.org/gems/range_list)
 [![Documentation](https://img.shields.io/badge/docs-YARD-blue.svg)](https://rubydoc.info/gems/range_list)
 [![pipeline status](https://gitlab.com/songhuangcn/range_list/badges/main/pipeline.svg)](https://gitlab.com/songhuangcn/range_list/-/commits/main)
-[![coverage report](https://gitlab.com/songhuangcn/range_list/badges/main/coverage.svg)](https://gitlab.com/songhuangcn/range_list/-/commits/main)
 
 ## Installation
 

data/lib/range_list/avl_tree/abstract_adapter.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class RangeList
+  # @!visibility private
+  module AvlTree
+    class AbstractAdapter
+      def put(key, value)
+        raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
+      end
+
+      def lower_entry(key)
+        raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
+      end
+
+      def sub_map(from_key, to_key)
+        raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
+      end
+
+      def remove(key)
+        raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
+      end
+
+      def each(&block)
+        raise NotImplementedError, "#{self.class} has not implemented method '#{__method__}'"
+      end
+    end
+  end
+end

data/lib/range_list/avl_tree/rbtree_adapter.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require "rbtree"
+require_relative "abstract_adapter"
+
+class RangeList
+  # @!visibility private
+  module AvlTree
+    class RBTreeAdapter < AbstractAdapter
+      def initialize
+        @rbtree = RBTree.new
+      end
+
+      def put(key, value)
+        rbtree[key] = value
+      end
+
+      def lower_entry(key)
+        rbtree.upper_bound(key)
+      end
+
+      def sub_map(from_key, to_key)
+        rbtree.bound(from_key, to_key).to_a
+      end
+
+      def remove(key)
+        rbtree.delete(key)
+      end
+
+      def each(&block)
+        rbtree.each(&block)
+      end
+
+      private
+
+      attr_reader :rbtree
+    end
+  end
+end

data/lib/range_list/version.rb

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

data/lib/range_list.rb

@@ -1,14 +1,13 @@
 # frozen_string_literal: true
 
-require "treemap"
-require_relative "range_list/version"
 require_relative "range_list/errors"
+require_relative "range_list/avl_tree/rbtree_adapter"
 
 class RangeList
   include Enumerable
 
   def initialize
-    @tree = TreeMap.new
+    @avl_tree = AvlTree::RBTreeAdapter.new
   end
 
   # Add range into current range list.
@@ -18,32 +17,30 @@ class RangeList
   # @raise [ArgumentError] when argement invalid
   def add(range)
     validate_range!(range)
-
-    # Return when range is empty.
     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_lower_range = avl_tree.lower_entry(range[0])
+    range_start = if !start_lower_range.nil? && start_lower_range[1] >= range[0]
+      start_lower_range[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_lower_range = avl_tree.lower_entry(range[1])
+    range_end = if !end_lower_range.nil? && end_lower_range[1] >= range[1]
+      end_lower_range[1]
     else
       range[1]
     end
 
     # Insert or replace new range.
-    tree.put(range_start, range_end)
+    avl_tree.put(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) }
+    sub_range = avl_tree.sub_map(range[0] + 1, range[1])
+    sub_range.each { |range_start, _range_end| avl_tree.remove(range_start) }
 
     self
   end
@@ -54,25 +51,23 @@ class RangeList
   # @raise (see #add)
   def remove(range)
     validate_range!(range)
-
-    # Return when range is empty.
     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)
+    # Insert end lower range, `-1` means not include.
+    end_lower_range = avl_tree.lower_entry(range[1] - 1)
+    if !end_lower_range.nil? && end_lower_range[1] > range[1]
+      avl_tree.put(range[1], end_lower_range[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])
+    # Relace start lower range, `-1` means not include.
+    start_lower_range = avl_tree.lower_entry(range[0] - 1)
+    if !start_lower_range.nil? && start_lower_range[1] > range[0]
+      avl_tree.put(start_lower_range[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) }
+    sub_range = avl_tree.sub_map(range[0], range[1] - 1)
+    sub_range.each { |range_start, _range_end| avl_tree.remove(range_start) }
 
     self
   end
@@ -80,7 +75,8 @@ class RangeList
   # Print current range list.
   # @return [void]
   def print
-    puts map { |k, v| "[#{k}, #{v})" }.join(" ")
+    info = map { |k, v| "[#{k}, #{v})" }.join(" ")
+    puts info
   end
 
   # Returns true if current ranges contains all elements of the range.
@@ -90,12 +86,10 @@ class RangeList
   # @raise (see #add)
   def contains_all?(range)
     validate_range!(range)
-
-    # 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_lower_range = avl_tree.lower_entry(range[0])
+    !start_lower_range.nil? && start_lower_range[1] >= range[1]
   end
 
   # Returns true if current ranges contains any element of the range.
@@ -105,12 +99,11 @@ class RangeList
   # @raise (see #add)
   def contains_any?(range)
     validate_range!(range)
-
-    # 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]
+    # `-1` means not include.
+    end_lower_range = avl_tree.lower_entry(range[1] - 1)
+    !end_lower_range.nil? && end_lower_range[1] > range[0]
   end
 
   # Returns true if current ranges contains the element.
@@ -118,19 +111,19 @@ class RangeList
   # @return [Boolean]
   # @raise (see #add)
   def contains?(element)
-    raise ArgumentError, "`element` should be `Integer` type." unless element.is_a?(Integer)
+    validate_element!(element)
 
-    floor_entry = tree.floor_entry(element)
-    !floor_entry.nil? && floor_entry.value > element
+    lower_entry = avl_tree.lower_entry(element)
+    !lower_entry.nil? && lower_entry[1] > element
   end
 
   # Give RangeList iterative ability.
+  # @return [RangeList, Enumerator]
   # @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)
+      avl_tree.each(&block)
+      self
     else
       enum_for(:each)
     end
@@ -138,12 +131,16 @@ class RangeList
 
   # @!visibility private
   def inspect
-    to_a.inspect
+    data = map { |k, v| "[#{k}, #{v})" }.join(", ")
+    "[#{data}]"
   end
 
+  # @!visibility private
+  alias_method :to_s, :inspect
+
   private
 
-  attr_reader :tree
+  attr_reader :avl_tree
 
   def validate_range!(range)
     raise ArgumentError, "`range` should be `Array` type." unless range.is_a?(Array)
@@ -151,6 +148,10 @@ class RangeList
     raise ArgumentError, "All elements of `range` should be `Integer`." unless range.all? { |item| item.is_a?(Integer) }
   end
 
+  def validate_element!(element)
+    raise ArgumentError, "`element` should be `Integer` type." unless element.is_a?(Integer)
+  end
+
   def empty_range?(range)
     range[0] >= range[1]
   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,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: range_list
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Song Huang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-26 00:00:00.000000000 Z
+date: 2022-02-27 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
@@ -37,6 +37,8 @@ files:
 - README.md
 - Rakefile
 - lib/range_list.rb
+- lib/range_list/avl_tree/abstract_adapter.rb
+- lib/range_list/avl_tree/rbtree_adapter.rb
 - lib/range_list/errors.rb
 - lib/range_list/version.rb
 - range_list.gemspec