malge 0.0.2 → 0.0.3

data/CHANGES

@@ -1,9 +1,13 @@
 = vasputils changelog
 
-== Master (for 0.0.3)
+== Master (for 0.0.4)
+
+== Version 0.0.3
+* Add Malge::LeastSquare::a_exp_bx
+* Add Malge::LeastSquare::least_square_a_exp_bx
 
 == Version 0.0.2
-  - Change indent style from tab char to two spaces.
-  - Add lib/malge/leastsquare.rb for Malge::LeastSquare::least_square_1st_degree
+* Change indent style from tab char to two spaces.
+* Add lib/malge/leastsquare.rb for Malge::LeastSquare::least_square_1st_degree
 
 == Version 0.0.1

data/Gemfile

@@ -10,5 +10,5 @@ group :development do
   gem "bundler", "~> 1.2.2"
   gem "jeweler", "~> 1.8.3"
   gem "simplecov", ">= 0"
-  gem "psych", ">= 0"
+  #gem "psych", ">= 0"
 end

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/malge.rb

@@ -1,4 +1,4 @@
-class Malge; end
+module Malge; end
 
 require "malge/simultaneousequations.rb"
 require "malge/leastsquare.rb"

data/lib/malge/leastsquare.rb

@@ -1,18 +1,22 @@
 #! /usr/bin/env ruby
-# coding: utf-8
+#coding: utf-8
 
 #
 #
 #
 module Malge::LeastSquare
-  # Argument 'data_pairs' should be Array of Array's. For example,
-  #   [
-  #     [ 1.0, 2.0],
-  #     [ 2.0, 4.0],
-  #     [ 3.0, 6.0],
-  #   ]
-  # return values of [a_0, a_1] in y = a_0 x^0 + a_1 x^1.
-  # Note that not [a, b] in y = ax + b.
+
+  class UnableCalculationError < Exception; end
+
+
+  #Return values of [a_0, a_1] in y = a_0 x^0 + a_1 x^1.
+  #Argument 'data_pairs' should be Array of Array's. For example,
+  #  [
+  #    [ 1.0, 2.0],
+  #    [ 2.0, 4.0],
+  #    [ 3.0, 6.0],
+  #  ]
+  #Note that not [a, b] in y = ax + b.
   def self.least_square_1st_degree(data_pairs)
     #pp data_pairs
     a = 0.0 #x^2
@@ -34,5 +38,57 @@ module Malge::LeastSquare
     a_0 = (a*e - c*d) / (n*a - c**2)
     [a_0, a_1]
   end
+
+  #Return variance when fitted to y = a_0 x^0 + a_1 x^1.
+  #Argument 'data_pairs' should be Array of Array's. For example,
+  #  [
+  #    [ 1.0, 2.0],
+  #    [ 2.0, 4.0],
+  #    [ 3.0, 6.0],
+  #  ]
+  def self.variance_1st_degree(data_pairs)
+    coefficients = self.least_square_1st_degree(data_pairs)
+    data_pairs.inject(0.0) do |sum, pair|
+      #pp pair
+      #pp sum
+      x = pair[0]
+      y = pair[1]
+      f_x = coefficients[0] + coefficients[1] * x
+      sum += (y - f_x)**2
+    end
+  end
+
+  #Return fitted values of [a, b] in a e^{bx} from 2 point data_pairs;
+  # [[x0, y0], [x1, y1]]
+  #Argument 'data_pairs' should have two items.
+  #Raise if including the same data.
+  def self.a_exp_bx(data_pairs)
+    raise UnableCalculationError if data_pairs[0][1] == data_pairs[1][1]
+    raise UnableCalculationError if data_pairs[0][0] == data_pairs[1][0]
+    matrix = data_pairs.map { |pair| [1.0, pair[0]] }
+    values = data_pairs.map { |pair| Math::log pair[1] }
+    coefficients = Malge::SimultaneousEquations.cramer( matrix, values )
+    coefficients[0] = Math::exp coefficients[0]
+    coefficients
+  end
+
+  #Return fitted values of [a, b] in a e^{bx} from more than two data points.
+  #Argument 'data_pairs' should be Array of Array's. For example,
+  #  [
+  #    [ 1.0, 2.0],
+  #    [ 2.0, 4.0],
+  #    [ 3.0, 6.0],
+  #  ]
+  def self.least_square_a_exp_bx(data_pairs)
+    data_pairs.each do |pair|
+      raise UnableCalculationError if pair[1] == 0.0
+    end
+    data_pairs = data_pairs.map do |pair|
+      [pair[0], Math::log(pair[1])]
+    end
+    coefficients = self.least_square_1st_degree(data_pairs)
+    [Math::exp(coefficients[0]), coefficients[1]]
+  end
+
 end
 

data/malge.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "malge"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippei94da"]
-  s.date = "2013-02-02"
+  s.date = "2013-02-08"
   s.description = "Mathematical library to deal with basic problems in algebla.\n  "
   s.email = "ippei94da@gmail.com"
   s.extra_rdoc_files = [
@@ -48,20 +48,17 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, ["~> 1.2.2"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<psych>, [">= 0"])
     else
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.2.2"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<psych>, [">= 0"])
     end
   else
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.2.2"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<psych>, [">= 0"])
   end
 end
 

data/test/test_leastsquare.rb

@@ -1,5 +1,5 @@
 #! /usr/bin/env ruby
-# coding: utf-8
+#coding: utf-8
 
 require "test/unit"
 require "malge.rb"
@@ -8,7 +8,7 @@ TOLERANCE=1.0e-10
 
 class TC_Malge < Test::Unit::TestCase
   #def setup
-  #  @k = Malge.new
+  # @k = Malge.new
   #end
 
   def test_least_square_1st_degree
@@ -36,7 +36,7 @@ class TC_Malge < Test::Unit::TestCase
       [  9.000,   6.645],
       [ 10.000,   7.962],
     ]
-    #should be below, confirmed by Excel
+    #should be below, confirmed by Excel.
     a0 = -2.0787619047619
     a1 =  1.00077142857143
 
@@ -45,5 +45,90 @@ class TC_Malge < Test::Unit::TestCase
     assert_in_delta(a0, results[0], TOLERANCE)
     assert_in_delta(a1, results[1], TOLERANCE)
   end
+
+  def test_variance_1st_degree
+    data_pairs = [
+      [0.0, -1.0],
+      [1.0,  2.0],
+      [2.0,  3.0],
+      [3.0,  2.0],
+    ]
+    assert_equal( 4.0, Malge::LeastSquare::variance_1st_degree(data_pairs))
+  end
+
+  def test_a_exp_bx
+    data_pairs = [
+      [0.0, 4.0],
+      [1.0, 2.0],
+    ]
+    #y = a e^{bx}
+    #should be
+    #y = 4.0 exp^{- log_e 2 x}
+    corrects = [ 4.0, - Math::log(2.0)]
+    assert_equal(corrects, Malge::LeastSquare.a_exp_bx(data_pairs))
+
+    data_pairs = [
+      [0.0, 1.0],
+      [1.0, 4.0],
+    ]
+    #y = a e^{bx}
+    #should be
+    #y = 4.0 exp^{- log_e 2 x}
+    corrects = [ 1.0, 2.0 * Math::log(2.0)]
+    assert_equal(corrects, Malge::LeastSquare.a_exp_bx(data_pairs))
+
+    data_pairs = [
+      [0.0,  1.0],
+      [1.0,  1.0],
+    ]
+    assert_raise(Malge::LeastSquare::UnableCalculationError){
+      Malge::LeastSquare.a_exp_bx(data_pairs)
+    }
+
+    data_pairs = [
+      [1.0,  1.0],
+      [1.0,  2.0],
+    ]
+    assert_raise(Malge::LeastSquare::UnableCalculationError){
+      Malge::LeastSquare.a_exp_bx(data_pairs)
+    }
+  end
+
+  def test_least_square_a_exp_bx
+    data_pairs = [
+      [0.0, 4.0],
+      [1.0, 2.0],
+      [2.0, 1.0],
+    ]
+    #y = a e^{bx}
+    #should be
+    #y = 4.0 exp^{- log_e 2 x}
+    corrects = [ 4.0, - Math::log(2.0)]
+    results = Malge::LeastSquare.least_square_a_exp_bx(data_pairs)
+    assert_equal(2          , results.size)
+    assert_in_delta(corrects[0], results[0], TOLERANCE)
+    assert_in_delta(corrects[1], results[1], TOLERANCE)
+
+    data_pairs = [
+      [0.0,  1.0],
+      [1.0,  4.0],
+      [2.0, 16.0],
+    ]
+    corrects = [ 1.0, 2.0 * Math::log(2.0)]
+    results = Malge::LeastSquare.least_square_a_exp_bx(data_pairs)
+    assert_equal(2          , results.size)
+    assert_in_delta(corrects[0], results[0], TOLERANCE)
+    assert_in_delta(corrects[1], results[1], TOLERANCE)
+
+    data_pairs = [
+      [0.0, 16.0],
+      [1.0,  4.0],
+      [2.0,  0.0],
+    ]
+    assert_raise(Malge::LeastSquare::UnableCalculationError) do
+      Malge::LeastSquare.least_square_a_exp_bx(data_pairs)
+    end
+  end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: malge
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-02 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &85726200 !ruby/object:Gem::Requirement
+  requirement: &86230380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *85726200
+  version_requirements: *86230380
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &85725800 !ruby/object:Gem::Requirement
+  requirement: &86229650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.2
   type: :development
   prerelease: false
-  version_requirements: *85725800
+  version_requirements: *86229650
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &85725460 !ruby/object:Gem::Requirement
+  requirement: &86229110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *85725460
+  version_requirements: *86229110
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &85725190 !ruby/object:Gem::Requirement
+  requirement: &86228170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,18 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85725190
-- !ruby/object:Gem::Dependency
-  name: psych
-  requirement: &85724910 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *85724910
+  version_requirements: *86228170
 description: ! "Mathematical library to deal with basic problems in algebla.\n  "
 email: ippei94da@gmail.com
 executables: []
@@ -105,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 225117071
+      hash: -142397791
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: