mathpack 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b544fc6133006b26c674fd82657520f9569d95d
-  data.tar.gz: b7a523bf46386d4046a978d3591abc267ce54516
+  metadata.gz: 218d151cc62bb32f4f7080413b396d4d11f585ee
+  data.tar.gz: 8929b3f9775a341f3f491f1eb26bad71e490be51
 SHA512:
-  metadata.gz: 8e2d7cf42e3d4528c1e156d636ff393fe4c52d2da6a2197c14f6fe6d16ea9b615514f3aa3f544c6248884bd59d59d66306e28f8aa3ba26a7b448a79fa519d4f8
-  data.tar.gz: dab1058342ca55b4ce594a9cc8398d154a4f1774d9c7e73dccb6d6aeb5f725f7f67f48698690e0b3679e854598fb5aef0eb40d9750adbb6e475927261410acf4
+  metadata.gz: c45dcf42f3b70354c4a536aa5a053b5c1390664cd857d463d1ba1175277a01647772465861c7d3ec0d805229e622eac0b0288be24899968e9c717cd38f80fc36
+  data.tar.gz: 40d736560eb81d34c25c1dc985cdda85d838b8bc24c810469bed7ae6b6f562e5c7ff54f28de72c95a9021c13d8a6aeff2444f18963f2acde0026f8c216d598b8

data/lib/mathpack/io.rb

@@ -1,5 +1,12 @@
 module Mathpack
   module IO
+    @@next_stop = /[+*-\/() ]/
+
+    @@operators = %w{+ - / ** *}
+    @@delimiters = %w{, .}
+    @@numbers = %w{0 1 2 3 4 5 6 7 8 9}
+    @@math_constants = { 'pi' => 'Math::PI' }
+    @@math_functions = { 'ln(' => 'Math.log(', 'e**(' => 'Math.exp(', 'arctg(' => 'Math.atan(', 'arcsin(' => 'Math.asin(', 'arccos(' => 'Math.acos(', 'sin(' => 'Math.sin(', 'cos(' => 'Math.cos(', 'tg(' => 'Math.tan(', 'lg(' => 'Math.log10(' }
     def self.print_table_function(params = {})
       fail 'Arrays length dismatch' if params[:x].length != params[:y].length
       File.open(params[:filename] + '.csv'|| 'table_function.csv', 'w+') do |file|
@@ -9,5 +16,84 @@ module Mathpack
         end
       end
     end
+
+    def self.read_table_function(filename)
+      x = []
+      y = []
+      data = File.read(filename + '.csv')
+      rows = data.split("\n")
+      rows.delete!(0) unless rows[0].split(';')[0].to_f
+      rows.each do |row|
+        parts = row.split(';')
+        x << parts[0].to_f
+        y << parts[1].to_f
+      end
+      { x: x, y: y}
+    end
+
+    def self.parse_function(string_function)
+      transformed_function = transform_string_function string_function
+      produce_block(transformed_function) if is_valid_function?(transformed_function)
+    end
+
+    def self.is_valid_function?(function_string)
+      str = function_string.dup
+      @@math_functions.values.each do |math_func|
+        str.gsub!(math_func, '(')
+      end
+      str.delete!(' ')
+      str.gsub!('x', '')
+      (@@operators + @@delimiters + @@numbers).each do |sym|
+        str.gsub!(sym, '')
+      end
+      brackets_stack = []
+      str.each_char do |bracket|
+        if brackets_stack.empty?
+          brackets_stack << bracket
+          next
+        end
+        if bracket.eql? '('
+          brackets_stack << bracket
+        else
+          if brackets_stack.last.eql? '('
+            brackets_stack.pop
+          else
+            brackets_stack << bracket
+          end
+        end
+      end
+      str.gsub!(/[\(\)]/, '')
+      brackets_stack.empty? && str.empty?
+    end
+
+    def self.transform_string_function(function_string)
+      function = function_string.dup
+      i_next = 0
+      while i_next != function.length do
+        i = function.index('^', i_next)
+        break if i.nil?
+        if function[i + 1].eql? '('
+          function[i..i + 1] = '**('
+        else
+          i_next = function.index(@@next_stop, i)
+          i_next = function.length unless i_next
+          function[i...i_next] = '**('+ function[i + 1...i_next] + ')'
+        end
+      end
+      @@math_functions.each do |key, value|
+        function.gsub!(key, value)
+      end
+      @@math_constants.each do |key, value|
+        function.gsub!(key, value)
+      end
+      function
+    end
+
+    def self.produce_block(valid_function)
+      valid_function.gsub!('x', 'var')
+      valid_function.gsub!('evarp', 'exp')
+      calculate = -> str { ->x { eval str.gsub('var', x.to_s) } }
+      calculate.(valid_function)
+    end
   end
 end

data/lib/mathpack/version.rb

@@ -1,3 +1,3 @@
 module Mathpack
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end

data/spec/io_spec.rb

@@ -0,0 +1,17 @@
+describe 'IO' do
+  require 'mathpack/io'
+
+  describe '#parse_function' do
+    it 'returns nil if function is not valid' do
+      expect(Mathpack::IO.parse_function('puts "rm ."')).to be_nil
+    end
+
+    it 'returns nil if function have incorrect braces' do
+      expect(Mathpack::IO.parse_function('e^(sin(x)')).to be_nil
+    end
+
+    it 'returns block if function is correct' do
+      expect(Mathpack::IO.parse_function('e^(sin(x))').call(Math::PI / 2.0)).to eq(Math::E)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mathpack
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - maxmilan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-14 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,6 +65,7 @@ files:
 - spec/equation_spec.rb
 - spec/functions_spec.rb
 - spec/integration_spec.rb
+- spec/io_spec.rb
 - spec/sle_spec.rb
 - spec/statistics_spec.rb
 homepage: ''