malge 0.0.1 → 0.0.2

data/CHANGES

@@ -0,0 +1,9 @@
+= vasputils changelog
+
+== Master (for 0.0.3)
+
+== 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
+
+== Version 0.0.1

data/Gemfile

@@ -7,7 +7,8 @@ source "http://rubygems.org"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.1.3"
+  gem "bundler", "~> 1.2.2"
   gem "jeweler", "~> 1.8.3"
   gem "simplecov", ">= 0"
+  gem "psych", ">= 0"
 end

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/malge.rb

@@ -1,2 +1,6 @@
-require "malge/simultaneousequations.rb"
+class Malge; end
 
+require "malge/simultaneousequations.rb"
+require "malge/leastsquare.rb"
+require "malge/matrix.rb"
+require "malge/vector.rb"

data/lib/malge/leastsquare.rb

@@ -0,0 +1,38 @@
+#! /usr/bin/env ruby
+# 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.
+  def self.least_square_1st_degree(data_pairs)
+    #pp data_pairs
+    a = 0.0 #x^2
+    #b = 0.0 #y^2
+    c = 0.0 #x^1
+    d = 0.0 #x*y
+    e = 0.0 #y^1
+    n = data_pairs.size
+    data_pairs.each do |pairs|
+      x = pairs[0].to_f
+      y = pairs[1].to_f
+      a += x**2
+      #b += y**2
+      c += x
+      d += x*y
+      e += y
+    end
+    a_1 = (n*d - c*e) / (n*a - c**2)
+    a_0 = (a*e - c*d) / (n*a - c**2)
+    [a_0, a_1]
+  end
+end
+

data/lib/malge/matrix.rb

@@ -0,0 +1,9 @@
+require "matrix"
+require "malge.rb"
+
+class Malge::Matrix < Matrix
+  def []=(i,j,x)
+    @rows[i][j]=x
+  end
+end
+

data/lib/malge/simultaneousequations.rb

@@ -1,62 +1,51 @@
-require 'matrix'
+require "malge.rb"
 
 # Solve simultatneous equations with Cramer\'s formula.
 #
 # if you need to solve simultaneous equations,
-# 	(a_11 ... a_1n) (x_1)   (c_1)
-# 	(.... ... ....) (...) = (...)
-# 	(a_n1 ... a_nn) (x_n)   (c_n)
+#   (a_11 ... a_1n) (x_1)   (c_1)
+#   (.... ... ....) (...) = (...)
+#   (a_n1 ... a_nn) (x_n)   (c_n)
 # command
 # % #{$0} a_11 ... a_1n ... a_n1 ... a_nn c_1 ... c_n
 # 
 
-class Matrix
-	def []=(i,j,x)
-		@rows[i][j]=x
-	end
-end
-
-class Vector
-	def []=(i,x)
-		@elements[i]=x
-	end
-end
-
 # 連立1次方程式を表現するクラス。
-class SimultaneousEquations
-	
-	# Solve equation by Cramer's.
-	# matrix は2重配列で与える。
-	# 返されるのは、解の値を格納した配列。
-	def self.cramer( matrix, values )
-		matrix = Matrix.rows( matrix )
-		raise "Matrix is not squre: #{matrix.row_size} x #{matrix.column_size}." if ( ! matrix.square? )
-		raise "Matrix size (#{matrix.row_size}) and values size (#{values.size}) mismatched." if ( matrix.row_size != values.size )
-		raise "Matrix is not regular. Degree of freedom is #{matrix.column_size - matrix.rank}.\n" if ( ! matrix.regular? )
-
-		results = Array.new
-		n = matrix.column_size
-		n.times do |i|
-			tmp = Marshal.load( Marshal.dump( matrix ) )
-			n.times do |j|
-				tmp[ j, i ] = values[ j ]
-			end
-			results[i] = tmp.determinant / ( matrix.determinant )
-		end
-		results
-	end
-
-	# matrix は左辺の行列、values は右辺の値の配列
-	# ともに配列で与える。
-	def initialize( matrix, values )
-		@matrix = matrix
-		@values = values
-	end
-
-	# Cramer's formula で解く。
-	def cramer
-		SimultaneousEquations.cramer( @matrix, @values )
-	end
+class Malge::SimultaneousEquations
+  
+  # Solve equation by Cramer's.
+  # matrix は2重配列で与える。
+  # 返されるのは、解の値を格納した配列。
+  def self.cramer( matrix, values )
+    matrix = Malge::Matrix.rows( matrix )
+    raise "Matrix is not squre: #{matrix.row_size} x #{matrix.column_size}." if ( ! matrix.square? )
+    raise "Matrix size (#{matrix.row_size}) and values size (#{values.size}) mismatched." if ( matrix.row_size != values.size )
+    raise "Matrix is not regular. Degree of freedom is #{matrix.column_size - matrix.rank}.\n" if ( ! matrix.regular? )
+
+    results = Array.new
+    n = matrix.column_size
+    n.times do |i|
+      tmp = Marshal.load( Marshal.dump( matrix ) )
+      #pp tmp
+      n.times do |j|
+        tmp[ j, i ] = values[ j ]
+      end
+      results[i] = tmp.determinant / ( matrix.determinant )
+    end
+    results
+  end
+
+  # matrix は左辺の行列、values は右辺の値の配列
+  # ともに配列で与える。
+  def initialize( matrix, values )
+    @matrix = matrix
+    @values = values
+  end
+
+  # Cramer's formula で解く。
+  def cramer
+    Malge::SimultaneousEquations.cramer( @matrix, @values )
+  end
 
 end
 

data/lib/malge/vector.rb

@@ -0,0 +1,7 @@
+require "malge.rb"
+
+class Malge::Vector
+  def []=(i,x)
+    @elements[i]=x
+  end
+end

data/malge.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "malge"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippei94da"]
-  s.date = "2012-04-04"
+  s.date = "2013-02-02"
   s.description = "Mathematical library to deal with basic problems in algebla.\n  "
   s.email = "ippei94da@gmail.com"
   s.extra_rdoc_files = [
@@ -18,21 +18,26 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    "CHANGES",
     "Gemfile",
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
     "VERSION",
     "lib/malge.rb",
+    "lib/malge/leastsquare.rb",
+    "lib/malge/matrix.rb",
     "lib/malge/simultaneousequations.rb",
+    "lib/malge/vector.rb",
     "malge.gemspec",
     "test/helper.rb",
+    "test/test_leastsquare.rb",
     "test/test_simultaneousequations.rb"
   ]
   s.homepage = "http://github.com/ippei94da/malge"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.21"
+  s.rubygems_version = "1.8.11"
   s.summary = "Math ALGEbra library."
 
   if s.respond_to? :specification_version then
@@ -40,20 +45,23 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.1.3"])
+      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.1.3"])
+      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.1.3"])
+    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

@@ -0,0 +1,49 @@
+#! /usr/bin/env ruby
+# coding: utf-8
+
+require "test/unit"
+require "malge.rb"
+
+TOLERANCE=1.0e-10
+
+class TC_Malge < Test::Unit::TestCase
+  #def setup
+  #  @k = Malge.new
+  #end
+
+  def test_least_square_1st_degree
+    data_pairs =
+    [
+      [-10.000, -12.067],
+      [ -9.000, -11.490],
+      [ -8.000, -10.034],
+      [ -7.000,  -9.196],
+      [ -6.000,  -7.571],
+      [ -5.000,  -6.606],
+      [ -4.000,  -6.299],
+      [ -3.000,  -5.004],
+      [ -2.000,  -3.858],
+      [ -1.000,  -3.497],
+      [  0.000,  -2.484],
+      [  1.000,  -1.079],
+      [  2.000,  -0.425],
+      [  3.000,   0.915],
+      [  4.000,   2.031],
+      [  5.000,   3.438],
+      [  6.000,   4.012],
+      [  7.000,   5.258],
+      [  8.000,   5.695],
+      [  9.000,   6.645],
+      [ 10.000,   7.962],
+    ]
+    #should be below, confirmed by Excel
+    a0 = -2.0787619047619
+    a1 =  1.00077142857143
+
+    results=Malge::LeastSquare.least_square_1st_degree(data_pairs)
+    assert_equal(2, results.size)
+    assert_in_delta(a0, results[0], TOLERANCE)
+    assert_in_delta(a1, results[1], TOLERANCE)
+  end
+end
+

data/test/test_simultaneousequations.rb

@@ -1,103 +1,104 @@
 #! /usr/bin/ruby
 
-require 'helper'
-require 'test/unit'
-require 'malge/simultaneousequations.rb'
+require "helper"
+require "test/unit"
+require "malge.rb"
+#require "malge/simultaneousequations.rb"
 
 class TC_SimultaneousEquations < Test::Unit::TestCase
-	$tolerance = 10.0**(-10)
-	def setup
-		@se00 = SimultaneousEquations.new(
-			[ [ 1.0,  2.0, -3.0 ],
-				[ 2.0,  1.0, -2.0 ],
-				[ 3.0,  2.0,  1.0 ] ],
-			[ 1.0, 2.0, -1.0]
-		)
+  $tolerance = 10.0**(-10)
+  def setup
+    @se00 = Malge::SimultaneousEquations.new(
+      [ [ 1.0,  2.0, -3.0 ],
+        [ 2.0,  1.0, -2.0 ],
+        [ 3.0,  2.0,  1.0 ] ],
+      [ 1.0, 2.0, -1.0]
+    )
 
-		@se01 = SimultaneousEquations.new(
-			[ [ 1.0,  1.0,  1.0 ],
-				[ 0.0,  1.0,  1.0 ],
-				[ 0.0,  0.0,  1.0 ] ],
-			[ 3.0, 2.0, 1.0]
-		)
+    @se01 = Malge::SimultaneousEquations.new(
+      [ [ 1.0,  1.0,  1.0 ],
+        [ 0.0,  1.0,  1.0 ],
+        [ 0.0,  0.0,  1.0 ] ],
+      [ 3.0, 2.0, 1.0]
+    )
 
-		#実数の行列を前提としても良さそうだ。
-		#@se02 = SimultaneousEquations.new(
-		#	[ [ 1,  2, -3 ],
-		#		[ 2,  1, -2 ],
-		#		[ 3,  2,  1 ] ],
-		#	[ 1, 2, -1]
-		#)
+    #実数の行列を前提としても良さそうだ。
+    #@se02 = Malge::SimultaneousEquations.new(
+    # [ [ 1,  2, -3 ],
+    #   [ 2,  1, -2 ],
+    #   [ 3,  2,  1 ] ],
+    # [ 1, 2, -1]
+    #)
 
-		@se03 = SimultaneousEquations.new(
-			[ [ 1,  1,  1 ],
-				[ 0,  1,  1 ],
-				[ 0,  0,  1 ] ],
-			[ 3, 2, 1]
-		)
-	end
+    @se03 = Malge::SimultaneousEquations.new(
+      [ [ 1,  1,  1 ],
+        [ 0,  1,  1 ],
+        [ 0,  0,  1 ] ],
+      [ 3, 2, 1]
+    )
+  end
 
-	def test_self_cramer
-		t = SimultaneousEquations.cramer(
-			[ [ 1.0,  2.0, -3.0 ],
-				[ 2.0,  1.0, -2.0 ],
-				[ 3.0,  2.0,  1.0 ] ],
-			[ 1.0, 2.0, -1.0]
-		)
-		assert_in_delta(  0.714285714285714, t[0], $tolerance )
-		assert_in_delta( -1.142857142857143, t[1], $tolerance )
-		assert_in_delta( -0.857142857142857, t[2], $tolerance )
+  def test_self_cramer
+    t = Malge::SimultaneousEquations.cramer(
+      [ [ 1.0,  2.0, -3.0 ],
+        [ 2.0,  1.0, -2.0 ],
+        [ 3.0,  2.0,  1.0 ] ],
+      [ 1.0, 2.0, -1.0]
+    )
+    assert_in_delta(  0.714285714285714, t[0], $tolerance )
+    assert_in_delta( -1.142857142857143, t[1], $tolerance )
+    assert_in_delta( -0.857142857142857, t[2], $tolerance )
 
-		t = SimultaneousEquations.cramer(
-			[ [ 1.0,  1.0,  1.0 ],
-				[ 0.0,  1.0,  1.0 ],
-				[ 0.0,  0.0,  1.0 ] ],
-			[ 3.0, 2.0, 1.0 ]
-		)
-		assert_in_delta( 1.0, t[0], $tolerance )
-		assert_in_delta( 1.0, t[1], $tolerance )
-		assert_in_delta( 1.0, t[2], $tolerance )
-	end
+    t = Malge::SimultaneousEquations.cramer(
+      [ [ 1.0,  1.0,  1.0 ],
+        [ 0.0,  1.0,  1.0 ],
+        [ 0.0,  0.0,  1.0 ] ],
+      [ 3.0, 2.0, 1.0 ]
+    )
+    assert_in_delta( 1.0, t[0], $tolerance )
+    assert_in_delta( 1.0, t[1], $tolerance )
+    assert_in_delta( 1.0, t[2], $tolerance )
+  end
 
-	def test_cramer
-		t = @se00.cramer
-		assert_in_delta(  0.714285714285714, t[0], $tolerance )
-		assert_in_delta( -1.142857142857143, t[1], $tolerance )
-		assert_in_delta( -0.857142857142857, t[2], $tolerance )
+  def test_cramer
+    t = @se00.cramer
+    assert_in_delta(  0.714285714285714, t[0], $tolerance )
+    assert_in_delta( -1.142857142857143, t[1], $tolerance )
+    assert_in_delta( -0.857142857142857, t[2], $tolerance )
 
-		t = @se01.cramer
-		assert_in_delta( 1.0, t[0], $tolerance )
-		assert_in_delta( 1.0, t[1], $tolerance )
-		assert_in_delta( 1.0, t[2], $tolerance )
+    t = @se01.cramer
+    assert_in_delta( 1.0, t[0], $tolerance )
+    assert_in_delta( 1.0, t[1], $tolerance )
+    assert_in_delta( 1.0, t[2], $tolerance )
 
-		#t = @se02.cramer
-		#assert_in_delta(  0.714285714285714, t[0], $tolerance )
-		#assert_in_delta( -1.142857142857143, t[1], $tolerance )
-		#assert_in_delta( -0.857142857142857, t[2], $tolerance )
+    #t = @se02.cramer
+    #assert_in_delta(  0.714285714285714, t[0], $tolerance )
+    #assert_in_delta( -1.142857142857143, t[1], $tolerance )
+    #assert_in_delta( -0.857142857142857, t[2], $tolerance )
 
-		t = @se03.cramer
-		assert_in_delta( 1.0, t[0], $tolerance )
-		assert_in_delta( 1.0, t[1], $tolerance )
-		assert_in_delta( 1.0, t[2], $tolerance )
+    t = @se03.cramer
+    assert_in_delta( 1.0, t[0], $tolerance )
+    assert_in_delta( 1.0, t[1], $tolerance )
+    assert_in_delta( 1.0, t[2], $tolerance )
 
-		#assert_raise( ExceptionForMatrix ){
-		#	SimultaneousEquations.cramer(
-		#		[ [ 1.0,  2.0, -3.0 ],
-		#			[ 2.0,  1.0 ],
-		#			[ 3.0,  2.0,  1.0 ] ],
-		#		[ 1.0, 2.0, -1.0]
-		#	)
-		#}
+    #assert_raise( ExceptionForMatrix ){
+    # Malge::SimultaneousEquations.cramer(
+    #   [ [ 1.0,  2.0, -3.0 ],
+    #     [ 2.0,  1.0 ],
+    #     [ 3.0,  2.0,  1.0 ] ],
+    #   [ 1.0, 2.0, -1.0]
+    # )
+    #}
 
-		assert_raise( RuntimeError ){
-			SimultaneousEquations.cramer(
-				[ [ 1.0,  2.0, -3.0 ],
-					[ 2.0,  1.0, -2.0 ],
-					[ 3.0,  2.0,  1.0 ] ],
-				[ 1.0, 2.0]
-			)
-		}
+    assert_raise( RuntimeError ){
+      Malge::SimultaneousEquations.cramer(
+        [ [ 1.0,  2.0, -3.0 ],
+          [ 2.0,  1.0, -2.0 ],
+          [ 3.0,  2.0,  1.0 ] ],
+        [ 1.0, 2.0]
+      )
+    }
 
-	end
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: malge
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-04 00:00:00.000000000 Z
+date: 2013-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &85726200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,31 +21,21 @@ 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: *85726200
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &85725800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.2.2
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.3
+  version_requirements: *85725800
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &85725460 !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: *85725460
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &85725190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,12 +54,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  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
 description: ! "Mathematical library to deal with basic problems in algebla.\n  "
 email: ippei94da@gmail.com
 executables: []
@@ -84,15 +75,20 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .document
+- CHANGES
 - Gemfile
 - LICENSE.txt
 - README.rdoc
 - Rakefile
 - VERSION
 - lib/malge.rb
+- lib/malge/leastsquare.rb
+- lib/malge/matrix.rb
 - lib/malge/simultaneousequations.rb
+- lib/malge/vector.rb
 - malge.gemspec
 - test/helper.rb
+- test/test_leastsquare.rb
 - test/test_simultaneousequations.rb
 homepage: http://github.com/ippei94da/malge
 licenses:
@@ -109,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 834191123
+      hash: 225117071
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -118,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Math ALGEbra library.