malge 0.0.6 → 0.0.7

data/test/test_errorfittedfunction_aexpbx.rb

@@ -1,16 +1,19 @@
 #! /usr/bin/env ruby
 # coding: utf-8
 
-require "test/unit"
-require "malge.rb"
-require "malge/errorfittedfunction.rb"
+require "helper"
+#require "test/unit"
+#require "malge.rb"
+#require "malge/errorfittedfunction.rb"
 
 class Malge::ErrorFittedFunction::AExpBX
   public :fit
 end
 
 class TC_ErrorFittedFunction_AExpBX < Test::Unit::TestCase
+
   TOLERANCE = 1.0E-10
+
   def setup
     @aebx00 = Malge::ErrorFittedFunction::AExpBX.new(
       [
@@ -34,6 +37,10 @@ class TC_ErrorFittedFunction_AExpBX < Test::Unit::TestCase
   #def test_initialize
   #end
 
+  def test_equation
+    assert_equal("f(x) = 4.000000 * exp(-0.693147 * x)", @aebx00.equation)
+  end
+
   def test_fit
     corrects = [4.0, - Math::log(2.0)]
     results = @aebx00.coefficients
@@ -55,12 +62,13 @@ class TC_ErrorFittedFunction_AExpBX < Test::Unit::TestCase
     assert_in_delta(0.5, @aebx00.expected_error(3.0), TOLERANCE)
   end
 
-  def test_finest_y
-    assert_equal(100.0, @aebx00.finest_y)
+  def test_most_strict
+    assert_in_delta(  3.0, @aebx00.most_strict_pair[0])
+    assert_in_delta(100.0, @aebx00.most_strict_pair[1])
   end
 
   def test_variance
-    assert_in_delta( 0.0, @aebx00.variance, TOLERANCE)
+    assert_in_delta( 0.25, @aebx00.variance, TOLERANCE)
     #diff_abs = [4,1]
     #expected = [1,3]
   end

data/test/test_errorfittedfunction_aexpbx32.rb

@@ -1,9 +1,10 @@
 #! /usr/bin/env ruby
 # coding: utf-8
 
-require "test/unit"
-require "malge.rb"
-#require "malge/errorfittedfunction.rb"
+require "helper"
+#require "test/unit"
+#require "malge.rb"
+##require "malge/errorfittedfunction.rb"
 
 class Malge::ErrorFittedFunction::AExpBX32
   public :fit
@@ -34,6 +35,11 @@ class TC_ErrorFittedFunction_AExpBX32 < Test::Unit::TestCase
   #def test_initialize
   #end
 
+  def test_equation
+    assert_equal("f(x) = 3.000000 * exp(-1.386294 * x^{3/2})", @aebx00.equation)
+  end
+
+
   def test_fit
     corrects = [3.0, - 2.0*Math::log(2.0)]
     results = @aebx00.coefficients
@@ -51,7 +57,7 @@ class TC_ErrorFittedFunction_AExpBX32 < Test::Unit::TestCase
   def test_expected_error
     corrects =
       [
-        3.0* 2.0**(-2.0 * 0.0)    ,
+        3.0* 2.0**(-2.0 * 0.0),
         3.0* 2.0**(-2.0 * 1.0),
         3.0* 2.0**(-2.0 * (2.0**(3.0/2.0)))
       ]
@@ -61,7 +67,7 @@ class TC_ErrorFittedFunction_AExpBX32 < Test::Unit::TestCase
 
     corrects =
       [
-        3.0* 2.0**(-2.0 * 0.0)    ,
+        3.0* 2.0**(-2.0 * 0.0),
         3.0* 2.0**(-2.0 * 1.0),
         3.0* 2.0**(-2.0 * (2.0**(3.0/2.0)))
       ]
@@ -71,14 +77,15 @@ class TC_ErrorFittedFunction_AExpBX32 < Test::Unit::TestCase
 
   end
 
-  def test_finest_y
-    assert_equal(100.0, @aebx00.finest_y)
-    assert_equal(100.0, @aebx01.finest_y)
+  def test_most_strict_pair
+    assert_in_delta(  3.0, @aebx00.most_strict_pair[0])
+    assert_in_delta(100.0, @aebx00.most_strict_pair[1])
   end
 
   def test_variance
-    assert_in_delta( 0.0, @aebx00.variance, TOLERANCE)
-    assert_in_delta( 0.0, @aebx01.variance, TOLERANCE)
+    correct = ( 3.0* 2.0**(-2.0 * (3.0**(3.0/2.0))))**2.0
+    assert_in_delta(correct, @aebx00.variance, TOLERANCE)
+    assert_in_delta(correct, @aebx01.variance, TOLERANCE)
   end
 
   def test_x

data/test/test_errorfittedfunction_axinv.rb

@@ -1,48 +1,50 @@
 #! /usr/bin/env ruby
 # coding: utf-8
 
-require "test/unit"
-require "malge.rb"
-require "malge/errorfittedfunction.rb"
+require "helper"
+#require "test/unit"
+#require "malge.rb"
+#require "malge/errorfittedfunction.rb"
 
 class TC_ErrorFittedFunction_AXInv < Test::Unit::TestCase
+
+  $tolerance = 1E-10
+
   def setup
-    @axi01 = Malge::ErrorFittedFunction::AXInv.new(
+    @axi00 = Malge::ErrorFittedFunction::AXInv.new(
       [
-        [1.0, 8.0],
-        [2.0, 6.0],
-        [4.0, 5.0],
-        [8.0, 4.0],
+        [1.0, 1.0],
+        [0.5, 3.0],
       ]
     )
   end
 
-  #def test_initialize
-  #end
+  def test_equation
+    assert_equal("f(x) = 0.800000 / x", @axi00.equation)
+  end
 
   def test_fit
-    assert_equal([4.0], @axi01.coefficients)
+    assert_in_delta(0.8, @axi00.coefficients[0], $tolerance)
   end
 
   def test_expected_error
-    assert_equal(4.0, @axi01.expected_error(1.0))
-    assert_equal(2.0, @axi01.expected_error(2.0))
-    assert_equal(1.0, @axi01.expected_error(4.0))
-    assert_equal(0.5, @axi01.expected_error(8.0))
+    assert_in_delta(0.8, @axi00.expected_error(1.0), $tolerance)
+    assert_in_delta(0.4, @axi00.expected_error(2.0), $tolerance)
+
   end
 
-  def test_finest_y
-    assert_equal( 4.0, @axi01.finest_y)
+  def test_most_strict_pair
+    assert_in_delta(  1.0, @axi00.most_strict_pair[0])
+    assert_in_delta(  1.0, @axi00.most_strict_pair[1])
   end
 
+
   def test_variance
-    assert_equal( 0.0, @axi01.variance)
-    #diff_abs = [4,1]
-    #expected = [1,3]
+    assert_equal( 0.8, @axi00.variance)
   end
 
   def test_x
-    assert_equal(2.0, @axi01.x(2.0))
+    assert_in_delta(1.0, @axi00.x(0.8), $tolerance)
   end
 
 end

data/test/test_errorfittedfunction_axinv2.rb

@@ -0,0 +1,97 @@
+#! /usr/bin/env ruby
+# coding: utf-8
+
+require "helper"
+#require "test/unit"
+#require "malge.rb"
+
+class TC_ErrorFittedFunction_AXInv2 < Test::Unit::TestCase
+
+  $tolerance = 1E-10
+
+  def setup
+    @axi200 = Malge::ErrorFittedFunction::AXInv2.new(
+      [
+        [1.0,   1.0],
+        [2.0**(-1.0/2.0), 3.0],
+      ]
+    )
+  end
+
+  def test_equation
+    assert_equal("f(x) = 0.800000 / (x^2)", @axi200.equation)
+  end
+
+  def test_fit
+    assert_in_delta(0.8, @axi200.coefficients[0], $tolerance)
+  end
+
+  def test_expected_error
+    assert_in_delta(0.8, @axi200.expected_error(1.0), $tolerance)
+    assert_in_delta(1.6, @axi200.expected_error(2.0**(-1.0/2.0)), $tolerance)
+  end
+
+  def test_most_strict_pair
+    assert_in_delta(  1.0, @axi200.most_strict_pair[0])
+    assert_in_delta(  1.0, @axi200.most_strict_pair[1])
+  end
+
+
+  def test_variance
+    assert_in_delta( 0.8, @axi200.variance, $tolerance)
+  end
+
+  def test_x
+    assert_in_delta(1.0, @axi200.x(0.8), $tolerance)
+  end
+
+
+  #def setup
+  #  @axi201 = Malge::ErrorFittedFunction::AXInv2.new(
+  #    [
+  #      [1.0, 20.0],
+  #      [2.0,  8.0],
+  #      [4.0,  5.0],
+  #      [8.0,  4.0],
+  #    ]
+  #  )
+  #end
+
+  ##def test_initialize
+  ##end
+
+  #def test_equation
+  #  assert_equal("f(x) = 16.000000 / (x^2)", @axi201.equation)
+  #end
+
+  #def test_fit
+  #  assert_equal([16.0], @axi201.coefficients)
+  #end
+
+  #def test_expected_error
+  #  assert_equal(16.0 , @axi201.expected_error(1.0))
+  #  assert_equal( 4.0 , @axi201.expected_error(2.0))
+  #  assert_equal( 1.0 , @axi201.expected_error(4.0))
+  #  assert_equal( 0.25, @axi201.expected_error(8.0))
+  #end
+
+  #def test_most_strict_y
+  #  assert_equal( 4.0, @axi201.most_strict_y)
+  #end
+
+  #def test_most_strict_x
+  #  assert_equal(8.0, @axi201.most_strict_x)
+  #end
+
+  #def test_variance
+  #  assert_equal( 0.0, @axi201.variance)
+  #  #diff_abs = [4,1]
+  #  #expected = [1,3]
+  #end
+
+  #def test_x
+  #  assert_equal(2.0, @axi201.x(4.0))
+  #end
+
+end
+

data/test/test_errorfittedfunction_axinv3.rb

@@ -0,0 +1,95 @@
+#! /usr/bin/env ruby
+# coding: utf-8
+
+require "helper"
+#require "test/unit"
+#require "malge.rb"
+
+class TC_ErrorFittedFunction_AXInv3 < Test::Unit::TestCase
+  $tolerance = 1E-10
+
+  def setup
+    @axi300 = Malge::ErrorFittedFunction::AXInv3.new(
+      [
+        [1.0,   1.0],
+        [2.0**(-1.0/3.0), 3.0],
+      ]
+    )
+  end
+
+  def test_equation
+    assert_equal("f(x) = 0.800000 / (x^3)", @axi300.equation)
+  end
+
+  def test_fit
+    assert_in_delta(0.8, @axi300.coefficients[0], $tolerance)
+  end
+
+  def test_expected_error
+    assert_in_delta(0.8, @axi300.expected_error(1.0), $tolerance)
+    assert_in_delta(1.6, @axi300.expected_error(2.0**(-1.0/3.0)), $tolerance)
+  end
+
+  def test_most_strict_pair
+    assert_in_delta(  1.0, @axi300.most_strict_pair[0])
+    assert_in_delta(  1.0, @axi300.most_strict_pair[1])
+  end
+
+
+  def test_variance
+    assert_in_delta( 0.8, @axi300.variance, $tolerance)
+  end
+
+  def test_x
+    assert_in_delta(1.0, @axi300.x(0.8), $tolerance)
+  end
+
+  #def setup
+  #  @axi301 = Malge::ErrorFittedFunction::AXInv3.new(
+  #    [
+  #      [1.0, 68.0],
+  #      [2.0, 12.0],
+  #      [4.0,  5.0],
+  #      [8.0,  4.0],
+  #    ]
+  #  )
+  #end
+
+  ##def test_initialize
+  ##end
+
+  #def test_equation
+  #  assert_equal("f(x) = 64.000000 / (x^3)", @axi301.equation)
+  #end
+
+  #def test_fit
+  #  assert_equal([64.0], @axi301.coefficients)
+  #end
+
+  #def test_expected_error
+  #  assert_equal(64.0  , @axi301.expected_error(1.0))
+  #  assert_equal( 8.0  , @axi301.expected_error(2.0))
+  #  assert_equal( 1.0  , @axi301.expected_error(4.0))
+  #  assert_equal( 0.125, @axi301.expected_error(8.0))
+  #end
+
+  #def test_most_strict_y
+  #  assert_equal( 4.0, @axi301.most_strict_y)
+  #end
+
+  #def test_most_strict_x
+  #  assert_equal(8.0, @axi301.most_strict_x)
+  #end
+
+  #def test_variance
+  #  assert_equal( 0.0, @axi301.variance)
+  #  #diff_abs = [4,1]
+  #  #expected = [1,3]
+  #end
+
+  #def test_x
+  #  assert_equal(2.0, @axi301.x(8.0))
+  #end
+
+end
+

data/test/test_errorfittedfunction_axinv32.rb

@@ -1,67 +1,48 @@
 #! /usr/bin/env ruby
 # coding: utf-8
 
-require "test/unit"
-require "malge.rb"
-#require "malge/errorfittedfunction.rb"
+require "helper"
+#require "test/unit"
+#require "malge.rb"
+##require "malge/errorfittedfunction.rb"
 
 class TC_ErrorFittedFunction_AXInv32 < Test::Unit::TestCase
-  TOLERANCE = 1.0E-10
+  $tolerance = 1E-10
 
   def setup
-    @axi00 = Malge::ErrorFittedFunction::AXInv32.new(
+    @axi3200 = Malge::ErrorFittedFunction::AXInv32.new(
       [
-        [ 1, 164.0],
-        [ 4, 108.0],
-        [16, 101.0],
-        [64, 100.0],
+        [1.0, 1.0],
+        [2.0, 3.0],
       ]
     )
-
-    @axi01 = Malge::ErrorFittedFunction::AXInv32.new(
-      [
-        [ 1, 164.0],
-        [ 4,  92.0],
-        [16, 101.0],
-        [64, 100.0],
-      ]
-    )
-
   end
 
-  #def test_initialize
-  #end
+  def test_equation
+    assert_equal("f(x) = 1.777778 / (x^{3/2})", @axi3200.equation)
+  end
 
   def test_fit
-    corrects = [64.0]
-    results = @axi00.coefficients
-    assert_equal(1, results.size)
-    assert_in_delta(corrects[0], results[0], TOLERANCE)
+    assert_in_delta(16.0/9.0, @axi3200.coefficients[0], $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_in_delta(16.0/9.0, @axi3200.expected_error(1.0), $tolerance)
+    assert_in_delta(16.0/9.0 * 2.0**(-3.0/2.0), @axi3200.expected_error(2.0), $tolerance)
 
-    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)
+  def test_most_strict_pair
+    assert_in_delta(  2.0, @axi3200.most_strict_pair[0])
+    assert_in_delta(  3.0, @axi3200.most_strict_pair[1])
   end
 
   def test_variance
-    assert_equal( 0.0, @axi00.variance)
-    assert_equal( 0.0, @axi01.variance)
+    assert_equal(36.0/81.0, @axi3200.variance)
   end
 
   def test_x
-    assert_in_delta(16.0, @axi00.x(1.0), TOLERANCE)
+    assert_in_delta(1.0, @axi3200.x(16.0/9.0), $tolerance)
   end
-
 end