epitools 0.5.95 → 0.5.96

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '09ec6a706e691b75f78ba25055e8c79b2beb3944'
-  data.tar.gz: 4ebd4dad0730f0ff7434583261d45e50a7427320
+  metadata.gz: 6bc0ff24a8ad6f3dc81034a1d358c5fc1f7130ac
+  data.tar.gz: b834243e264b44d0fa33492e6e80697342d558ee
 SHA512:
-  metadata.gz: 2c43291944e5e7c7e1d409e9df8e33d30d9ff02cfcc1d29b478f231476b8c1d4fa72edae5219f63bad5bbd7da4e4d2aee50794b1b3b1977fbfae3bcc10f0db71
-  data.tar.gz: 78595a9e4d78eea0f8b626827dd14dddd4a4c29f4c6b286ca50def65aeeaa778f51fdbb26713ec80f3d908239c70c4d245602fac969757a6ac69d91e83bbf229
+  metadata.gz: 1108d095b65008e83a72b7e2f3904067550804e57d9d4351905f77aea5ffdf1880df671f161353ce2eade31a3c507c2311ca96e5bc20202b0d1f88af2bf363e4
+  data.tar.gz: f597a50f0cb08bf959db4c05f416de5bbd9ba9ca1219cc907800c2d9942535a9c02fb599c0f9572e26b0b7baba3e211843a71cce1ece531aab08e2c5d7fc159b

data/VERSION

@@ -1 +1 @@
-0.5.95
+0.5.96

data/lib/epitools/core_ext/range.rb

@@ -1,5 +1,12 @@
 class Range
 
+  #
+  # The actual last value in the range (eg: `(1...10).actual_last == 9`)
+  #
+  def actual_last
+    exclude_end? ? last - 1 : last
+  end
+
   #
   # Pick a random number from the range.
   #
@@ -25,15 +32,21 @@ class Range
   end
 
   #
-  # Return a new range which is the union of the two ranges
+  # Return a new range which is the union of the two ranges (even if the two ranges don't overlap)
   #
   def |(other)
-    mins, maxes = minmax.zip(other.minmax)
-    (mins.min..maxes.max)
+    vals = [
+      first,
+      other.first,
+      actual_last,
+      other.actual_last
+    ].sort
+
+    (vals.first..vals.last)
   end
 
   #
-  # Merge two ranges
+  # Merge this range with another (if the two ranges overlap, then it returns an array containing a single merged range; if the two ranges are disjoint, an array with the two ranges is returned)
   #
   def merge(other)
     if self.overlaps?(other)
@@ -48,7 +61,26 @@ class Range
   #
   def overlaps?(other)
     # overlap == start < finish' AND start' < finish
-    self.first <= other.last and other.first <= self.last
+    self.first <= other.actual_last and other.first <= self.actual_last
+  end
+
+  #
+  # Takes an array of ranges, and returns a new array where all overlapping ranges are combined into a single range
+  #
+  def self.optimize(ranges)
+    ranges = ranges.sort_by(&:first)
+
+    result = [ranges.first]
+
+    ranges[1..-1].each do |elem|
+      if result[-1].overlaps?(elem)
+        result[-1] = (result[-1] | elem)
+      else
+        result << elem
+      end
+    end
+
+    result
   end
 
 end

data/spec/core_ext_spec.rb

@@ -851,6 +851,11 @@ describe Range do
     (10..30).overlaps?(1..15).should == true
   end
 
+  it "optimizes" do
+    ranges = [ 1..5, 2..6, 7..10, 7..20, 25...50, 50..55 ].shuffle
+    Range.optimize(ranges).should == [ 1..6, 7..20, 25...50, 50..55 ]
+  end
+
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epitools
 version: !ruby/object:Gem::Version
-  version: 0.5.95
+  version: 0.5.96
 platform: ruby
 authors:
 - epitron