mathpack 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2feda03bce968d1a492dd5c6cfa99bfe1d8796c
-  data.tar.gz: 6b4908827c465f97ca042c266a393e8fb572ee94
+  metadata.gz: 8c14dffa0f11862781796118a019139c018cb2eb
+  data.tar.gz: b2be5e7d8b8bfdac4d40003a72109b6b0b9ea366
 SHA512:
-  metadata.gz: e013b0cb1cb1339ca1b2572593b8d77dea7d4b11f678675a199125595b682f559a651d3d1ab807bb346e42084997b234bb1f969f503434be0ec5f69073adf6aa
-  data.tar.gz: 56d13a5f3c6fea715fa823e21197ef368d4591f5d3b83c250d56174d122d762a1cf81e1446788a9d2a7e054f1e5cc21d300555844d54c265ea506de758e10055
+  metadata.gz: a4dcfdfcd380f2f3e23587210cfb594e533c0cc341b6a5862ec4e7891b8d72d72c8e6f09f7c7156f03bf74d87c204ee54f4baa16f76895ac55e3b62a5e964d01
+  data.tar.gz: edd6fce95f19953b01d6fc92a89b645fa52a855579c4136306e8b2e7ba33480a622d6b07abf3bb92f6772c5287f9e8d86a30ee6e0aebd8d1363f4fb4611ca7fe

data/.gitignore

@@ -20,3 +20,4 @@ tmp
 *.o
 *.a
 mkmf.log
+.rubocop.yml

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 2.0.0
   - 2.1.2
   - 2.1.3
+  - 2.2.0
 script: "bundle exec rspec"
 notifications:
   email: false

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-gem "rspec", :group => :test
+gem 'rspec', group: :test
 gemspec

data/README.md

@@ -18,8 +18,8 @@ Or install it yourself as:
 
     $ gem install mathpack
 ## Information
-Gem `mathpack` allows to count statistical functions through `Statistics` class, solving nonlinear equations through `Equation` module
-`solve` method
+Gem `mathpack` allows to count statistical functions through `Statistics` class, solve nonlinear equations through `Equation` module
+`solve` method, solve systems of linear equations through `SLE` module `solve` method.
 ## Statistics
 `Statistics` class have following methods
 - **number** - returns a number of elements in series
@@ -62,11 +62,10 @@ stat.print_empirical_pdf_to_csv('pdf.csv') #=> nil
 Now you have no problems solving **nonlinear equations**. If you want, for example, to solve equation ![equation](http://latex.codecogs.com/gif.latex?x%5E%7B2%7D%20%3D%20%5Csin%28%7Bx+1%7D%29)
 
 You need to complete the following steps:
-1. Equation should look like 
-![equation](http://latex.codecogs.com/gif.latex?%5Ctiny%20f%28x%29%20%3D%200)
-2. For our equation ![equation](http://latex.codecogs.com/gif.latex?%5Csmall%20f%28x%29%20%3D%20x%5E%7B2%7D%20-%20%5Csin%28x+1%29)
-3. Choose the calculations accurracy. For example ![equation](http://latex.codecogs.com/gif.latex?%5Csmall%200.00001)
-4. Choose some point near the expected root of equation. For example ![equation](http://latex.codecogs.com/gif.latex?%5Csmall%200)
+- Equation should look like ![equation](http://latex.codecogs.com/gif.latex?%5Ctiny%20f%28x%29%20%3D%200)
+- For our equation ![equation](http://latex.codecogs.com/gif.latex?%5Csmall%20f%28x%29%20%3D%20x%5E%7B2%7D%20-%20%5Csin%28x+1%29)
+- Choose the calculations accurracy. For example ![equation](http://latex.codecogs.com/gif.latex?%5Csmall%200.00001)
+- Choose some point near the expected root of equation. For example ![equation](http://latex.codecogs.com/gif.latex?%5Csmall%200)
 
 Then to solve equation you should call 
 ```ruby
@@ -80,6 +79,31 @@ Mathpack::Equation.solve(start: 0.01, eps: 0.00001){|x| x**2 - 2*x + 1})
 Mathpack::Equation.solve(start: 0.01, eps: 0.00001){|x| Math.exp(x-2) - Math.sin(x)})
 ```
 
+## SLE
+`SLE` module has only one method
+- **solve** - method, which allows to solve *system of linear equations*. Neccessary params are `matrix` representing system matrix and `f`. Params can be **Array** or **Matrix** class. If the system can't be solved, method raise exception
+
+## Usage
+Let's solve some system of linear equations. It can be written as
+
+![equation](http://latex.codecogs.com/gif.latex?%5Csmall%20AX%20%3D%20B)
+
+where A is n*n matrix, X - vector of unknown, B - vector
+
+If you want to solve this system you should call
+```ruby
+Mathpack::SLE.solve(matrix: A, f: B)
+```
+Parameter A can be Array or Matrix class. If Array is given result will be Array class. If Matrix is given result will be Matrix class.
+```ruby
+a = [[1, 2, 3], [4, 5, 6],[3, 5, 2]]
+b = [15, 30, 15]
+Mathpack::SLE.solve(matrix: a, f: b) #=> [-1.0, 2.0, 4.0]
+a = Matrix[[1, 2, 3], [4, 5, 6],[3, 5, 2]]
+b = Matrix.row_vector [15, 30, 15]
+Mathpack::SLE.solve(matrix: a, f: b) #=> Matrix[[-1.0, 2.0, 4.0]]
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/mathpack/fork )

data/Rakefile

@@ -1,2 +1 @@
-require "bundler/gem_tasks"
-
+require 'bundler/gem_tasks'

data/lib/mathpack/equation.rb

@@ -1,14 +1,18 @@
 module Mathpack
   module Equation
-    def self.solve(param = {}, &function)
-      derivate_eps = 1e-5
-      xk1 = param[:start]
+    def self.solve(params = {}, &function)
+      xk1 = params[:start]
       loop do
         xk = xk1
-        xk1 = xk - function.call(xk)/((function.call(xk + derivate_eps) - function.call(xk - derivate_eps))/(2*derivate_eps))
-        break if (xk1 - xk).abs < param[:eps]
+        xk1 = xk - function.call(xk) / derivative(xk, &function)
+        break if (xk1 - xk).abs < params[:eps]
       end
-      return xk1
+      xk1
+    end
+
+    def self.derivative(xk, &function)
+      eps = 1e-5
+      (function.call(xk + eps) - function.call(xk - eps)) / (2 * eps)
     end
   end
 end

data/lib/mathpack/sle.rb

@@ -0,0 +1,75 @@
+require 'matrix'
+
+module Mathpack
+  module SLE
+    EPS = 1e-14
+
+    def self.solve(params)
+      type = params[:f].class
+      @matrix = params[:matrix].to_a
+      @f = params[:f].to_a.flatten
+      @number = @f.length
+      @x = Array.new(@number) { |i| i + 1 }
+      fail 'SLE can\'t be solved' unless solve_direct
+      type == Matrix ? Matrix.row_vector(solve_reverse) : solve_reverse
+    end
+
+    def self.swap_lines(first_line, second_line)
+      0.upto(@number - 1) do |j|
+        @matrix[first_line][j], @matrix[second_line][j] = @matrix[second_line][j], @matrix[first_line][j]
+      end
+      @f[first_line], @f[second_line] = @f[second_line], @f[first_line]
+    end
+
+    def self.swap_columns(first_column, second_column)
+      0.upto(@number - 1) do |i|
+        @matrix[i][first_column], @matrix[i][second_column] = @matrix[i][second_column], @matrix[i][first_column]
+      end
+      @x[first_column], @x[second_column] = @x[second_column], @x[first_column]
+    end
+
+    def self.make_null_column(step)
+      (step + 1).upto(@number - 1) do |i|
+        alpha = -@matrix[i][step] / @matrix[step][step].to_f
+        step.upto(@number - 1) do |j|
+          @matrix[i][j] += @matrix[step][j] * alpha
+        end
+        @f[i] += @f[step] * alpha
+      end
+    end
+
+    def self.solve_direct
+      0.upto(@number - 1) do |i|
+        maximum = 0.0
+        max_line = i
+        max_column = i
+        i.upto(@number - 1) do |line|
+          i.upto(@number - 1) do |column|
+            maximum, max_line, max_column = @matrix[line][column].abs, line, column if @matrix[line][column].abs > maximum
+          end
+        end
+        return false if maximum < EPS
+        swap_lines(i, max_line) if (max_line != i)
+        swap_columns(i, max_column) if (max_column != i)
+        make_null_column(i)
+      end
+      true
+    end
+
+    def self.solve_reverse
+      result_vector = Array.new(@number)
+      (@number - 1).downto(0) do |i|
+        if i == (@number - 1)
+          result_vector[@x[i] - 1] = @f[i] / @matrix[i][i]
+        else
+          sum = 0.0
+          (i + 1).upto(@number - 1) do |j|
+            sum += @matrix[i][j] * result_vector[@x[j] - 1]
+          end
+          result_vector[@x[i] - 1] = (@f[i] - sum) / @matrix[i][i]
+        end
+      end
+      result_vector
+    end
+  end
+end

data/lib/mathpack/statistics.rb

@@ -34,28 +34,28 @@ module Mathpack
 
     def raw_moment(power)
       raw_moment = 0.0
-      @series.each{ |x| raw_moment += x**power }
+      @series.each { |x| raw_moment += x**power }
       raw_moment / number
     end
 
     def central_moment(power)
       central_moment = 0.0
       m = mean
-      @series.each{ |x| central_moment += (x - m)**power }
+      @series.each { |x| central_moment += (x - m)**power }
       central_moment / number
     end
 
     def empirical_cdf(x)
       result = 0.0
-      @series.each{ |val| result += e(x - val) }
+      @series.each { |val| result += heaviside(x - val) }
       result / number
     end
 
     def print_empirical_cdf_to_csv(filename)
-      step = 0.25
+      step = 0.5 * (max - min) / number
       val = min - step
       File.open(filename, 'w+') do |file|
-        while val <= max + step do
+        while val <= max + step
           file.write("#{val};")
           file.write("#{empirical_cdf(val)}\n")
           val += step
@@ -64,17 +64,17 @@ module Mathpack
     end
 
     def empirical_pdf(x)
-      h = variance**0.5 * number**(-1.0/6)
+      h = variance**0.5 * number**(-1.0 / 6)
       result = 0.0
-      @series.each{ |val| result += (e(x - val + h) - e(x - val - h))/(2*h) }
+      @series.each { |val| result += (heaviside(x - val + h) - heaviside(x - val - h)) / (2 * h) }
       result / number
     end
 
     def print_empirical_pdf_to_csv(filename)
-      step = 0.25
-      val = min - 2*step
+      step = 0.5 * (max - min) / number
+      val = min - 10 * step
       File.open(filename, 'w+') do |file|
-        while val <= max + 2*step do
+        while val <= max + 10 * step
           file.write("#{val};")
           file.write("#{empirical_pdf(val)}\n")
           val += step
@@ -84,7 +84,7 @@ module Mathpack
 
     private
 
-    def e(x)
+    def heaviside(x)
       x <= 0 ? 0 : 1
     end
   end

data/lib/mathpack/version.rb

@@ -1,3 +1,3 @@
 module Mathpack
-  VERSION = "0.1.0"
+  VERSION = '0.2.0'
 end

data/lib/mathpack.rb

@@ -1,3 +1,4 @@
-require "mathpack/version"
+require 'mathpack/version'
 require 'mathpack/statistics'
 require 'mathpack/equation'
+require 'mathpack/sle'

data/mathpack.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'mathpack/version'
+require "mathpack/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "mathpack"
@@ -9,13 +9,13 @@ Gem::Specification.new do |spec|
   spec.authors       = ["maxmilan"]
   spec.email         = ["max231194@gmail.com"]
   spec.summary       = "Summary"
-  spec.description   ="Includes collection of mathematical methods"
+  spec.description   = "Includes collection of mathematical methods"
   spec.homepage      = ""
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.executables   = spec.files.grep(%r{^bin/$}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/$})
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.6"

data/spec/equation_spec.rb

@@ -1,14 +1,14 @@
 describe 'Equations' do
   require 'mathpack/equation'
 
-  context 'calculate nonlinear equations' do
+  context '#solve nonlinear equations' do
+    let(:eps) { 0.00001 }
 
-    it 'should solve equation' do
-      eps = 0.00001
-      expect(Mathpack::Equation.solve(start: 0, eps: eps){|x| x**2 - Math.sin(x+1)}).to be_between(-0.613763 - eps, -0.613763 + eps)
-      expect(Mathpack::Equation.solve(start: 0.01, eps: eps){|x| 1/x - Math.log(x)}).to be_between(1.76322 - eps, 1.76322 + eps)
-      expect(Mathpack::Equation.solve(start: 0.01, eps: eps){|x| x**2 - 2*x + 1}).to    be_between(1.0 - eps, 1.0 + eps)
-      expect(Mathpack::Equation.solve(start: 0.01, eps: eps){|x| Math.exp(x-2) - Math.sin(x)}).to    be_between(0.159396 - eps, 0.159396 + eps)
+    it 'should give correct results' do
+      expect(Mathpack::Equation.solve(start: 0, eps: eps) { |x| x**2 - Math.sin(x + 1) }).to be_between(-0.613763 - eps, -0.613763 + eps)
+      expect(Mathpack::Equation.solve(start: 0.01, eps: eps) { |x| 1 / x - Math.log(x) }).to be_between(1.76322 - eps, 1.76322 + eps)
+      expect(Mathpack::Equation.solve(start: 0.01, eps: eps) { |x| x**2 - 2 * x + 1 }).to be_between(1.0 - eps, 1.0 + eps)
+      expect(Mathpack::Equation.solve(start: 0.01, eps: eps) { |x| Math.exp(x - 2) - Math.sin(x) }).to be_between(0.159396 - eps, 0.159396 + eps)
     end
   end
 end

data/spec/sle_spec.rb

@@ -0,0 +1,23 @@
+describe 'SLE' do
+  require 'mathpack/sle'
+
+  context '#solve systems of linear equations' do
+    let(:a) { [[1, 2, 3], [4, 5, 6], [3, 5, 2]] }
+    let(:unsolved) { [[1, 2, 3], [1, 2, 3], [3, 5, 2]] }
+    let(:b) { [15, 30, 15] }
+    let(:matrix_a) { Matrix[[1, 2, 3], [4, 5, 6], [3, 5, 2]] }
+    let(:vector_b) { Matrix.row_vector([15, 30, 15])  }
+
+    it 'should give correct answer' do
+      expect(Mathpack::SLE.solve(matrix: a, f: b)).to eql([-1.0, 2.0, 4.0])
+    end
+
+    it 'should raise error' do
+      expect { Mathpack::SLE.solve(matrix: unsolved, f: b) }.to raise_error
+    end
+
+    it 'should return vector if matrix class is given' do
+      expect(Mathpack::SLE.solve(matrix: matrix_a, f: vector_b)).to eql(Matrix.row_vector [-1.0, 2.0, 4.0])
+    end
+  end
+end

data/spec/statistics_spec.rb

@@ -1,62 +1,62 @@
 describe 'Statistics' do
   require 'mathpack/statistics'
 
-  describe "calculated statistics functions" do
+  describe '#calculate statistics functions' do
 
-    let(:data) { [1,5,4,2,3,4,5,7,2,7] }
+    let(:data) { [1, 5, 4, 2, 3, 4, 5, 7, 2, 7] }
     let(:stat) { Mathpack::Statistics.new(data) }
 
-    it "calculates the number" do
+    it 'should calculate number of elements' do
       expect(stat.number).to eql(10)
     end
 
-    it "calculates the mean" do
+    it 'should calculate mean' do
       expect(stat.mean).to eql(4.0)
     end
 
-    it "calculates the variance" do
+    it 'should calculate variance' do
       expect(stat.variance).to eql(3.8)
     end
 
-    it "calculates the skewness" do
+    it 'should calculate skewness' do
       expect(stat.skewness).to eql(0.16199658190818222)
     end
 
-    it "calculates the kurtosis" do
+    it 'should calculate kurtosis' do
       expect(stat.kurtosis).to eql(1.925207756232687)
     end
 
-    it "calculates the minimal element" do
+    it 'should calculate the minimal element' do
       expect(stat.min).to eql(1)
     end
 
-    it "calculates maximal element" do
+    it 'should calculate the maximal element' do
       expect(stat.max).to eql(7)
     end
 
-    it "calculates first raw moment equal to mean" do
+    it 'should calculate first raw moment equal to mean' do
       expect(stat.raw_moment(1)).to eql(stat.mean)
     end
 
-    it "calculates second central moment equal to variance" do
+    it 'should calculate second central moment equal to variance' do
       expect(stat.central_moment(2)).to eql(stat.variance)
     end
 
-    it "calculates raw moment" do
+    it 'should calculate raw moments' do
       expect(stat.raw_moment(3)).to eql(110.8)
     end
 
-    it "calculates central moment" do
+    it 'should calculate central moments' do
       expect(stat.central_moment(5)).to eql(18.0)
     end
 
-    it "calculates empirical cdf" do
+    it 'should calculate empirical cdf values in points' do
       expect(stat.empirical_cdf(stat.min - 0.1)).to eql(0.0)
       expect(stat.empirical_cdf(stat.max + 0.1)).to eql(1.0)
       expect(stat.empirical_cdf(stat.mean)).to eql(0.4)
     end
 
-    it "calculates empirical pdf" do
+    it 'should calculate empirical pdf values in points' do
       expect(stat.empirical_pdf(stat.mean)).to eql(0.1882412842233359)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mathpack
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - maxmilan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-30 00:00:00.000000000 Z
+date: 2014-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,10 +53,12 @@ files:
 - Rakefile
 - lib/mathpack.rb
 - lib/mathpack/equation.rb
+- lib/mathpack/sle.rb
 - lib/mathpack/statistics.rb
 - lib/mathpack/version.rb
 - mathpack.gemspec
 - spec/equation_spec.rb
+- spec/sle_spec.rb
 - spec/statistics_spec.rb
 homepage: ''
 licenses:
@@ -82,6 +84,4 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Summary
-test_files:
-- spec/equation_spec.rb
-- spec/statistics_spec.rb
+test_files: []