malge 0.0.6 → 0.0.7

data/test/test_leastsquare.rb

@@ -1,8 +1,9 @@
 #! /usr/bin/env ruby
 #coding: utf-8
 
-require "test/unit"
-require "malge.rb"
+require "helper"
+#require "test/unit"
+#require "malge.rb"
 
 TOLERANCE=1.0e-10
 
@@ -65,6 +66,16 @@ class TC_Malge < Test::Unit::TestCase
     results = Malge::LeastSquare.least_square_proportional(data_pairs)
     assert_equal(1, results.size)
     assert_in_delta(-1.5, results[0], TOLERANCE)
+
+    data_pairs =
+    [
+      [  1.000,  0.000],
+      [  2.000,  2.000],
+    ]
+    results = Malge::LeastSquare.least_square_proportional(data_pairs)
+    assert_equal(1, results.size)
+    assert_in_delta(0.8, results[0], TOLERANCE)
+
   end
 
 

data/test/test_simultaneousequations.rb

@@ -1,9 +1,9 @@
 #! /usr/bin/ruby
 
 require "helper"
-require "test/unit"
-require "malge.rb"
-#require "malge/simultaneousequations.rb"
+#require "test/unit"
+#require "malge.rb"
+##require "malge/simultaneousequations.rb"
 
 class TC_SimultaneousEquations < Test::Unit::TestCase
   $tolerance = 10.0**(-10)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: malge
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-16 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &84583970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.12'
+  version_requirements: *84583970
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &84583690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,15 +32,10 @@ dependencies:
         version: 1.2.2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.2
+  version_requirements: *84583690
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &84583420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.3
+  version_requirements: *84583420
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &84583130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,28 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: psych
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *84583130
 description: ! "Mathematical library to deal with basic problems in algebla.\n  "
 email: ippei94da@gmail.com
 executables: []
@@ -111,9 +75,9 @@ files:
 - lib/malge/errorfittedfunction/aexpbx.rb
 - lib/malge/errorfittedfunction/aexpbx32.rb
 - lib/malge/errorfittedfunction/axinv.rb
+- lib/malge/errorfittedfunction/axinv2.rb
+- lib/malge/errorfittedfunction/axinv3.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
@@ -124,9 +88,9 @@ files:
 - test/test_errorfittedfunction_aexpbx.rb
 - test/test_errorfittedfunction_aexpbx32.rb
 - test/test_errorfittedfunction_axinv.rb
+- test/test_errorfittedfunction_axinv2.rb
+- test/test_errorfittedfunction_axinv3.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
@@ -144,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 684098349
+      hash: 511935667
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -153,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Math ALGEbra library.

data/lib/malge/errorfittedfunction/axinv32plusb.rb

@@ -1,32 +0,0 @@
-#! /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

@@ -1,32 +0,0 @@
-#! /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/test/test_errorfittedfunction_axinv32plusb.rb

@@ -1,67 +0,0 @@
-#! /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

@@ -1,50 +0,0 @@
-#! /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
-