multi_range 1.1.0 → 1.3.2

data/Rakefile

@@ -1,10 +1,10 @@
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.libs << 'lib'
-  t.test_files = FileList['test/**/*_test.rb']
-end
-
-task :default => :test
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/**/*_test.rb']
+end
+
+task :default => :test

data/bin/console

@@ -1,14 +1,14 @@
-#!/usr/bin/env ruby
-
-require 'bundler/setup'
-require 'multi_range'
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require 'irb'
-IRB.start
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'multi_range'
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require 'irb'
+IRB.start

data/bin/setup

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install --gemfile=gemfiles/4.2.gemfile
-
-# Do any other automated setup that you need to do here
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install --gemfile=gemfiles/4.2.gemfile
+
+# Do any other automated setup that you need to do here

data/gemfiles/Gemfile

@@ -1,9 +1,9 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in rails_or.gemspec
-
-group :test do
-  gem 'simplecov'
-end
-
-gemspec :path => '../'
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in rails_or.gemspec
+
+group :test do
+  gem 'simplecov'
+end
+
+gemspec :path => '../'

data/gemfiles/ruby_1_8_7.gemfile

@@ -1,10 +1,10 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in rails_or.gemspec
-
-group :test do
-  gem 'simplecov'
-  gem 'minitest', '~> 5.11.3'
-end
-
-gemspec :path => '../'
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in rails_or.gemspec
+
+group :test do
+  gem 'simplecov'
+  gem 'minitest', '~> 5.11.3'
+end
+
+gemspec :path => '../'

data/lib/multi_range.rb

