malge 0.0.5 → 0.0.6

data/CHANGES

@@ -1,6 +1,14 @@
 = vasputils changelog
 
-== Master (for 0.0.6)
+== Master (for 0.0.7)
+
+== Version 0.0.6)
+* Rename Malge::ErrorFittedFunction::AXInv to Malge::ErrorFittedFunction::AXInvPlusB
+* Rename Malge::ErrorFittedFunction::AXInv32 to Malge::ErrorFittedFunction::AXInv32PlusB
+
+* New Malge::ErrorFittedFunction::AXInv   to fit purely inverse proportional function
+* New Malge::ErrorFittedFunction::AXInv32 to fit purely inverse^{3/2} proportional function
+* Change Malge::LeastSquare.least_square_proportional to return an array of one item.
 
 == Version 0.0.5)
 * @raw_pairs and @diff_abs_pairs in Malge::ErrorFittedFunction change to publicly readable.

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/malge.rb

@@ -5,6 +5,8 @@ require "malge/errorfittedfunction/aexpbx.rb"
 require "malge/errorfittedfunction/aexpbx32.rb"
 require "malge/errorfittedfunction/axinv.rb"
 require "malge/errorfittedfunction/axinv32.rb"
+require "malge/errorfittedfunction/axinvplusb.rb"
+require "malge/errorfittedfunction/axinv32plusb.rb"
 require "malge/leastsquare.rb"
 require "malge/matrix.rb"
 require "malge/simultaneousequations.rb"

data/lib/malge/errorfittedfunction/axinv.rb

@@ -9,19 +9,17 @@ class Malge::ErrorFittedFunction::AXInv < Malge::ErrorFittedFunction
 
   def fit
     inv_pairs =  @diff_abs_pairs.map {|pair| [1.0/pair[0], pair[1]]}
-    @coefficients = Malge::LeastSquare.least_square_1st_degree(inv_pairs)
+    @coefficients = Malge::LeastSquare.least_square_proportional(inv_pairs)
   end
 
   def expected_error(x)
-    #@coefficients[0] + @coefficients[1] * x
-    @coefficients[0] + @coefficients[1] * (1.0/x)
+    @coefficients[0] / x
   end
 
-  #        y = a[0] + a[1]/x
-  # y - a[0] = a[1]/x
-  #        x = a[1] / (y - a[0])
+  #y = a/x
+  #x = a/y
   def x(y)
-    return @coefficients[1] / (y - @coefficients[0])
+    return @coefficients[0] / y
   end
 
   def finest_y

data/lib/malge/errorfittedfunction/axinv32.rb

@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
 # coding: utf-8
 
-#Assumed y = a[0] + a[1]/x^{3/2}
+#Assumed y = a[0] /x^{3/2}
 #
 #NOTE: @coefficients[0] might become negative value.
 # Need discussion for dealing?
@@ -10,18 +10,20 @@ class Malge::ErrorFittedFunction::AXInv32 < Malge::ErrorFittedFunction
   def fit
     inv32_pairs =
       @diff_abs_pairs.map {|pair| [1.0/(pair[0] ** (3.0/2.0)), pair[1]]}
-    @coefficients = Malge::LeastSquare.least_square_1st_degree(inv32_pairs)
+    @coefficients = Malge::LeastSquare.least_square_proportional(inv32_pairs)
   end
 
   def expected_error(x)
-    @coefficients[0] + @coefficients[1] * (1.0/(x** (3.0/2.0)))
+    @coefficients[0] /(x** (3.0/2.0))
   end
 
-  #        y = a[0] + a[1]/x
-  # y - a[0] = a[1]/x
-  #        x = a[1] / (y - a[0])
+  #        y = a[0]/x^{3/2}
+  #        y = a[0]/x^{3/2}
+  #x^{3/2} y = a[0]
+  #  x^{3/2} = a[0]/y
+  #        x = (a[0]/y)^{2/3}
   def x(y)
