hilbert 0.0.2700100 → 0.0.2700110

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a0a3fec8ea8685b98cb92d396c58fb3467b85cf
-  data.tar.gz: 521413e76c6b6512e462695a6603d697da6b1a60
+  metadata.gz: 8b6c55b9859234a6710c7d633a13a06112ab0a4f
+  data.tar.gz: 2c336de0d9940bb01e151f8fe235d107248540b9
 SHA512:
-  metadata.gz: 490d8872bf5cc5c9efea975fe3d596981080844229024916adaf35bbe607831a2f431b331490a91fd4dff83582ca836ff4ac19870b57713b9392bea46a70b4ee
-  data.tar.gz: 154c250c7a531e80b939bcc1ed8e382489ff1a9068240ea4118e5da29e7f7c01a071c7228157472e262d63bafc6bd72fac4b83eb29e0bff386b81950f1abd224
+  metadata.gz: 4b567ae6c9b84b1ff938035dccf82fa3fae2473264c030ba5691deef2ab004c8c85991f33159da43d0cd6e5301bb89afe43e344262ddc3bfa3b5167a561bda8d
+  data.tar.gz: 7eb3fda6ec81613dbdd59dafe0b558ad8deef8fcac1b00dbe3a828e81d3f7ceb574aaba62a5749bc877dabe09a30294529446e79c62b52c5ac2d8d137fbaa56e

data/README.md

@@ -4,7 +4,7 @@
 
 ## Do you know the one best language in this world?
 
-#### I believe mathematics is absolutely that one.
+#### I believe mathematics(logic) is absolutely that one.
 
 ## How can we deal something as great as mathematics in a discrete world?
 
@@ -26,6 +26,19 @@ The code below is input and output for the Hilbert interpreter
 
 (you can try it by `hilbert -i`)
 