@@ -1,143 +1,174 @@
-# frozen_string_literal: true
-
-require 'multi_range/version'
-require 'roulette-wheel-selection'
-
-if not Range.method_defined?(:size)
-  warn "Please backports Range#size method to use multi_range gem.\n" \
-       "You can use backports gem and add the following lines to your program:\n" \
-       "require 'backports/1.9.2/float/infinity'\n" \
-       "require 'backports/2.0.0/range/size'"
-end
-
-if not Enumerable.method_defined?(:to_h)
-  warn "Please backports Enumerable#to_h method to use multi_range gem.\n" \
-       "You can use backports gem and add the following lines to your program:\n" \
-       "require 'backports/2.1.0/enumerable/to_h'"
-end
-
-class MultiRange
-  INDEX_WITH_DEFAULT = Object.new
-
-  attr_reader :ranges
-
-  def initialize(ranges)
-    @ranges = ranges.map{|s| s.is_a?(Integer) ? s..s : s }.sort_by(&:begin).freeze
-  end
-
-  def merge_overlaps
-    return MultiRange.new([]) if @ranges.size == 0
-
-    new_ranges = []
-    current_range = nil
-
-    @ranges.each do |range|
-      next current_range = range if current_range == nil
-      next if range.max <= current_range.max
-
-      if current_range.max + 1 < range.min
-        new_ranges << current_range
-        current_range = range
-      else
-        current_range = current_range.min..range.max
-      end
-    end
-
-    new_ranges << current_range
-    return MultiRange.new(new_ranges)
-  end
-
-  def -(other)
-    if other.is_a?(MultiRange)
-      new_multi_range = dup
-      other.ranges.each{|range| new_multi_range -= range }
-      return new_multi_range
-    end
-
-    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 # 小於最小值
-
-    changed_size = 0
-    @ranges.each_with_index do |range, idx|
-      next if other.min > range.max # 大於這個 range
-      break if other.max < range.min # 小於這個 range
-
-      sub_range1 = range.min...other.min
-      sub_range2 = (other.max + 1)..range.max
-
-      sub_ranges = []
-      sub_ranges << sub_range1 if sub_range1.any?
-      sub_ranges << sub_range2 if sub_range2.any?
-
-      new_ranges[idx + changed_size, 1] = sub_ranges
-      changed_size += sub_ranges.size - 1
-      break if other.max <= range.max # 沒有超過一個 range 的範圍
-    end
-
-    return MultiRange.new(new_ranges)
-  end
-
-  def |(other)
-    other_ranges = other.is_a?(MultiRange) ? other.ranges : [other]
-    return MultiRange.new(@ranges + other_ranges).merge_overlaps
-  end
-
-  def overlaps?(other)
-    multi_range = merge_overlaps
-    return multi_range.size != (multi_range - other).size
-  end
-
-  def sample
-    range = RouletteWheelSelection.sample(@ranges.map{|s| [s, s.size] }.to_h)
-    return nil if range == nil
-    return rand(range.max - range.min) + range.min
-  end
-
-  def size
-    @ranges.inject(0){|sum, v| sum + v.size }
-  end
-
-  def any?
-    @ranges.any?
-  end
-
-  def index_with(default = INDEX_WITH_DEFAULT)
-    if block_given?
-      fail ArgumentError, 'wrong number of arguments (given 1, expected 0)' if default != INDEX_WITH_DEFAULT
-      return map{|s| [s, yield(s)] }.to_h
-    end
-
-    return to_enum(:index_with){ size } if default == INDEX_WITH_DEFAULT
-    return map{|s| [s, default] }.to_h
-  end
-
-  def each
-    return to_enum(:each){ size } if !block_given?
-
-    ranges.each do |range|
-      range.each{|s| yield(s) }
-    end
-  end
-
-  def map
-    return to_enum(:map){ size } if !block_given?
-    return each.map{|s| yield(s) }
-  end
-
-  def to_a
-    each.to_a
-  end
-
-  def min
-    range = @ranges.first
-    return range.min if range
-  end
-
-  def max
-    range = @ranges.last
-    return range.max if range
-  end
-end
+# frozen_string_literal: true
+
+require 'multi_range/version'
+require 'roulette-wheel-selection'
+
+if not Range.method_defined?(:size)
+  warn "Please backports Range#size method to use multi_range gem.\n" \
+       "You can use backports gem and add the following lines to your program:\n" \
+       "require 'backports/1.9.2/float/infinity'\n" \
+       "require 'backports/2.0.0/range/size'"
+end
+
+if not Enumerable.method_defined?(:to_h)
+  warn "Please backports Enumerable#to_h method to use multi_range gem.\n" \
+       "You can use backports gem and add the following lines to your program:\n" \
+       "require 'backports/2.1.0/enumerable/to_h'"
+end
+
+class MultiRange
+  INDEX_WITH_DEFAULT = Object.new
+
+  attr_reader :ranges
+
+  def initialize(ranges)
+    @ranges = ranges.map{|s| s.is_a?(Numeric) ? s..s : s }.sort_by{|s| s.begin }.freeze
+    @is_float = @ranges.any?{|range| range.begin.is_a?(Float) || range.end.is_a?(Float) }
+  end
+
+  def merge_overlaps(merge_same_value = true)
+    return MultiRange.new([]) if @ranges.size == 0
+
+    new_ranges = []
+    current_range = nil
+
+    @ranges.each do |range|
+      next current_range = range if current_range == nil
+      next if range.end <= current_range.end
+
+      if can_combine?(current_range, range, merge_same_value)
+        current_range = range.exclude_end? ? current_range.begin...range.end : current_range.begin..range.end
+      else
+        new_ranges << current_range
+        current_range = range
+      end
+    end
+
+    new_ranges << current_range
+    return MultiRange.new(new_ranges)
+  end
+
+  def -(other)
+    return difference_with_other_multi_range(other) if other.is_a?(MultiRange)
+
+    new_ranges = @ranges.dup
+    return MultiRange.new(new_ranges) if not overlaps_with_range?(other)
+
+    changed_size = 0
+    @ranges.each_with_index do |range, idx|
+      next if other.begin > range.end # 大於這個 range
+      break if other.end < range.begin # 小於這個 range
+
+      sub_ranges = possible_sub_ranges_of(range, other)
+      new_ranges[idx + changed_size, 1] = sub_ranges
+      changed_size += sub_ranges.size - 1
+      break if other.end <= range.end # 沒有超過一個 range 的範圍
+    end
+
+    return MultiRange.new(new_ranges)
+  end
+
+  def |(other)
+    other_ranges = other.is_a?(MultiRange) ? other.ranges : [other]
+    return MultiRange.new(@ranges + other_ranges).merge_overlaps
+  end
+
+  def overlaps?(other)
+    multi_range = merge_overlaps
+    return multi_range.ranges != (multi_range - other).ranges
+  end
+
+  def sample
+    range = RouletteWheelSelection.sample(@ranges.map{|s| [s, s.size] }.to_h)
+    return nil if range == nil
+    return rand(range.max - range.min + 1) + range.min
+  end
+
+  def size
+    @ranges.inject(0){|sum, v| sum + v.size }
+  end
+
+  def any?
+    @ranges.any?
+  end
+
+  def index_with(default = INDEX_WITH_DEFAULT)
+    if block_given?
+      fail ArgumentError, 'wrong number of arguments (given 1, expected 0)' if default != INDEX_WITH_DEFAULT
+      return map{|s| [s, yield(s)] }.to_h
+    end
+
+    return to_enum(:index_with){ size } if default == INDEX_WITH_DEFAULT
+    return map{|s| [s, default] }.to_h
+  end
+
+  def each
+    return to_enum(:each){ size } if !block_given?
+
+    ranges.each do |range|
+      range.each{|s| yield(s) }
+    end
+  end
+
+  def map
+    return to_enum(:map){ size } if !block_given?
+    return each.map{|s| yield(s) }
+  end
+
+  def to_a
+    each.to_a
+  end
+
+  def min
+    range = @ranges.first
+    return range.min if range
+  end
+
+  def max
+    range = @ranges.last
+    return range.max if range
+  end
+
+  def contain_overlaps?
+    merge_overlaps(false).ranges != ranges
+  end
+
+  private
+
+  # make sure that range1.begin <= range2.begin
+  def can_combine?(range1, range2, merge_same_value)
+    return merge_same_value if range1.end == range2.begin and range1.exclude_end?
+    return range1.end >= range2.begin if @is_float
+    return range1.end + 1 >= range2.begin
+  end
+
+  def difference_with_other_multi_range(other)
+    new_multi_range = dup
+    other.ranges.each{|range| new_multi_range -= range }
+    return new_multi_range
+  end
+
+  def possible_sub_ranges_of(range, other)
+    sub_range1 = range.begin...other.begin
+
+    sub_range2_begin = if other.exclude_end?
+                         other.end
+                       else
+                         other.end + (other.end.is_a?(Float) ? Float::EPSILON : 1)
+                       end
+
+    sub_range2 = range.exclude_end? ? sub_range2_begin...range.end : sub_range2_begin..range.end
+
+    sub_ranges = []
+    sub_ranges << sub_range1 if sub_range1.begin <= sub_range1.end
+    sub_ranges << sub_range2 if sub_range2.begin <= sub_range2.end
+    return sub_ranges
+  end
+
+  def overlaps_with_range?(range)
+    return false if @ranges.empty?
+    return false if range.begin > @ranges.last.end # larger than maxinum
+    return false if range.end < @ranges.first.begin # smaller than mininum
+    return true
+  end
+end

data/lib/multi_range/version.rb

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

data/multi_range.gemspec

@@ -1,43 +1,43 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'multi_range/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'multi_range'
-  spec.version       = MultiRange::VERSION
-  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.homepage      = 'https://github.com/khiav223577/multi_range'
-  spec.license       = 'MIT'
-
-  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
-  # delete this section to allow pushing this gem to any host.
-  # if spec.respond_to?(:metadata)
-  #  spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
-  # else
-  #  raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
-  # end
-
-  spec.files         = `git ls-files -z`.split("\x0").reject{|f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}){|f| File.basename(f) }
-  spec.require_paths = ['lib']
-  spec.metadata      = {
-    'homepage_uri'      => 'https://github.com/khiav223577/multi_range',
-    'changelog_uri'     => 'https://github.com/khiav223577/multi_range/blob/master/CHANGELOG.md',
-    'source_code_uri'   => 'https://github.com/khiav223577/multi_range',
-    'documentation_uri' => 'https://www.rubydoc.info/gems/multi_range',
-    'bug_tracker_uri'   => 'https://github.com/khiav223577/multi_range/issues',
-  }
-
-  spec.add_development_dependency 'bundler', '>= 1.17', '< 3.x'
-  spec.add_development_dependency 'rake', '>= 10.5.0'
-  spec.add_development_dependency 'minitest', '~> 5.0'
-  spec.add_development_dependency 'backports', '~> 3.15.0'
-
-  spec.add_dependency 'roulette-wheel-selection', '~> 1.1.1'
-end
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'multi_range/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'multi_range'
+  spec.version       = MultiRange::VERSION
+  spec.authors       = ['khiav reoy']
+  spec.email         = ['mrtmrt15xn@yahoo.com.tw']
+
+  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'
+
+  # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
+  # delete this section to allow pushing this gem to any host.
+  # if spec.respond_to?(:metadata)
+  #  spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
+  # else
+  #  raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
+  # end
+
+  spec.files         = `git ls-files -z`.split("\x0").reject{|f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}){|f| File.basename(f) }
+  spec.require_paths = ['lib']
+  spec.metadata      = {
+    'homepage_uri'      => 'https://github.com/khiav223577/multi_range',
+    'changelog_uri'     => 'https://github.com/khiav223577/multi_range/blob/master/CHANGELOG.md',
+    'source_code_uri'   => 'https://github.com/khiav223577/multi_range',
+    'documentation_uri' => 'https://www.rubydoc.info/gems/multi_range',
+    'bug_tracker_uri'   => 'https://github.com/khiav223577/multi_range/issues',
+  }
+
+  spec.add_development_dependency 'bundler', '>= 1.17', '< 3.x'
+  spec.add_development_dependency 'rake', '>= 10.5.0'
+  spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'backports', '~> 3.15.0'
+
+  spec.add_dependency 'roulette-wheel-selection', '~> 1.1.1'
+end