magic_logic 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c4a0aaa6c54d1ee66d0c45910f2d060d7913eb1
-  data.tar.gz: 3710e90bb50ebf6272dcceb9ea20b3b684883ee9
+  metadata.gz: ef7642c257a20a87f44b3a7529b59afaa01b8745
+  data.tar.gz: 79a4e821e55b3d055bf8594771f7e77075e62022
 SHA512:
-  metadata.gz: e485ebfea4853ac66e84bea93978de5f14d44e48958f737df698ee05fe9bb1699eba0f86ad6b08467096b13cbc7f1dbbc1a6dea421baed38129860021294d00b
-  data.tar.gz: a42e2628b438320dda98333e58014b0e8e62e4a0bf87feae7646c9ff7f738aea9972196d016e8f4df45b83dbcee8c5a2e41a1155aab2935c2ca03ac51596738e
+  metadata.gz: a3545a1a98e76f514250e392d76617e808baeaf0630f7c3598e3d61a0171295a0f904ec88ac7b4806a1002cfae62c065d9cf8354afd937da0a1c3502011f4262
+  data.tar.gz: 9a51cea1d6ad64ac48f43da2568a91784d69a176a44a2cac911257a80d7bb55084a0a097ca9ea198036f992b38e00c0982a9cab84f2bba7f8f9b38e106ec326e

data/.travis.yml

@@ -1,3 +1,11 @@
 language: ruby
 rvm:
-  - 2.2.0
+  - 2.2
+  - 2.1
+  - 2.0.0
+  - 1.9.3
+  - jruby
+  - rbx-2
+
+notifications:
+  email: false

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in magic_logic.gemspec
+gem 'pry'
 gemspec

data/README.md

@@ -1,6 +1,34 @@
 # MagicLogic
 
-TODO: Write a gem description
+[![Gem Version](https://badge.fury.io/rb/magic_logic.svg)](http://badge.fury.io/rb/magic_logic) [![Build Status](https://travis-ci.org/gogotanaka/MagicLogic.svg?branch=master)](https://travis-ci.org/gogotanaka/MagicLogic)
+
+
+
+```rb
+p = P["It's sunny."]
+q = P["It's raining."]
+r = P["It's cloudy."]
+
+~(~p) >= p
+# =>TRUE
+
+(p * (p >= q)) >= q
+# =>TRUE
+
+((p >= q) * (q >= r)) >= (p >= r)
+# =>TRUE
+
+
+(~p * (p + q)) >= (q)
+# =>TRUE
+
+
+((p >= q) * (q >= r) * p) >= (r)
+# =>TRUE
+
+(p * ~p) >= r
+# =>TRUE
+```
 
 ## Installation
 

data/lib/magic_logic/version.rb

@@ -1,3 +1,3 @@
 module MagicLogic
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/magic_logic.rb

@@ -2,34 +2,34 @@ require "magic_logic/version"
 
 module MagicLogic
   module Operator
-    def ~@
-      if    is_neg?  then p
-      elsif is_form? then vars.map(&:~).inject(reope)
-      else                NEG.new(self)
-      end
-    end
-
-    def *(q)
-      case q
-      when Taut  then self
-      when UTaut then $utout
-      when self  then self
-      else
-        if neg?(q) then $utout
-        else            FORM.new([self, q], :*)
+    def _ ope, l, r
+      ope == :+ ? l : r
+    end
+
+    [:+, :*].each do |ope|
+      define_method(ope) do |q|
+        case q
+        when Taut  then _ ope, $tout, self
+        when UTaut then _ ope, self, $utout
+        when self  then self
+        else
+          if neg?(q)
+            (_ ope, $tout, $utout)
+          elsif is_form?(ope.to_sym) && include?(q)
+            self
+          elsif q.is_form?(ope) && q.include?(self)
+            q
+          else
+            FORM.new([self, q], ope)
+          end
         end
       end
     end
 
-    def +(q)
-      case q
-      when Taut  then $tout
-      when UTaut then self
-      when self  then self
-      else
-        if neg?(q) then $tout
-        else            FORM.new([self, q], :+)
-        end
+    def ~@
+      if    is_neg?  then p
+      elsif is_form? then vars.map(&:~).inject(_ ope, :*, :+)
+      else                NEG.new(self)
       end
     end
 
@@ -52,7 +52,7 @@ module MagicLogic
     end
 
     def is_form?(ope=nil)
-      return is_a?(FORM) && @ope == ope if ope
+      return is_a?(FORM) && self.ope == ope if ope
       is_a?(FORM)
     end
 
@@ -68,8 +68,8 @@ module MagicLogic
       false
     end
 
-    def dpll!
-      !!!!!!!!!!!!self
+    def dpll
+      !!!!!!!!!!!!!!!!!!self
     end
   end
 
@@ -99,27 +99,31 @@ module MagicLogic
 
   class Atom < Struct.new(:p)
     include Base
-    def to_s;          p.to_s      end
-    def !@;            self        end
-    def depth;         1           end
+    def to_s;  p.to_s end
+    def !@;    self   end
+    def depth; 1      end
+
+    class << self
+      alias [] new
+    end
   end
+  P = Atom
 
   class NEG < Struct.new(:p)
     include Base
-    def to_s;          "~#{p}"      end
-    def !@;             ~(!p)       end
-    def depth;          p.depth+1   end
+    def to_s;  "~#{p}"    end
+    def !@;     ~(!p)     end
+    def depth;  p.depth+1 end
   end
 
-  class FORM
+  class FORM < Struct.new(:vars, :ope)
     include Base
-    attr_reader :vars, :ope
     def initialize(vars, ope)
-      @vars = vars.map { |var| var.is_form?(ope) ? var.vars : var }.flatten
-      @ope = ope
+      self.vars = vars.map { |var| var.is_form?(ope) ? var.vars : var }.flatten
+      self.ope = ope
     end
 
-    def to_s; "(#{vars.map(&:to_s).join(loope)})" end
+    def to_s; "(#{vars.map(&:to_s).join(_ ope, '|', '&')})" end
 
     def !@
       if is_or? && (and_form = vars.find { |var| var.is_and? })
@@ -137,14 +141,6 @@ module MagicLogic
       vars.include?(p)
     end
 
-    def loope
-      ope == :* ? '&' : '|'
-    end
-
-    def reope
-      is_and? ? :+ : :*
-    end
-
     private
       def are_there_neg?
         pvars = vars.reject { |var| var.is_neg? }
@@ -154,4 +150,10 @@ module MagicLogic
         }
       end
   end
+
+  class ::Array
+    def >>(con)
+      inject($tout) { |s, p| s * p } >= con
+    end
+  end
 end

data/test/minitest_helper.rb

@@ -1,4 +1,8 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'magic_logic'
-
+require 'pry'
 require 'minitest/autorun'
+
+def assert_to_s(exp, obj)
+  assert_equal(exp, obj.dpll.to_s)
+end

data/test/test_magic_logic.rb

@@ -1,72 +1,77 @@
 require 'minitest_helper'
 include MagicLogic
 class TestMagicLogic < MiniTest::Unit::TestCase
-  $p = Atom.new(:P)
-  $q = Atom.new(:Q)
-  $r = Atom.new(:R)
+  $p = P['P']
+  $q = P['Q']
+  $r = P['R']
 
   def setup
 
   end
   def assert_to_s(exp, obj)
-    assert_equal(exp, ((!!!!!!!obj).to_s))
+    assert_equal(exp, obj.dpll.to_s)
   end
 
   def test_utils
-    assert_equal(true, $p.neg?(~$p))
-    assert_equal(true, (~$p).neg?($p))
+    assert_equal(true,  $p.neg?(~$p))
+    assert_equal(true,  (~$p).neg?($p))
     assert_equal(false, ($p).neg?($p))
     assert_equal(false, ($p).neg?($p))
-    assert_equal(true, ($p + $q).include?($p))
-    assert_equal(true, ($p + $q).include?($q))
+    assert_equal(true,  ($p + $q).include?($p))
+    assert_equal(true,  ($p + $q).include?($q))
   end
 
   def test_0_1
-    assert_to_s("TRUE", $p + $tout)
-    assert_to_s("TRUE", $tout + $p)
-    assert_to_s("P", $p + $utout)
-    assert_to_s("P", $utout + $p)
-    assert_to_s("TRUE", $p + ~$p)
-    assert_to_s("TRUE", ~$p + $p)
+    assert_to_s("TRUE", $p + $tout  )
+    assert_to_s("TRUE", $tout + $p  )
+    assert_to_s("P",    $p + $utout )
+    assert_to_s("P",    $utout + $p )
+    assert_to_s("TRUE", $p + ~$p    )
+    assert_to_s("TRUE", ~$p + $p    )
 
-    assert_to_s("P", $p * $tout)
-    assert_to_s("P", $tout * $p)
-    assert_to_s("FALSE", $p * $utout)
-    assert_to_s("FALSE", $utout * $p)
-    assert_to_s("FALSE", $p * ~$p)
-    assert_to_s("FALSE", ~$p * $p)
+    assert_to_s("P",     $p * $tout  )
+    assert_to_s("P",     $tout * $p  )
+    assert_to_s("FALSE", $p * $utout )
+    assert_to_s("FALSE", $utout * $p )
+    assert_to_s("FALSE", $p * ~$p    )
+    assert_to_s("FALSE", ~$p * $p    )
   end
 
   def test_basis
-    assert_to_s("P", $p)
-    assert_to_s("(P|Q)", $p + $q)
-    assert_to_s("(P&Q)", $p * $q)
-    assert_to_s("~P", ~$p)
-    assert_to_s("(~P|Q)", $p >= $q)
-    assert_to_s("((~P|Q)&(~Q|P))", $p <=> $q)
+    assert_to_s("P",               $p        )
+    assert_to_s("(P|Q)",           $p + $q   )
+    assert_to_s("(P&Q)",           $p * $q   )
+    assert_to_s("~P",              ~$p       )
+    assert_to_s("(~P|Q)",          $p >= $q  )
+    assert_to_s("((~P|Q)&(~Q|P))", $p <=> $q )
   end
 
   def test_main
-    assert_to_s("(~P&~Q)", ~($p + $q))
-    assert_to_s("(~P|~Q)", ~($p * $q))
-    assert_to_s("P", ~(~$p))
-    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))
+    assert_to_s("(~P&~Q)",       ~($p + $q)      )
+    assert_to_s("(~P|~Q)",       ~($p * $q)      )
+    assert_to_s("P",             ~(~$p)          )
+    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
-    assert_to_s("TRUE", ~(~$p) >= $p)
-    assert_to_s("TRUE", ($p * ($p >= $q)) >= $q)
-    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)
+    assert_to_s("TRUE", ~(~$p) >= $p                            )
+    assert_to_s("TRUE", ($p * ($p >= $q)) >= $q                 )
+    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))
+    assert_to_s("FALSE", $p * $q * ~$p     )
+    assert_to_s("FALSE", ~$p * (~$p >= $p) )
   end
+  #
+  # def test_hoo
+  #   assert_to_s("TRUE", [$p] >> $p)
+  #   assert_to_s("TRUE", [$p >= $q, $q >= $r] >> $p >= $r)
+  # end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magic_logic
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - gogotanaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Magic logic