ranges_merger 0.3.1 → 0.4.0

data/README.rdoc

@@ -9,9 +9,7 @@ Very simple gem for merging range-like objects.
 If you want to merge please use code just like below.
 
  a = [1, 3]
-
  b = [2, 4]
-
  c = [4, 6]
 
  result = RangesMerger.merge([a, b, c])
@@ -25,13 +23,9 @@ If you want to merge please use code just like below.
 If you want to merge Range objects.
 
  ranges = [
-
       (1..2),
-
       (2..3),
-
       (5..8)
-
  ]
 
  result = RangesMerger.merge(ranges)
@@ -47,15 +41,12 @@ If you want to exclude please use code just like below.
 First - base:
 
  a = [1, 3]
-
  b = [3, 5]
-
  c = [9, 11]
 
 Seconds - exclusions:
 
  x = [2, 4]
-
  y = [4, 10]
 
 And run some processing
@@ -73,13 +64,11 @@ If you want to have instance, add and remove ranges as you wish just do somethin
  r = RangesMerger.new
 
  r += [[1, 10]]
-
  r += [[8, 15]]
 
  # r.to_array => [[1, 15]]
 
  r -= [[2, 4]]
-
  r -= [[11, 12]]
 
  # r.to_array => [[1, 2], [4,11], [12,15]]
@@ -133,6 +122,39 @@ 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
+can use this gem! :)
+
+ # currents = [
+ #   [ time_from, time_to, value ],
+ #   ...
+ # ]
+ #
+
+ currents = [
+   [1, 2, 1],
+   [2, 3, 2]
+ ]
+
+ voltages = [
+   [1, 2, 2],
+   [2, 3, 1]
+ ]
+
+ result = RangesMerger.energy_calculation(voltages, currents)
+
+ # result => 4
+
+
+This is early version, it should work and calculate correct amount of energy, but
+it could not :]
+
+
+
 == Contributing to ranges_merger
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

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_energy_calculation'
 
 class RangesMerger
   extend RangesMergerMerging

data/lib/ranges_merger/ranges_merger_energy_calculation.rb

@@ -0,0 +1,68 @@
+class RangesMerger
+
+  def self.energy_calculation(voltages, currents, _debug = false)
+    return 0 if voltages.size == 0 or currents.size == 0
+
+    # sort time ranges
+    voltages = voltages.sort { |a, b| a[0] <=> b[0] }
+    currents = currents.sort { |a, b| a[0] <=> b[0] }
+    # without checking of overlaps
+
+    # for loop
+    voltage_i = 0
+    current_i = 0
+
+    # output
+    energy = 0.0
+
+    voltage_first = true
+    voltage_first = false if currents[0][0] < voltages[0][0]
+
+    while voltage_i < voltages.size and current_i < currents.size
+      v = voltages[voltage_i]
+      c = currents[current_i]
+
+      # common time range
+      _time_from = v[0]
+      _time_from = c[0] if c[0] > v[0]
+
+      _time_to = v[1]
+      _time_to = c[1] if c[1] < v[1]
+
+      # adding to output
+      if _time_to > _time_from
+        _energy_part = v[2] * c[2] * (_time_to - _time_from)
+      else
+        # it should not enter here... probably
+        _energy_part = 0.0
+      end
+      energy += _energy_part
+
+      puts "#{voltage_i}, #{current_i} = #{_energy_part}, #{v.inspect}, #{c.inspect}" if _debug
+
+      # next from array
+      if c[1] > v[1]
+        voltage_i += 1
+      else
+        current_i += 1
+      end
+
+    end
+
+    #currents = [
+    #  [1, 2] => 1,
+    #  [2, 3] => 2
+    #]
+    #
+    #voltages = [
+    #  [1, 2] => 2,
+    #  [2, 3] => 1
+    #]
+
+
+    start_time = voltages
+
+    return energy
+  end
+
+end

data/ranges_merger.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ranges_merger"
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aleksander Kwiatkowski"]
-  s.date = "2011-12-08"
+  s.date = "2012-05-23"
   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,17 +28,19 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/ranges_merger.rb",
     "lib/ranges_merger/ranges_merger_divider.rb",
+    "lib/ranges_merger/ranges_merger_energy_calculation.rb",
     "lib/ranges_merger/ranges_merger_exclusion.rb",
     "lib/ranges_merger/ranges_merger_merging.rb",
     "lib/ranges_merger/ranges_merger_utils.rb",
     "ranges_merger.gemspec",
+    "spec/ranges_merger_energy_calculation_spec.rb",
     "spec/ranges_merger_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/akwiatkowski/ranges_merger"
   s.licenses = ["LGPLv3"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.15"
   s.summary = "Small gem for merging range-like objects"
 
   if s.respond_to? :specification_version then

data/spec/ranges_merger_energy_calculation_spec.rb

@@ -0,0 +1,105 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "RangesMerger" do
+
+  # Merging
+
+  it "should calculate energy (1)" do
+    # time_from, time_to, value
+
+    currents = [
+      [1, 2, 1],
+      [2, 3, 2]
+    ]
+
+    voltages = [
+      [1, 2, 2],
+      [2, 3, 1]
+    ]
+
+    result = RangesMerger.energy_calculation(voltages, currents)
+    result.should == 4
+  end
+
+  it "should calculate energy (2)" do
+    # time_from, time_to, value
+
+    currents = [
+      [0, 1, 0],
+      [2, 5, 1],
+      [5, 6, 0]
+    ]
+
+    voltages = [
+      [0, 1, 5],
+      [2, 5, 0],
+      [5, 6, 5]
+    ]
+
+    result = RangesMerger.energy_calculation(voltages, currents)
+    result.should == 0
+  end
+
+  it "should calculate energy (3)" do
+    # time_from, time_to, value
+
+    currents = [
+      [0, 5, 0],
+      [5, 10, 1]
+    ]
+
+    voltages = [
+      [0, 1, 1],
+      [1, 2, 0],
+      #
+      [2, 3, 1],
+      [3, 4, 0],
+      #
+      [4, 5, 1],
+      [5, 6, 0],
+      #
+      [6, 7, 1],
+      [7, 8, 0],
+      #
+      [8, 9, 1],
+      [9, 10, 0],
+    ]
+
+    result = RangesMerger.energy_calculation(voltages, currents)
+    result.should == 2
+  end
+
+  it "should calculate energy (4)" do
+    # time_from, time_to, value
+
+    currents = [
+      [0, 0.1, 1],
+      [0.2, 0.5, 2]
+    ]
+
+    voltages = [
+      [1, 2, 1]
+    ]
+
+    result = RangesMerger.energy_calculation(voltages, currents)
+    result.should == 0
+  end
+
+  it "should calculate energy (5)" do
+    # time_from, time_to, value
+
+    currents = [
+      [0, 0.1, 1],
+      [0.2, 0.5, 2]
+    ]
+
+    voltages = [
+      [0, 1, 1]
+    ]
+
+    result = RangesMerger.energy_calculation(voltages, currents)
+    result.should == 0.1 + (0.5 - 0.2) * 2
+  end
+
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ranges_merger
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-08 00:00:00.000000000Z
+date: 2012-05-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &88199790 !ruby/object:Gem::Requirement
+  requirement: &27977180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *88199790
+  version_requirements: *27977180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &88135780 !ruby/object:Gem::Requirement
+  requirement: &19793280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *88135780
+  version_requirements: *19793280
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &88135480 !ruby/object:Gem::Requirement
+  requirement: &21103540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *88135480
+  version_requirements: *21103540
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &88135180 !ruby/object:Gem::Requirement
+  requirement: &22223640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *88135180
+  version_requirements: *22223640
 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,10 +75,12 @@ files:
 - VERSION
 - lib/ranges_merger.rb
 - lib/ranges_merger/ranges_merger_divider.rb
+- lib/ranges_merger/ranges_merger_energy_calculation.rb
 - lib/ranges_merger/ranges_merger_exclusion.rb
 - lib/ranges_merger/ranges_merger_merging.rb
 - lib/ranges_merger/ranges_merger_utils.rb
 - ranges_merger.gemspec
+- spec/ranges_merger_energy_calculation_spec.rb
 - spec/ranges_merger_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/akwiatkowski/ranges_merger
@@ -96,7 +98,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -918554511
+      hash: 3481524600643469531
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -105,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Small gem for merging range-like objects