-    return (@coefficients[1] / (y - @coefficients[0])) ** (2.0/3.0)
+    return (@coefficients[0] / y ) ** (2.0/3.0)
   end
 
   def finest_y

data/lib/malge/errorfittedfunction/axinv32plusb.rb

@@ -0,0 +1,32 @@
+#! /usr/bin/env ruby
+# coding: utf-8
+
+#Assumed y = a[0] + a[1]/x^{3/2}
+#
+#NOTE: @coefficients[0] might become negative value.
+# Need discussion for dealing?
+class Malge::ErrorFittedFunction::AXInv32PlusB < Malge::ErrorFittedFunction
+
+  def fit
+    inv32_pairs =
+      @diff_abs_pairs.map {|pair| [1.0/(pair[0] ** (3.0/2.0)), pair[1]]}
+    @coefficients = Malge::LeastSquare.least_square_1st_degree(inv32_pairs)
+  end
+
+  def expected_error(x)
+    @coefficients[0] + @coefficients[1] * (1.0/(x** (3.0/2.0)))
+  end
+
+  #        y = a[0] + a[1]/x
+  # y - a[0] = a[1]/x
+  #        x = a[1] / (y - a[0])
+  def x(y)
+    return (@coefficients[1] / (y - @coefficients[0])) ** (2.0/3.0)
+  end
+
+  def finest_y
+    @raw_pairs.max_by { |pair| pair[0] }[1]
+  end
+
+end
+

data/lib/malge/errorfittedfunction/axinvplusb.rb

@@ -0,0 +1,32 @@
+#! /usr/bin/env ruby
+# coding: utf-8
+
+#Assumed y = a[0] + a[1]/x
+#
+#NOTE: @coefficients[0] might become negative value.
+# Need discussion for dealing?
+class Malge::ErrorFittedFunction::AXInvPlusB < Malge::ErrorFittedFunction
+
+  def fit
+    inv_pairs =  @diff_abs_pairs.map {|pair| [1.0/pair[0], pair[1]]}
+    @coefficients = Malge::LeastSquare.least_square_1st_degree(inv_pairs)
+  end
+
+  def expected_error(x)
+    #@coefficients[0] + @coefficients[1] * x
+    @coefficients[0] + @coefficients[1] * (1.0/x)
+  end
+
+  #        y = a[0] + a[1]/x
+  # y - a[0] = a[1]/x
+  #        x = a[1] / (y - a[0])
+  def x(y)
+    return @coefficients[1] / (y - @coefficients[0])
+  end
+
+  def finest_y
+    @raw_pairs.max_by { |pair| pair[0] }[1]
+  end
+
+end
+

data/lib/malge/leastsquare.rb

@@ -51,7 +51,7 @@ module Malge::LeastSquare
       d += x*y
     end
     #raise  if d == 0.0
-    d/a
+    [d/a]
   end
 
   #Return variance when fitted to y = a_0 x^0 + a_1 x^1.

data/malge.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "malge"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippei94da"]
-  s.date = "2013-02-15"
+  s.date = "2013-02-16"
   s.description = "Mathematical library to deal with basic problems in algebla.\n  "
   s.email = "ippei94da@gmail.com"
   s.extra_rdoc_files = [
@@ -30,6 +30,8 @@ Gem::Specification.new do |s|
     "lib/malge/errorfittedfunction/aexpbx32.rb",
     "lib/malge/errorfittedfunction/axinv.rb",
     "lib/malge/errorfittedfunction/axinv32.rb",
+    "lib/malge/errorfittedfunction/axinv32plusb.rb",
+    "lib/malge/errorfittedfunction/axinvplusb.rb",
     "lib/malge/leastsquare.rb",
     "lib/malge/matrix.rb",
     "lib/malge/simultaneousequations.rb",
@@ -41,6 +43,8 @@ Gem::Specification.new do |s|
     "test/test_errorfittedfunction_aexpbx32.rb",
     "test/test_errorfittedfunction_axinv.rb",
     "test/test_errorfittedfunction_axinv32.rb",
+    "test/test_errorfittedfunction_axinv32plusb.rb",
+    "test/test_errorfittedfunction_axinvplusb.rb",
     "test/test_leastsquare.rb",
     "test/test_simultaneousequations.rb"
   ]

data/test/test_errorfittedfunction_axinv.rb

@@ -5,18 +5,9 @@ require "test/unit"
 require "malge.rb"
 require "malge/errorfittedfunction.rb"
 
-#class Malge::ErrorFittedFunction::AXInv
-#  public :fit
-#end
-
 class TC_ErrorFittedFunction_AXInv < Test::Unit::TestCase
   def setup
     @axi01 = Malge::ErrorFittedFunction::AXInv.new(
-      #2x+1 = 1, -1 
-      #2x+1 = 3, +2 
-      #2x+1 = 5, -1 
-      #[0.0, 1.0, 2.0],
-      #[0.0, 5.0, 4.0]
       [
         [1.0, 8.0],
         [2.0, 6.0],
@@ -29,8 +20,9 @@ class TC_ErrorFittedFunction_AXInv < Test::Unit::TestCase
   #def test_initialize
   #end
 
-  #def test_fit
-  #end
+  def test_fit
+    assert_equal([4.0], @axi01.coefficients)
+  end
 
   def test_expected_error
     assert_equal(4.0, @axi01.expected_error(1.0))
@@ -40,7 +32,7 @@ class TC_ErrorFittedFunction_AXInv < Test::Unit::TestCase
   end
 
   def test_finest_y
-    assert_equal(4.0, @axi01.finest_y)
+    assert_equal( 4.0, @axi01.finest_y)
   end
 
   def test_variance

data/test/test_errorfittedfunction_axinv32.rb

@@ -5,10 +5,6 @@ require "test/unit"
 require "malge.rb"
 #require "malge/errorfittedfunction.rb"
 
-#class Malge::ErrorFittedFunction::AXInv32
-#  public :fit
-#end
-
 class TC_ErrorFittedFunction_AXInv32 < Test::Unit::TestCase
   TOLERANCE = 1.0E-10
 
@@ -37,10 +33,10 @@ class TC_ErrorFittedFunction_AXInv32 < Test::Unit::TestCase
   #end
 
   def test_fit
-    corrects = [0.0, 64.0]
+    corrects = [64.0]
     results = @axi00.coefficients
+    assert_equal(1, results.size)
     assert_in_delta(corrects[0], results[0], TOLERANCE)
-    assert_in_delta(corrects[1], results[1], TOLERANCE)
   end
 
   def test_expected_error

data/test/test_errorfittedfunction_axinv32plusb.rb

@@ -0,0 +1,67 @@
+#! /usr/bin/env ruby
+# coding: utf-8
+
+require "test/unit"
+require "malge.rb"
+#require "malge/errorfittedfunction.rb"
+
+class TC_ErrorFittedFunction_AXInv32PlusB < Test::Unit::TestCase
+  TOLERANCE = 1.0E-10
+
+  def setup
+    @axi00 = Malge::ErrorFittedFunction::AXInv32PlusB.new(
+      [
+        [ 1, 164.0],
+        [ 4, 108.0],
+        [16, 101.0],
+        [64, 100.0],
+      ]
+    )
+
+    @axi01 = Malge::ErrorFittedFunction::AXInv32PlusB.new(
+      [
+        [ 1, 164.0],
+        [ 4,  92.0],
+        [16, 101.0],
+        [64, 100.0],
+      ]
+    )
+
+  end
+
+  #def test_initialize
+  #end
+
+  def test_fit
+    corrects = [0.0, 64.0]
+    results = @axi00.coefficients
+    assert_in_delta(corrects[0], results[0], TOLERANCE)
+    assert_in_delta(corrects[1], results[1], TOLERANCE)
+  end
+
+  def test_expected_error
+    assert_equal(64.0, @axi00.expected_error(1.0))
+    assert_equal( 8.0, @axi00.expected_error(4.0))
+    assert_equal( 1.0, @axi00.expected_error(16.0))
+
+    assert_equal(64.0, @axi01.expected_error(1.0))
+    assert_equal( 8.0, @axi01.expected_error(4.0))
+    assert_equal( 1.0, @axi01.expected_error(16.0))
+  end
+
+  def test_finest_y
+    assert_equal(100.0, @axi00.finest_y)
+    assert_equal(100.0, @axi01.finest_y)
+  end
+
+  def test_variance
+    assert_equal( 0.0, @axi00.variance)
+    assert_equal( 0.0, @axi01.variance)
+  end
+
+  def test_x
+    assert_in_delta(16.0, @axi00.x(1.0), TOLERANCE)
+  end
+
+end
+

data/test/test_errorfittedfunction_axinvplusb.rb

@@ -0,0 +1,50 @@
+#! /usr/bin/env ruby
+# coding: utf-8
+
+require "test/unit"
+require "malge.rb"
+require "malge/errorfittedfunction.rb"
+
+class TC_ErrorFittedFunction_AXInvPlusB < Test::Unit::TestCase
+  def setup
+    @axi01 = Malge::ErrorFittedFunction::AXInvPlusB.new(
+      [
+        [1.0, 8.0],
+        [2.0, 6.0],
+        [4.0, 5.0],
+        [8.0, 3.0],
+      ]
+    )
+  end
+
+  #def test_initialize
+  #end
+
+  def test_fit
+    assert_equal(1.0, @axi01.coefficients[0])
+    assert_equal(4.0, @axi01.coefficients[1])
+  end
+
+  def test_expected_error
+    assert_equal(5.0, @axi01.expected_error(1.0))
+    assert_equal(3.0, @axi01.expected_error(2.0))
+    assert_equal(2.0, @axi01.expected_error(4.0))
+    assert_equal(1.5, @axi01.expected_error(8.0))
+  end
+
+  def test_finest_y
+    assert_equal(3.0, @axi01.finest_y)
+  end
+
+  def test_variance
+    assert_equal( 0.0, @axi01.variance)
+    #diff_abs = [4,1]
+    #expected = [1,3]
+  end
+
+  def test_x
+    assert_equal(4.0, @axi01.x(2.0))
+  end
+
+end
+

data/test/test_leastsquare.rb

@@ -62,8 +62,9 @@ class TC_Malge < Test::Unit::TestCase
       [  1.000,  -2.000],
       [  1.000,  -1.000],
     ]
-    result = Malge::LeastSquare.least_square_proportional(data_pairs)
-    assert_in_delta(-1.5, result, TOLERANCE)
+    results = Malge::LeastSquare.least_square_proportional(data_pairs)
+    assert_equal(1, results.size)
+    assert_in_delta(-1.5, results[0], TOLERANCE)
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: malge
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -112,6 +112,8 @@ files:
 - lib/malge/errorfittedfunction/aexpbx32.rb
 - lib/malge/errorfittedfunction/axinv.rb
 - lib/malge/errorfittedfunction/axinv32.rb
+- lib/malge/errorfittedfunction/axinv32plusb.rb
+- lib/malge/errorfittedfunction/axinvplusb.rb
 - lib/malge/leastsquare.rb
 - lib/malge/matrix.rb
 - lib/malge/simultaneousequations.rb
@@ -123,6 +125,8 @@ files:
 - test/test_errorfittedfunction_aexpbx32.rb
 - test/test_errorfittedfunction_axinv.rb
 - test/test_errorfittedfunction_axinv32.rb
+- test/test_errorfittedfunction_axinv32plusb.rb
+- test/test_errorfittedfunction_axinvplusb.rb
 - test/test_leastsquare.rb
 - test/test_simultaneousequations.rb
 homepage: http://github.com/ippei94da/malge
@@ -140,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -274079459
+      hash: 684098349
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: