ranges_merger 0.4.0 → 0.4.1

data/README.rdoc

@@ -93,6 +93,26 @@ parts than interval, or without them.
  # result => [[1, 4], [4, 7], [7, 9]]
 
 
+== Dividing with equal interval
+
+ r = RangesMerger.new
+
+ r += [[1, 9]] # store 1 as lowest value
+
+ r -= [[1, 2], [4, 5]]
+
+ result = r % 2
+
+ # result => [[2, 4], [5, 7], [7, 9]]
+
+ result = r / 2
+
+ # result => [[2, 4], [5, 7], [7, 9]]
+
+ result = r.divide_eqi(2)
+
+ # result => [[5, 7], [7, 9]]
+
 
 == Ranges are not only numbers
 
@@ -125,8 +145,8 @@ object.
 == Calculation of energy (beta)
 
 Imagine you have information about voltage and current and you want to calculate work/energy.
-Theese measurements are not set to one point in time but to a time range ('from' and 'to').
-Theese time ranges are not identical for voltage and current. So what would you do? You
+These measurements are not set to one point in time but to a time range ('from' and 'to').
+These time ranges are not identical for voltage and current. So what would you do? You
 can use this gem! :)
 
  # currents = [
@@ -150,8 +170,8 @@ can use this gem! :)
  # result => 4
 
 
-This is early version, it should work and calculate correct amount of energy, but
-it could not :]
+This is an early version, it should work and calculate correct amount of energy, but
+it could not :].
 
 
 

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/ranges_merger.rb

@@ -2,6 +2,7 @@ require 'ranges_merger/ranges_merger_merging'
 require 'ranges_merger/ranges_merger_utils'
 require 'ranges_merger/ranges_merger_exclusion'
 require 'ranges_merger/ranges_merger_divider'
+require 'ranges_merger/ranges_merger_divider_eq_interval'
 require 'ranges_merger/ranges_merger_energy_calculation'
 
 class RangesMerger
@@ -9,16 +10,19 @@ class RangesMerger
   extend RangesMergerUtils
   extend RangesMergerExclusion
   extend RangesMergerDivider
+  extend RangesMergerDividerEqInterval
 
   attr_reader :ranges
 
   def initialize(_array = [])
+    @total_min = nil
     @ranges = self.class.merge(
       self.class.normalize_array(_array)
     )
   end
 
   def add(_array)
+    register_min(_array)
     @ranges = self.class.merge(@ranges + _array)
     return self
   end
@@ -48,6 +52,10 @@ class RangesMerger
     divide(interval, false)
   end
 
+  def divide_eqi(interval, total_min = @total_min)
+    return self.class.divide_eqi(@ranges, interval, total_min)
+  end
+
   def to_ranges
     self.class.array_to_ranges(@ranges)
   end
@@ -56,4 +64,16 @@ class RangesMerger
     @ranges
   end
 
+  private
+
+  # Hack for maintaining proper interval and start for 'divide_eqi'
+  def register_min(ranges)
+    _min = ranges.sort{|a,b| a[0] <=> b[0]}.first[0]
+    if @total_min.nil?
+      @total_min = _min
+    else
+      @total_min = _min if @total_min > _min
+    end
+  end
+
 end

data/lib/ranges_merger/ranges_merger_divider_eq_interval.rb

@@ -0,0 +1,21 @@
+module RangesMergerDividerEqInterval
+  # Divide with equal interval
+  def divide_eqi(_array, interval, total_min)
+    # calculate for whole range
+    joined_array = merge(_array)
+
+    min = joined_array.first[0]
+    min = total_min if total_min < min and not total_min.nil? # before merging
+    max = joined_array.last[1]
+    divided_array = divide([[min, max]], interval)
+
+    # remove sub-ranges
+    filtered_array = Array.new
+    joined_array.each do |ja|
+      filtered_array += divided_array.select{|da| ja[0] <= da[0] and ja[1] >= da[1] }
+    end
+    filtered_array = filtered_array.sort.uniq
+
+    return filtered_array
+  end
+end

data/ranges_merger.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ranges_merger"
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aleksander Kwiatkowski"]
-  s.date = "2012-05-23"
+  s.date = "2012-08-06"
   s.description = "Simple gem used for merging range-like objects. If you have problems with operations on ranges this gem can save you some time."
   s.email = "bobikx@poczta.fm"
   s.extra_rdoc_files = [
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/ranges_merger.rb",
     "lib/ranges_merger/ranges_merger_divider.rb",
+    "lib/ranges_merger/ranges_merger_divider_eq_interval.rb",
     "lib/ranges_merger/ranges_merger_energy_calculation.rb",
     "lib/ranges_merger/ranges_merger_exclusion.rb",
     "lib/ranges_merger/ranges_merger_merging.rb",
@@ -35,6 +36,7 @@ Gem::Specification.new do |s|
     "ranges_merger.gemspec",
     "spec/ranges_merger_energy_calculation_spec.rb",
     "spec/ranges_merger_spec.rb",
+    "spec/ranges_merger_spec_equal_interval.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/akwiatkowski/ranges_merger"

data/spec/ranges_merger_spec.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
-describe "RangesMerger" do
+describe RangesMerger do
 
   # Merging
 

data/spec/ranges_merger_spec_equal_interval.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe RangesMergerDividerEqInterval do
+
+  it "should divide into ranges w/o changing 'interval'" do
+    a = [[0, 10]]
+    b = [[1, 2]]
+
+    r = RangesMerger.new
+    r += a
+    r -= b
+
+    result = r.divide_eqi(2)
+    result.should == [[2, 4], [4, 6], [6, 8], [8, 10]]
+  end
+
+  it "should divide into ranges w/o changing 'interval' (2)" do
+    a = [[0, 10]]
+    b = [[1, 2], [5, 6], [8, 9]]
+
+    r = RangesMerger.new
+    r += a
+    r -= b
+
+    result = r.divide_eqi(2)
+    result.should == [[2, 4], [6, 8]]
+  end
+
+  it 'readme' do
+    r = RangesMerger.new
+    r += [[1, 9]]
+    r -= [[1, 2], [4, 5]]
+    result = r % 2
+    #puts result.inspect
+
+    result = r / 2
+    #puts result.inspect
+
+    result = r.divide_eqi(2)
+    #puts result.inspect
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ranges_merger
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000Z
+date: 2012-08-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &27977180 !ruby/object:Gem::Requirement
+  requirement: &12681880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *27977180
+  version_requirements: *12681880
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &19793280 !ruby/object:Gem::Requirement
+  requirement: &13765160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *19793280
+  version_requirements: *13765160
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &21103540 !ruby/object:Gem::Requirement
+  requirement: &14139740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *21103540
+  version_requirements: *14139740
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &22223640 !ruby/object:Gem::Requirement
+  requirement: &15781800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22223640
+  version_requirements: *15781800
 description: Simple gem used for merging range-like objects. If you have problems
   with operations on ranges this gem can save you some time.
 email: bobikx@poczta.fm
@@ -75,6 +75,7 @@ files:
 - VERSION
 - lib/ranges_merger.rb
 - lib/ranges_merger/ranges_merger_divider.rb
+- lib/ranges_merger/ranges_merger_divider_eq_interval.rb
 - lib/ranges_merger/ranges_merger_energy_calculation.rb
 - lib/ranges_merger/ranges_merger_exclusion.rb
 - lib/ranges_merger/ranges_merger_merging.rb
@@ -82,6 +83,7 @@ files:
 - ranges_merger.gemspec
 - spec/ranges_merger_energy_calculation_spec.rb
 - spec/ranges_merger_spec.rb
+- spec/ranges_merger_spec_equal_interval.rb
 - spec/spec_helper.rb
 homepage: http://github.com/akwiatkowski/ranges_merger
 licenses:
@@ -98,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3481524600643469531
+      hash: 1390856309896833355
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: