multi_range 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 282c94c92ba01c11fb4e1efb2adc24ebe368d466660bd741878023bd1fb9c857
-  data.tar.gz: 2eb44495bac41d991ad6c29049b8f97395c848401e00ea96161ea0d101bb78ed
+  metadata.gz: 9dce52f266fe1dd26eaccbac184ee8c1ed5cc160322d92ded5471fb3efda0ee4
+  data.tar.gz: d001904ffda1cf620638042afd72da56b1b810b457df6227bd1d9fb3e7986a4e
 SHA512:
-  metadata.gz: 1c6bda5d61296f7aaf9dbb743477119b01a037be1085a7df85178340c97096fb8629b7cf384f4163d55177cd20be12b28b04b9fb48240c85dd6d5f5495612984
-  data.tar.gz: f23bf8796b02954a7b4724bf96b9bbe6779e284b70a563e4042996c97a62387125d120be5f6b1a451b1c7f982a20395774e7067544b4e7cb591785f096d49c4e
+  metadata.gz: 36fb852c41b4802589fd950b3beadbccad986e8e5e31da5993acfd11e19339e7034eba7099bcd36903e74e592c397e4501682cae47f482c74ad9d86d136b25cc
+  data.tar.gz: 0a763c262c12b7b45fc0c47f50bbbee929a19c2399e9e9725f70d49222bcdf1d0860c8b1162d8a04e2f2b992e42287b2deacbbf6dbf9c051f98c3fad04ec0488

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Change Log
 
+### [v1.1.0](https://github.com/khiav223577/multi_range/compare/v1.0.0...v1.1.0) 2020/10/15
+- [#13](https://github.com/khiav223577/multi_range/pull/13) Rename flatten => merge_overlaps (@khiav223577)
+
 ### [v1.0.0](https://github.com/khiav223577/multi_range/compare/v0.0.4...v1.0.0) 2020/10/15
 - [#12](https://github.com/khiav223577/multi_range/pull/12) Implement #overlaps? (@khiav223577)
 - [#11](https://github.com/khiav223577/multi_range/pull/11) Support difference other multi_range object (@khiav223577)

data/README.md

@@ -25,7 +25,7 @@ Or install it yourself as:
 
 ## Usage
 
-Allow you to manipulate a group of ranges.
+Allow you to manipulate a group of ranges. Such as merging overlapping ranges, doing ranges union and difference.
 
 ### Sample a number
 ```rb
@@ -34,7 +34,7 @@ multi_range.sample
 # => equals to [1, 2, 3, 4, 5, 10, 11, 12].sample
 ```
 
-### Range difference
+### Difference of ranges
 ```rb
 multi_range = MultiRange.new([1..10])
 multi_range -= 5..7
@@ -56,7 +56,7 @@ multi_range.ranges
 # => [1...5, 61..70, 86..100] 
 ```
 
-### Range union
+### Union ranges
 
 ```rb
 multi_range = MultiRange.new([1..5])
@@ -72,14 +72,18 @@ multi_range.ranges
 # => [1..6, 10..25, 30..30]
 ```
 
-### Flatten
+### Merge overlaps
 ```rb
 multi_range = MultiRange.new([1, 2, 4..6, 7, 8..12])
 multi_range.merge_overlaps.ranges
 # => [1..2, 4..12]
+
+multi_range = MultiRange.new([1.2..1.5, 1.7..1.9, 1.8..2.2])
+multi_range.merge_overlaps.ranges
+# => [1.2..1.5, 1.7..2.2]
 ```
 
-### Overlaps?
+### Check if it overlaps with the other
 
 ```rb
 multi_range = MultiRange.new([1..5, 10..15, 20..25])

data/lib/multi_range.rb

@@ -22,7 +22,8 @@ class MultiRange
   attr_reader :ranges
 
   def initialize(ranges)
-    @ranges = ranges.map{|s| s.is_a?(Integer) ? s..s : s }.sort_by(&:begin).freeze
+    @ranges = ranges.map{|s| s.is_a?(Numeric) ? s..s : s }.sort_by(&:begin).freeze
+    @is_float = @ranges.any?{|range| range.begin.is_a?(Float) || range.end.is_a?(Float) }
   end
 
   def merge_overlaps
@@ -33,13 +34,13 @@ class MultiRange
 
     @ranges.each do |range|
       next current_range = range if current_range == nil
-      next if range.max <= current_range.max
+      next if range.end <= current_range.end
 
-      if current_range.max + 1 < range.min
+      if can_combine?(current_range, range)
+        current_range = range.exclude_end? ? current_range.begin...range.end : current_range.begin..range.end
+      else
         new_ranges << current_range
         current_range = range
-      else
-        current_range = current_range.min..range.max
       end
     end
 
@@ -57,24 +58,26 @@ class MultiRange
     new_ranges = @ranges.dup
 
     return MultiRange.new(new_ranges) if new_ranges.empty?
-    return MultiRange.new(new_ranges) if other.min > @ranges.last.max # 大於最大值
-    return MultiRange.new(new_ranges) if other.max < @ranges.first.min # 小於最小值
+    return MultiRange.new(new_ranges) if other.begin > @ranges.last.end # 大於最大值
+    return MultiRange.new(new_ranges) if other.end < @ranges.first.begin # 小於最小值
 
     changed_size = 0
     @ranges.each_with_index do |range, idx|
-      next if other.min > range.max # 大於這個 range
-      break if other.max < range.min # 小於這個 range
+      next if other.begin > range.end # 大於這個 range
+      break if other.end < range.begin # 小於這個 range
+
+      sub_range1 = range.begin...other.begin
 
-      sub_range1 = range.min...other.min
-      sub_range2 = (other.max + 1)..range.max
+      sub_range2_begin = other.exclude_end? ? other.end : other.end + (other.end.is_a?(Float) ? Float::EPSILON : 1)
+      sub_range2 = range.exclude_end? ? sub_range2_begin...range.end : sub_range2_begin..range.end
 
       sub_ranges = []
-      sub_ranges << sub_range1 if sub_range1.any?
-      sub_ranges << sub_range2 if sub_range2.any?
+      sub_ranges << sub_range1 if sub_range1.begin <= sub_range1.end
+      sub_ranges << sub_range2 if sub_range2.begin <= sub_range2.end
 
       new_ranges[idx + changed_size, 1] = sub_ranges
       changed_size += sub_ranges.size - 1
-      break if other.max <= range.max # 沒有超過一個 range 的範圍
+      break if other.end <= range.end # 沒有超過一個 range 的範圍
     end
 
     return MultiRange.new(new_ranges)
@@ -87,7 +90,7 @@ class MultiRange
 
   def overlaps?(other)
     multi_range = merge_overlaps
-    return multi_range.size != (multi_range - other).size
+    return multi_range.ranges != (multi_range - other).ranges
   end
 
   def sample
@@ -140,4 +143,12 @@ class MultiRange
     range = @ranges.last
     return range.max if range
   end
+
+  private
+
+  # make sure that range1.begin <= range2.begin
+  def can_combine?(range1, range2)
+    return range1.end >= range2.begin if @is_float
+    return range1.end + 1 >= range2.begin
+  end
 end

data/lib/multi_range/version.rb

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

data/multi_range.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ['khiav reoy']
   spec.email         = ['mrtmrt15xn@yahoo.com.tw']
 
-  spec.summary       = 'Provides cross-rails methods for you to upgrade rails, backport features, create easy-to-maintain gems, and so on.'
-  spec.description   = 'Provides cross-rails methods for you to upgrade rails, backport features, create easy-to-maintain gems, and so on.'
+  spec.summary       = 'Allow you to manipulate a group of ranges. Such as merging overlapping ranges, doing ranges union and difference.'
+  spec.description   = 'Allow you to manipulate a group of ranges. Such as merging overlapping ranges, doing ranges union and difference.'
   spec.homepage      = 'https://github.com/khiav223577/multi_range'
   spec.license       = 'MIT'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_range
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-15 00:00:00.000000000 Z
+date: 2020-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,8 +86,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.1
-description: Provides cross-rails methods for you to upgrade rails, backport features,
-  create easy-to-maintain gems, and so on.
+description: Allow you to manipulate a group of ranges. Such as merging overlapping
+  ranges, doing ranges union and difference.
 email:
 - mrtmrt15xn@yahoo.com.tw
 executables: []
@@ -136,6 +136,6 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Provides cross-rails methods for you to upgrade rails, backport features,
-  create easy-to-maintain gems, and so on.
+summary: Allow you to manipulate a group of ranges. Such as merging overlapping ranges,
+  doing ranges union and difference.
 test_files: []