hilbert 0.0.2700210 → 0.0.2700300

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5504e360e4fc6ff8787b6afb21fb32b73e1bf53
-  data.tar.gz: 3500645d88a619fc8e78962a003374deab4813bd
+  metadata.gz: 4cc36fbc59cc94de928020b2b2dac249d4e506df
+  data.tar.gz: 7477aad14d6b1aab2dfd326ea9a35cab85546b14
 SHA512:
-  metadata.gz: 8ed780a081d43467792c2386114e150f381a45bcc252b1498598530af5522446b3a6e47897af1921de19873c026f2cf6e048f39035b41d9fb6a887498693925c
-  data.tar.gz: 74f09536225b22137482d27d8b3de55326e06b81a27e9f24274cdb8dc12a516ca35b39e0fb2e23af2ccecd6d799234a53bd7cf6c415a222fd60abe1f9db17485
+  metadata.gz: 57add7b47e617dc4b20f0c4254e5a19581d8cd1edf653610c162d7cf69e0ca3a8e8971dfe9615621549b46c1c2e1eddc8e821ac5c777eba0772757db0cf5b412
+  data.tar.gz: 39682c6a58b60b81e788da0b0257400917d709974059ab3f428ed36d6efeba1c2ca0dc9d568dfead7bb872448d01b4d8869a2e49ebf4fc324437d9114452ae57

data/README.md

@@ -2,11 +2,11 @@
 
 [![Gem Version](https://badge.fury.io/rb/hilbert.svg)](http://badge.fury.io/rb/hilbert) [![Build Status](https://travis-ci.org/gogotanaka/Hilbert.svg?branch=master)](https://travis-ci.org/gogotanaka/Hilbert) [![Coverage Status](https://coveralls.io/repos/gogotanaka/Hilbert/badge.png?branch=master)](https://coveralls.io/r/gogotanaka/Hilbert?branch=master) [![Code Climate](https://codeclimate.com/github/gogotanaka/Hilbert/badges/gpa.svg)](https://codeclimate.com/github/gogotanaka/Hilbert) [![Dependency Status](https://gemnasium.com/gogotanaka/Hilbert.svg)](https://gemnasium.com/gogotanaka/Hilbert)
 
-## Do you know the one best language in this world?
+### Do you know the one best language in this world?
 
-#### I believe mathematics(logic) is absolutely that one.
+#### I believe mathematics (logic) is absolutely that language.
 
-## How can we deal something as great as mathematics in a discrete world?
+### How can we deal something as great as mathematics in a discrete world?
 
 #### Hilbert is the answer.
 
@@ -22,9 +22,7 @@ Hilbert lets you have a sense of mathematics using a keyboard, the same as you w
 
 ## Demo
 
-The code below is input and output for the Hilbert interpreter
-
-(you can try it by `hilbert -i`)
+The code below is input and output for the Hilbert interpreter. (You can try it with `hilbert -i`.)
 
 ### Logic
 ```coffeescript
@@ -35,8 +33,8 @@ Q -> R
 
 P | Q # P or Q
 ~P    # not P
-Q?    # Q is TURE?
-=> TURE
+Q?    # Q is TRUE?
+=> TRUE
 ```
 
 ### Differentiate
@@ -109,10 +107,12 @@ f(1, 2)
 
 ## How to use
 
-Install hilbert gem.
+Install the `hilbert` gem.
 
     $ gem install hilbert
 
+Note to OS X Users: If the above `gem` command does not work with the stock version of Ruby (due to not being able to build a target indicated in the Makefile), then you will need to install a version of Ruby that includes the appropriate header files. Using [homebrew](http://brew.sh/) (`brew install ruby`) will suffice.
+
 ## Interpreter
 
     $ hilbert -i
@@ -168,6 +168,6 @@ end
 
 ## Contributing
 
-Any PRs or issues are welcome. (Please make to `develop` branch)
+Any PRs or issues are welcome. (Please make them to [the `develop` branch](https://github.com/gogotanaka/Hilbert/tree/develop).)
 
-You can become a commiter, even if you only commit once.
+You can become a committer, even if you only commit once.

data/lib/hilbert/parser.rb

@@ -37,7 +37,7 @@ module Hilbert
           lexed.parsed!(rslt, $2)
 
         when /:(EVALOGIC)(\d+)/
-          value = lexed.get_value($1).delete("?\n")
+          value = lexed.get_value($1).rm(/ *\?/).delete("\n")
           rslt = $world.impl value
           lexed.parsed!(rslt, $2)
 

data/lib/hilbert/version.rb

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

data/lib/hilbert/world/propositional_logic.rb

@@ -71,6 +71,10 @@ module Hilbert
         def include?(p)
           false
         end
+
+        def dpll!
+          !!!!!!!!!!!!self
+        end
       end
 
       module Base; include Operator; include Utils end

data/lib/hilbert/world.rb

@@ -15,19 +15,20 @@ module Hilbert
           # HOTFIX: we need to ..
           return eval_rslt(logic_str, 'UNDEFINED') if @@propositions.empty?
           logic = (@@propositions.inject(:*) >= to_rb_obj(logic_str))
-          str = (!!!!!!!logic).to_s
+          str = logic.dpll!.to_s
           case str
           when 'TRUE'
             eval_rslt(logic_str, 'TRUE')
           when 'FALSE'
             eval_rslt(logic_str, 'FALSE')
           else
-            str = (!!!!!!!(@@propositions.inject(:*) * logic)).to_s
+            logic = (@@propositions.inject(:*) >= (~to_rb_obj(logic_str)))
+            str = logic.dpll!.to_s
             case str
             when 'TRUE'
-              eval_rslt(logic_str, 'TRUE')
-            when 'FALSE'
               eval_rslt(logic_str, 'FALSE')
+            when 'FALSE'
+              eval_rslt(logic_str, 'TRUE')
             else
               eval_rslt(logic_str, 'UNDEFINED')
             end

data/test/interpreter/test_propositional_logic.rb

@@ -24,12 +24,25 @@ class TestPropositionalLogic < TestInterpreterBase
     assert_iq_equal('Evaluate: A is FALSE', 'A?')
   end
 
+  def test_ex3
+    assert_iq_equal('Defined: A <-> B is TRUE', 'A <-> B')
+    assert_iq_equal('Defined: B is TRUE', 'B')
+    assert_iq_equal('Evaluate: A is TRUE', 'A?')
+  end
+
+  def test_ex4
+    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 ?')
+    assert_iq_equal('Evaluate: A -> C is UNDEFINED', 'A -> C ?')
     assert_iq_equal('Defined: A -> B is TRUE', 'A -> B')
     assert_iq_equal('Defined: B -> C is TRUE', 'B -> C')
-    assert_iq_equal('Evaluate: A -> C  is TRUE', 'A -> C ?')
+    assert_iq_equal('Evaluate: A -> C is TRUE', 'A -> C ?')
   end
 
   def test_paradox?

metadata

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