qlang 0.0.14142 → 0.0.141421

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6671b553251375c1573838ac60c23a091a2022fa
-  data.tar.gz: 9c8f8d7a43d80dd9af9c13505eaf1d9cecbf739a
+  metadata.gz: 5cd27fe1e7d111bcb1fb356c5b981b8b141c67a0
+  data.tar.gz: 56d3cea8d211ddf39f9f9ee7ea80d57a4885ac66
 SHA512:
-  metadata.gz: d690071a0649fc5ea24a9a83c70f4e13022abb0d48387ceb17178976668ddbfbb05aee9e5c1e0513226a1c01db93a9c491f39901b1b2c8e79081804b86507e8b
-  data.tar.gz: 14f0486e217a786d6a1845e7a4a3e265b2f0563d82d6b90f227dc3b61e772325a24c66bdbee72f7ca81d35712f3705d35507a67055168a207839f71feb92128b
+  metadata.gz: 05b9aae4ef17bfb8724fbdf3383c66ca4e4f44a811221793a0e99ad1e585f9ce56c111cb142fd84b58a24087785e87c21a6fc4e4cc12650cbae546ce3edef506
+  data.tar.gz: 81f79ee745b10ed0cd90e0680094e9ffdcfc41d630593c846bc5baca21fe3d3bf43d735624be7f09e638dba8a65b304fed5de613a676d05fb3f54a7acb715da0

data/lib/qlang/api.rb

@@ -9,15 +9,31 @@ module Qlang
     # TODO:
     class ::String
       def rm(str_or_rgx)
+        gsub(str_or_rgx, '')
+      end
+
+      def rm!(str_or_rgx)
         gsub!(str_or_rgx, '')
+        self
       end
 
-      def rms(*str_or_rgxs)
+      def rms!(*str_or_rgxs)
         str_or_rgxs.each do |str_or_rgx|
-          rm(str_or_rgx)
+          rm!(str_or_rgx)
         end
         self
       end
+
+      # FIX:
+      def equalize!
+        rms!(/\A +/, / +\z/)
+        if self =~ /\A\(/ && self =~ /\)\z/
+          rms!(/\A\(/, /\)\z/)
+          rms!(/\A +/, / +\z/)
+        else
+          self
+        end
+      end
     end
 
     class ::Matrix

data/lib/qlang/api/list_api.rb

@@ -2,8 +2,14 @@ module Qlang
   module Api
     module ListApi
       def execute(arys)
-        combineds_by_equal = arys.map { |ary| "#{ary[0]}=#{ary[1]}" }.join(', ')
-        "list(#{combineds_by_equal})"
+        case $type
+        when :R
+          combineds_by_equal = arys.map { |ary| "#{ary[0]}=#{ary[1]}" }.join(', ')
+          "list(#{combineds_by_equal})"
+        when :Ruby
+          fail 'List is not implemented for Ruby'
+        end
+
       end
       module_function :execute
     end

data/lib/qlang/iq.rb

@@ -1,16 +1,24 @@
 module Qlang
   module Iq
+    class Dydx::Algebra::Formula
+      # FIX:
+      def to_q
+        str = to_s.gsub(/\*\*/, '^').rm(' * ')
+        str.equalize!
+      end
+    end
     def execute(code)
       ruby_obj = eval Q.to_ruby.compile(code)
-      case ruby_obj
-      when Matrix, Vector
+      output = case ruby_obj
+      when Matrix, Vector, Dydx::Algebra::Formula
         ruby_obj.to_q
       when Float::INFINITY
         'oo'
       when - Float::INFINITY
         '-oo'
       else
-        ruby_obj
+        str = ruby_obj.to_s
+        str.equalize!
       end
     end
     module_function :execute

data/lib/qlang/lexer/func_lexer.rb

@@ -7,7 +7,7 @@ module Qlang
       rule(/[ \t\f]/)
 
       rule(/\r\n/) { :NLIN }
-      rule(/\w.*/) { :OTHER }
+      rule(/[\w\(].*/) { :FOML }
     end
   end
 end

data/lib/qlang/parser.rb

@@ -49,7 +49,7 @@ module Qlang
           cont_lexed = Lexer::FuncLexer.new(lexed.get_value(cont_token_with_num))
 
           case cont_lexed.token_str
-          when /:FDEF\d:EQL\d:OTHER\d/
+          when /:FDEF\d:EQL\d:FOML\d/
             cont = FuncParser.execute(cont_lexed)
             lexed.ch_value(cont_token_with_num, cont)
             lexed.ch_token(cont_token_with_num, :R)

data/lib/qlang/parser/func_parser.rb

@@ -6,11 +6,44 @@ module Qlang
         lexed.fix_r_txt!
         fdef_ary = lexed[0][:FDEF].split('')
         func_name = fdef_ary.shift
-        args = fdef_ary.join.rms('(', ')', ',', ' ').split('')
+        args = fdef_ary.join.rms!('(', ')', ',', ' ').split('')
 
-        FuncApi.execute(func_name, args, lexed[-1][:OTHER])
+        FuncApi.execute(func_name, args, FomlParser.execute(lexed[-1][:FOML]))
       end
       module_function :execute
+
+      # FIX:
+      module FomlParser
+        def execute(lexed)
+          ss = StringScanner.new(lexed)
+          result = ''
+          until ss.eos?
+            { EXP: /\^/, BFUNC: /sin|cos|tan|log/, MUL: /(pi|[1-9a-z]){2,}/, SNGL: /(pi|[1-9a-z])/, OTHER: /([^\^1-9a-z]|^pi)+/ }.each do |token , rgx|
+              if ss.scan(rgx)
+                item = case token
+                when :EXP
+                  $type == :Ruby ? '**' : '^'
+                when :MUL
+                  sss = StringScanner.new(ss[0])
+                  ary = []
+                  until sss.eos?
+                    [/pi/, /[1-9a-z]/].each do |rgx2|
+                      ary << sss[0] if sss.scan(rgx2)
+                    end
+                  end
+                  ary.join(' * ')
+                else
+                  ss[0]
+                end
+                result += item
+                break
+              end
+            end
+          end
+          result
+        end
+        module_function :execute
+      end
     end
   end
 end

data/lib/qlang/parser/integral_parser.rb

@@ -5,7 +5,7 @@ module Qlang
       def execute(string)
         integrated, range = string.scan(/S *\((.+)\)\[(.+)\]/).first
 
-        integrated.rm(' ')
+        integrated.rm!(' ')
 
         IntegralApi.execute(integrated[0..-3], integrated[-2..-1], range)
       end

data/lib/qlang/version.rb

@@ -1,3 +1,3 @@
 module Qlang
-  VERSION = "0.0.14142"
+  VERSION = "0.0.141421"
 end

data/spec/iq_spec.rb

@@ -29,29 +29,73 @@ describe Qlang do
 
     describe 'Diff' do
       it do
-        expect(Iq.execute('d/dx(e ** x)')).to eq(e ** x)
-        expect(Iq.execute('d/dx(x ** 2)')).to eq(2 * x)
-        expect(Iq.execute('d/dx(x * 2)')).to eq(2)
-        expect(Iq.execute('d/dx( sin(x) )')).to eq(cos(x))
-        expect(Iq.execute('d/dx(log( x ))')).to eq(1/x)
+        expect(Iq.execute('d/dx(e ** x)')).to eq('e ^ x')
+        expect(Iq.execute('d/dx(x ** 2)')).to eq('2x')
+        expect(Iq.execute('d/dx(x * 2)')).to eq('2')
+        expect(Iq.execute('d/dx( sin(x) )')).to eq('cos( x )')
+        expect(Iq.execute('d/dx(log( x ))')).to eq('1 / x')
       end
     end
 
     describe 'Integral' do
       it do
         expect(Iq.execute('S( log(x)dx )[0..1]')).to eq('-oo')
-        expect(Iq.execute('S( sin(x)dx )[0..pi]')).to eq(2.0)
-        expect(Iq.execute('S( cos(x)dx )[0..pi]')).to eq(0.0)
+        expect(Iq.execute('S( sin(x)dx )[0..pi]')).to eq('2.0')
+        expect(Iq.execute('S( cos(x)dx )[0..pi]')).to eq('0.0')
+        expect(Iq.execute('S( cos(x)dx )[0..pi]')).to eq('0.0')
       end
     end
 
-    describe 'Function' do
-      it do
-        expect(Iq.execute('f(x, y) = x + y')).to eq(f(x, y) <= x + y)
-        expect(Iq.execute('f( 4, 5 )')).to eq(9)
-        expect(Iq.execute('g(x) = x ** 2')).to eq(g(x) <= x ** 2)
-        expect(Iq.execute('g(2)')).to eq(4)
+    def self.def_test(name, input, output)
+      it name + '_def' do
+        expect(Iq.execute(input)).to eq(output)
+      end
+    end
+
+    def self.cal_test(name, input, output)
+      it name + '_cal' do
+        expect(Iq.execute(input)).to eq(output)
+        reset
       end
     end
+
+
+    describe 'Function' do
+      def_test('ex1', 'f(x, y) = x + y', 'x + y')
+      cal_test('ex1', 'f( 4, 5 )', '9.0')
+
+      def_test('ex2', 'f(x, y) = xy', 'x * y')
+      cal_test('ex2', 'f( 3, 9 )', '27.0')
+
+      def_test('ex3', 'f(x, y) = xy^2', 'x * ( y ** 2 )')
+      cal_test('ex3', 'f( 3, 2 )', '12.0')
+
+      def_test('ex4', 'f(x, y) = xy^2', 'x * ( y ** 2 )')
+      cal_test('ex4', 'df/dx', 'y ^ 2')
+
+      def_test('ex5', 'g(x) = x ^ 2', 'x ** 2')
+      cal_test('ex5', 'g(2)', '4.0')
+
+      def_test('ex6', 'h(x) = e ^ 2', 'e ** 2')
+      cal_test('ex6', 'h(2)', '7.3890560989306495')
+
+      def_test('ex7', 'h(x) = pix', 'pi * x')
+      cal_test('ex7', 'h(3)', '9.42477796076938')
+
+      def_test('ex8', 'h(x) = pie', 'pi * e')
+      cal_test('ex8', 'h(2)', '8.539734222673566')
+
+      def_test('ex9', 'h(x) = ( 1 / ( 2pi ) ^ ( 1 / 2.0 ) ) * e ^ ( - x ^ 2 / 2 )', '( ( 4503599627370496 / 6369051672525773 ) / ( pi ** 0.5 ) ) * ( e ** ( ( - ( x ** 2 ) ) / 2 ) )')
+      cal_test('ex9', 'S( h(x)dx )[-oo..oo]', '1.0')
+
+      def_test('ex10', 'f(x) = sin(x)', 'sin( x )')
+      cal_test('ex10', 'f(pi)', '0.0')
+
+      def_test('ex11', 'f(x) = cos(x)', 'cos( x )')
+      cal_test('ex11', 'f(pi)', '-1.0')
+
+      def_test('ex11', 'f(x) = log(x)', 'log( x )')
+      cal_test('ex11', 'f(e)', '1.0')
+    end
   end
 end

data/spec/objects/function_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Qlang do
+  describe 'Function' do
+    context 'into R' do
+      it do
+        expect(
+          Q.to_r.compile('f(x, y) = x + y')
+        ).to eq(
+          "f <- function(x ,y) x + y"
+        )
+
+        expect(
+          Q.to_r.compile('g(x) = x ^ 2')
+        ).to eq(
+          "g <- function(x) x ^ 2"
+        )
+
+        expect(
+          Q.to_r.compile('g(x) = x ^ (2 + 2)')
+        ).to eq(
+          "g <- function(x) x ^ (2 + 2)"
+        )
+
+        expect(
+          Q.to_r.compile('h(a, b, c) = a ^ 2 + b ^ 2 + c ^ 2')
+        ).to eq(
+          "h <- function(a ,b ,c) a ^ 2 + b ^ 2 + c ^ 2"
+        )
+      end
+    end
+  end
+end

data/spec/{integral_spec.rb → objects/integral_spec.rb}

@@ -7,6 +7,7 @@ describe Qlang do
 
       end
     end
+
     context 'into Ruby' do
       it do
         expect(

data/spec/spec_helper.rb

@@ -4,4 +4,5 @@ include Qlang
 
 require 'coveralls'
 Coveralls.wear!
+
 require 'pry'

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: qlang
 version: !ruby/object:Gem::Version
-  version: 0.0.14142
+  version: 0.0.141421
 platform: ruby
 authors:
 - gogotanaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dydx
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.412
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.412
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Enjoy MATH!
@@ -74,11 +74,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -107,14 +107,14 @@ files:
 - lib/qlang/parser/vector_parser.rb
 - lib/qlang/version.rb
 - q_lang.gemspec
-- spec/function_spec.rb
-- spec/integral_spec.rb
 - spec/iq_spec.rb
-- spec/list_spec.rb
-- spec/matrix_spec.rb
+- spec/objects/function_spec.rb
+- spec/objects/integral_spec.rb
+- spec/objects/list_spec.rb
+- spec/objects/matrix_spec.rb
+- spec/objects/vector_spec.rb
 - spec/q_lang_spec.rb
 - spec/spec_helper.rb
-- spec/vector_spec.rb
 homepage: http://q-language.org/
 licenses:
 - MIT
@@ -125,26 +125,26 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Enjoy MATH!
 test_files:
-- spec/function_spec.rb
-- spec/integral_spec.rb
 - spec/iq_spec.rb
-- spec/list_spec.rb
-- spec/matrix_spec.rb
+- spec/objects/function_spec.rb
+- spec/objects/integral_spec.rb
+- spec/objects/list_spec.rb
+- spec/objects/matrix_spec.rb
+- spec/objects/vector_spec.rb
 - spec/q_lang_spec.rb
 - spec/spec_helper.rb
-- spec/vector_spec.rb

data/spec/function_spec.rb

@@ -1,31 +0,0 @@
-require 'spec_helper'
-
-describe Qlang do
-  describe 'Function' do
-    it do
-      expect(
-        Q.compile('f(x, y) = x + y')
-      ).to eq(
-        "f <- function(x ,y) x + y"
-      )
-
-      expect(
-        Q.compile('g(x) = x ** 2')
-      ).to eq(
-        "g <- function(x) x ** 2"
-      )
-
-      expect(
-        Q.compile('g(x) = x ** (2 + 2)')
-      ).to eq(
-        "g <- function(x) x ** (2 + 2)"
-      )
-
-      expect(
-        Q.compile('h(a, b, c) = a ** 2 + b ** 2 + c ** 2')
-      ).to eq(
-        "h <- function(a ,b ,c) a ** 2 + b ** 2 + c ** 2"
-      )
-    end
-  end
-end