+### Logic
+```coffeescript
+P -> Q 
+Q -> R
+(P -> R)?
+=> TRUE
+
+P | Q # P or Q
+~P    # not P
+Q?    # Q is TURE?
+=> TURE
+```
+
 ### Differentiate
 
 ```
@@ -155,5 +168,6 @@ end
 
 ## Contributing
 
-Any PRs or issues are welcome.
+Any PRs or issues are welcome. (Please make to `develop` branch)
+
 You can become a commiter, even if you only commit once.

data/bin/hilbert

@@ -11,6 +11,13 @@ require 'hilbert/iq'
 # TODO: There are vanch of todo ..
 case ARGV.first
 when '-i'
+  if ARGV[1] == '-zfc'
+    Hilbert::Iq.execute('postulate zfc_analysis')
+    print %|Hi guys, your postulating zfc_analysis is success. :) \n\n|
+  else
+    print %|Hi guys,thank you for using Hilbert.\nYou need to execute "postulate zfc_analysis" if you wanna do real analysis.\n\n|
+  end
+
   loop do
     print 'Enjoy! -> '
     begin

data/hilbert.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'dydx', '~> 0.2.7000000'
+  spec.add_dependency 'dydx', '~> 0.2.7000001'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/lib/hilbert/api/limit_api.rb

@@ -14,6 +14,7 @@ module Hilbert
              temp_cal_f(#{close_to} + Float::EPSILON ** 20)"
           end
         when :inter
+          Dydx::API.reset!
           Dydx::API.store_func(eval(var), eval(formula), :tmp)
           Dydx::API.eval_func(eval(close_to) + Float::EPSILON ** 20, :tmp)
         else

data/lib/hilbert/api/sigma_api.rb

@@ -5,6 +5,7 @@ module Hilbert
         case $meta_info.lang
         # TODO: I know what you want to say.
         when :ruby
+          Dydx::API.reset!
           "temp_cal_f(#{var}) <= #{formula};
            (#{from}..#{to}).inject(0) {|sum, i| sum+=temp_cal_f(i) }"
         else

data/lib/hilbert/iq.rb

@@ -30,10 +30,10 @@ module Hilbert
       when Matrix, Vector, Dydx::Algebra::Formula
         ruby_obj.to_q
       when Numeric
-        # TODO: I know you wanna way..
+        # TODO: I know what you wanna say..
         if    ruby_obj > 10000.0            then 'oo'
         elsif ruby_obj < -10000.0           then '-oo'
-        elsif ruby_obj.abs < Float::EPSILON then '0.0'
+        elsif ruby_obj.abs < 1.0/10**4        then '0.0'
         else                                     ruby_obj.to_s.equalize!
         end
       else

data/lib/hilbert/lexer/main_lexer.rb

@@ -3,8 +3,9 @@ module Hilbert
     class MainLexer < Base
       # TODO: So far so good, but...
       rule(/postulate zfc_analysis/) { :POST_ZFC }
-      rule(/#{EVALOGIC}/) { :EVALOGIC }
-      rule(/#{DEFLOGIC}/) { :DEFLOGIC }
+      rule(/paradox\?/) { :P_PARAD }
+      rule(/\A.*[A-RT-Z].*\?.*\z/m) { :EVALOGIC }
+      rule(/\A.*[A-RT-Z].*\z/m) { :DEFLOGIC }
       rule(/[ \t\f]/)
 
       rule(/(\r|\n)+/) { :NULL }
@@ -15,8 +16,9 @@ module Hilbert
         def zfc_analysis!
           clear!
           rule(/postulate zfc_analysis/) { :POST_ZFC }
-          rule(/#{EVALOGIC}/) { :EVALOGIC }
-          rule(/#{DEFLOGIC}/) { :DEFLOGIC }
+          rule(/paradox\?/) { :P_PARAD }
+          rule(/\A.*[A-RT-Z].*\?.*\z/m) { :EVALOGIC }
+          rule(/\A.*[A-RT-Z].*\z/m) { :DEFLOGIC }
           rule(/(#{FUNCCV})#{ANYSP}#{EQL}#{ANYSP}(#{FORMULA})/) { :DEF_FUNC }
           rule(/#{INTE_SYM}#{ANYSP}#{LPRN}(#{ANYSTR})#{RPRN}#{LBRCT}(#{ANYSTR})#{RBRCT}/) { :INTEGRAL }
           rule(/#{DIFF_SYM}(#{VAR}) (#{FORMULA})/) { :DIFFERENTIAL }

data/lib/hilbert/parser.rb

@@ -27,20 +27,18 @@ module Hilbert
         case lexed.token_str
         when /:(POST_ZFC)(\d+)/
           Hilbert::Lexer::MainLexer.zfc_analysis!
-          lexed.parsed!('', $2)
+          lexed.parsed!('"success! :)"', $2)
+        when /:(P_PARAD)(\d+)/
+          lexed.parsed!($world.paradox?, $2)
+
         when /:(DEFLOGIC)(\d+)/
-          value = lexed.get_value($1)
-          lexeds = Lexer::WorldLexer.execute(value)
-          Parser::WorldParser.execute(lexeds)
-          $world << eval(Parser::WorldParser.parsed_srt)
-          rslt = %|"Defined: #{value} is TRUE"|
+          value = lexed.get_value($1).delete("\n")
+          rslt = $world << value
           lexed.parsed!(rslt, $2)
 
         when /:(EVALOGIC)(\d+)/
-          value = lexed.get_value($1).delete('?')
-          lexeds = Lexer::WorldLexer.execute(value)
-          Parser::WorldParser.execute(lexeds)
-          rslt = $world.impl eval(Parser::WorldParser.parsed_srt), value
+          value = lexed.get_value($1).delete("?\n")
+          rslt = $world.impl value
           lexed.parsed!(rslt, $2)
 
         when /:(VECTOR)(\d+)/, /:(MATRIX)(\d+)/, /:(TMATRIX)(\d+)/, /:(INTEGRAL)(\d+)/, /:(DEF_FUNC)(\d+)/, /:(DIFFERENTIAL)(\d+)/, /:(LIMIT)(\d+)/, /:(SIGMA)(\d+)/

data/lib/hilbert/version.rb

@@ -1,3 +1,3 @@
 module Hilbert
-  VERSION = '0.0.2700100'
+  VERSION = '0.0.2700110'
 end

data/lib/hilbert/world.rb

@@ -6,25 +6,22 @@ module Hilbert
     class Entity
       @@propositions = []
       class << self
-        def tautology
-          @@propositions
+        def <<(logic_str)
+          @@propositions << to_rb_obj(logic_str)
+          %|"Defined: #{logic_str} is TRUE"|
         end
 
-        def <<(logic_form)
-          @@propositions << logic_form
-        end
-
-        def impl(logic_form, logic_str)
+        def impl(logic_str)
           # HOTFIX:
-          return %|"Evaluate: #{logic_str} is UNDEFINED"| if @@propositions.empty?
-          str = (!!!!!!!(@@propositions.inject(:*) >= logic_form)).to_s
+          return eval_rslt(logic_str, 'UNDEFINED') if @@propositions.empty?
+          str = (!!!!!!!(@@propositions.inject(:*) >= to_rb_obj(logic_str))).to_s
           case str
           when 'TRUE'
-            %|"Evaluate: #{logic_str} is TRUE"|
+            eval_rslt(logic_str, 'TRUE')
           when 'FALSE'
-            %|"Evaluate: #{logic_str} is FALSE"|
+            eval_rslt(logic_str, 'FALSE')
           else
-            %|"Evaluate: #{logic_str} is UNDEFINED"|
+            eval_rslt(logic_str, 'UNDEFINED')
           end
         end
 
@@ -38,6 +35,29 @@ module Hilbert
         def clear!
           @@propositions = []
         end
+
+        def paradox?
+          return %|"FALSE"| if @@propositions.empty?
+          str = (!!!!!!!(@@propositions.inject(:*) >= (atom(:P) * ~atom(:P)))).to_s
+          case str
+          when 'TRUE'
+            %|"TRUE"|
+          else
+            %|"FALSE"|
+          end
+        end
+
+        # Internal Utils
+        def to_rb_obj(logic_str)
+          lexeds = Lexer::WorldLexer.execute(logic_str)
+          Parser::WorldParser.execute(lexeds)
+          eval Parser::WorldParser.parsed_srt
+        end
+
+        def eval_rslt(logic_str, rslt)
+          %|"Evaluate: #{logic_str} is #{rslt}"|
+        end
+
       end
     end
   end

data/test/interpreter/test_differential.rb

@@ -1,43 +1,59 @@
 require 'minitest_helper'
 
 class TestDifferential < TestInterpreterBase
+
+  # TODO: opposite
+  def assert_iq_equal(output, input)
+    assert_equal(output, Hilbert::Iq.execute(input))
+  end
+
   def setup
   end
 
   def test_general
     assert_iq_equal(
-      'd/dx(e ** x)',
-      'e ^ x'
+      'e ^ x',
+      'd/dx(e ** x)'
+    )
+
+    assert_iq_equal(
+      '2x',
+      'd/dx(x ** 2)'
+    )
+
+    assert_iq_equal(
+      '2',
+      'd/dx(x * 2)'
     )
 
     assert_iq_equal(
-      'd/dx(x ** 2)',
-      '2x'
+      'cos( x )',
+      'd/dx( sin(x) )'
     )
 
     assert_iq_equal(
-      'd/dx(x * 2)',
-      '2'
+      '1 / x',
+      'd/dx(log(x))'
     )
 
     assert_iq_equal(
-      'd/dx( sin(x) )',
-      'cos( x )'
+      '- sin( x )',
+      'd/dx cos(x)'
     )
 
     assert_iq_equal(
-      'd/dx(log( x ))',
-      '1 / x'
+      '2x',
+      'd/dx xx'
     )
 
     assert_iq_equal(
-      'd/dx cos(x)',
-      '- sin( x )'
+      '1 / x',
+      'd/dx log(x)'
     )
 
     assert_iq_equal(
-      'd/dx xx',
-      '2x'
+      '( cos( x ) / x ) + ( log( x )( - sin( x ) ) )',
+      'd/dx log(x) * cos(x)'
     )
   end
 end

data/test/interpreter/test_function.rb

@@ -40,5 +40,8 @@ class TestFunction < TestInterpreterBase
 
     assert_def_func('f(x) = log(x)', 'log( x )')
     assert_cal_func('f(e)', '1.0')
+
+    assert_def_func('f(x) = cos(x)', 'cos( x )')
+    assert_cal_func('f(pi/2.0)', '0.0')
   end
 end

data/test/interpreter/test_general.rb

@@ -4,9 +4,17 @@ class TestGeneral < TestInterpreterBase
   def setup
   end
 
+  # TODO: opposite
+  def assert_iq_equal(output, input)
+    assert_equal(output, Hilbert::Iq.execute(input))
+  end
+
   def test_general
     assert_iq_equal('2x', '2x')
-    assert_iq_equal('x + x', '2x')
-    assert_iq_equal('x * y', 'xy')
+    assert_iq_equal('2x', 'x + x')
+    # assert_iq_equal('xy', 'xy')
+    assert_iq_equal('x ^ y', 'x ^ y')
+    assert_iq_equal('2sin( x )', 'sin(x) + sin(x)')
+    assert_iq_equal('log( x ) ^ 2', 'log(x) * log(x)')
   end
 end

data/test/interpreter/test_limit.rb

@@ -5,7 +5,7 @@ class TestLimit < TestInterpreterBase
   end
 
   def assert_iq_equal(output, input)
-    assert_equal(Hilbert::Iq.execute(input), output)
+    assert_equal(output, Hilbert::Iq.execute(input))
   end
 
   def test_general
@@ -33,5 +33,10 @@ class TestLimit < TestInterpreterBase
       '0.0',
       'lim[x->0] x'
     )
+
+    assert_iq_equal(
+      'oo',
+      'lim[x->0] 1/x'
+    )
   end
 end

data/test/interpreter/test_propositional_logic.rb

@@ -27,8 +27,11 @@ class TestPropositionalLogic < TestInterpreterBase
   end
 
   def test_paradox?
+    assert_iq_equal('FALSE', 'paradox?')
     assert_iq_equal('Defined: A is TRUE', 'A')
+    assert_iq_equal('FALSE', 'paradox?')
     assert_iq_equal('Defined: ~A is TRUE', '~A')
+    assert_iq_equal('TRUE', 'paradox?')
   end
     # assert_iq_equal('Defined: P(1) is true', "P(1)")
     # assert_iq_equal('Evaluate: P(1) is true', 'P?(1)')

data/test/interpreter/test_sigma.rb

@@ -12,6 +12,11 @@ class TestSigma < TestInterpreterBase
       '55.0'
     )
 
+    assert_iq_equal(
+      '∑[i=1, 10] i',
+      '55.0'
+    )
+
     assert_iq_equal(
       '∑[x=0, 10] x^2',
       '385.0'
@@ -21,5 +26,6 @@ class TestSigma < TestInterpreterBase
       '∑[x=0, 10] x^3',
       '3025.0'
     )
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hilbert
 version: !ruby/object:Gem::Version
-  version: 0.0.2700100
+  version: 0.0.2700110
 platform: ruby
 authors:
 - gogotanaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-15 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dydx
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.7000000
+        version: 0.2.7000001
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.7000000
+        version: 0.2.7000001
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement