hilbert 0.0.2700110 → 0.0.2700210

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b6c55b9859234a6710c7d633a13a06112ab0a4f
-  data.tar.gz: 2c336de0d9940bb01e151f8fe235d107248540b9
+  metadata.gz: b5504e360e4fc6ff8787b6afb21fb32b73e1bf53
+  data.tar.gz: 3500645d88a619fc8e78962a003374deab4813bd
 SHA512:
-  metadata.gz: 4b567ae6c9b84b1ff938035dccf82fa3fae2473264c030ba5691deef2ab004c8c85991f33159da43d0cd6e5301bb89afe43e344262ddc3bfa3b5167a561bda8d
-  data.tar.gz: 7eb3fda6ec81613dbdd59dafe0b558ad8deef8fcac1b00dbe3a828e81d3f7ceb574aaba62a5749bc877dabe09a30294529446e79c62b52c5ac2d8d137fbaa56e
+  metadata.gz: 8ed780a081d43467792c2386114e150f381a45bcc252b1498598530af5522446b3a6e47897af1921de19873c026f2cf6e048f39035b41d9fb6a887498693925c
+  data.tar.gz: 74f09536225b22137482d27d8b3de55326e06b81a27e9f24274cdb8dc12a516ca35b39e0fb2e23af2ccecd6d799234a53bd7cf6c415a222fd60abe1f9db17485

data/lib/hilbert/version.rb

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

data/lib/hilbert/world.rb

@@ -12,16 +12,25 @@ module Hilbert
         end
 
         def impl(logic_str)
-          # HOTFIX:
+          # HOTFIX: we need to ..
           return eval_rslt(logic_str, 'UNDEFINED') if @@propositions.empty?
-          str = (!!!!!!!(@@propositions.inject(:*) >= to_rb_obj(logic_str))).to_s
+          logic = (@@propositions.inject(:*) >= to_rb_obj(logic_str))
+          str = (!!!!!!!logic).to_s
           case str
           when 'TRUE'
             eval_rslt(logic_str, 'TRUE')
           when 'FALSE'
             eval_rslt(logic_str, 'FALSE')
           else
-            eval_rslt(logic_str, 'UNDEFINED')
+            str = (!!!!!!!(@@propositions.inject(:*) * logic)).to_s
+            case str
+            when 'TRUE'
+              eval_rslt(logic_str, 'TRUE')
+            when 'FALSE'
+              eval_rslt(logic_str, 'FALSE')
+            else
+              eval_rslt(logic_str, 'UNDEFINED')
+            end
           end
         end
 

data/test/interpreter/test_propositional_logic.rb

@@ -10,7 +10,7 @@ class TestPropositionalLogic < TestInterpreterBase
     assert_equal(output, Hilbert::Iq.execute(input))
   end
 
-  def test_general
+  def test_ex1
     assert_iq_equal('Defined: A is TRUE', 'A')
     assert_iq_equal('Evaluate: A is TRUE', 'A?')
     assert_iq_equal('Evaluate: B is UNDEFINED', 'B?')
@@ -18,6 +18,12 @@ class TestPropositionalLogic < TestInterpreterBase
     assert_iq_equal('Evaluate: B is TRUE', 'B?')
   end
 
+  def test_ex2
+    assert_iq_equal('Evaluate: A is UNDEFINED', 'A?')
+    assert_iq_equal('Defined: ~A is TRUE', '~A')
+    assert_iq_equal('Evaluate: A is FALSE', 'A?')
+  end
+
   def test_syllogisms
     assert_iq_equal('Evaluate: A is UNDEFINED', 'A?')
     assert_iq_equal('Evaluate: A -> C  is UNDEFINED', 'A -> C ?')

data/test/world/test_prop_logic.rb

@@ -51,6 +51,7 @@ class TestPropLogic < MiniTest::Unit::TestCase
     assert_to_s("((Q|P)&(R|P))", $p + ($q * $r))
     assert_to_s("(P&Q&R)", $p * ($q * $r))
     assert_to_s("(P&(~P|Q))", $p * ($p >= $q))
+    assert_to_s("P", (~$p >= $p))
   end
 
   def test_tautology
@@ -59,9 +60,11 @@ class TestPropLogic < MiniTest::Unit::TestCase
     assert_to_s("TRUE", (($p >= $q) * ($q >= $r)) >= ($p >= $r))
     assert_to_s("TRUE", (~$p * ($p + $q)) >= ($q))
     assert_to_s("TRUE", (($p >= $q) * ($q >= $r) * $p) >= ($r))
+    assert_to_s("TRUE", ($p * ~$p) >= $r)
   end
 
   def test_no_tautology
     assert_to_s("FALSE", $p * $q * ~$p)
+    assert_to_s("FALSE", ~$p * (~$p >= $p))
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hilbert
 version: !ruby/object:Gem::Version
-  version: 0.0.2700110
+  version: 0.0.2700210
 platform: ruby
 authors:
 - gogotanaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dydx