prop_logic 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e6c98eb22a2749c09f37c1e6d696a8fd579b841
-  data.tar.gz: 9899d1f4ca58451e53382c9087cddb41dc10cbbe
+  metadata.gz: 77ccbf85c3d54fc4d5bcd5032353a28e74e6d612
+  data.tar.gz: dccfb3cf95f54aeeeb6a1cfd649d107177ea47da
 SHA512:
-  metadata.gz: 3b7a05895cf515208b136022a18464b176ce25ca246f4f783b6af01da4c56a92c859b94d8039f2d2a78167d2260639f682f0782235b2cb21ad5aeb97de638b40
-  data.tar.gz: 6b63a27d59cd559090f9d119819bbbdabcf1b49a21004974fdc31c53990d9f6bd88eebe30c05320417353f4d3a06cd2f98258efbceb356c156cf0842bbdb28ce
+  metadata.gz: 3e6ea89510d51a1ffe984a38304194d6137c0b31bf47b9b798cfca56dce12d5e9a697a70e2475470d0608380fedd4aa31833f117fc0ab155f4747ed5dc558dd6
+  data.tar.gz: ae70b208a30819b3302e1deb9559ee31b5c9266ad4ad8640ae20d4a214b8d3a92a96b43a8e6a45d4226866edc36e8aa74e70954151935bcaa5df01cac7b7b3c2

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# Ver. 0.1.2 (2016/03/07)
+- Cache @variables (avoid recursive search)
+
 # Ver. 0.1.1 (2016/01/28)
 - `PropLogic.all_and`/`PropLogic.all_or` with less than one argument(s) behaviors fixed
 - And/or terms with duplicated subterms are no longer regarded as reduced 

data/README.md

@@ -1,6 +1,7 @@
 # PropLogic
 
 [![Build Status](https://travis-ci.org/jkr2255/prop_logic.svg?branch=master)](https://travis-ci.org/jkr2255/prop_logic)
+[![Gem Version](https://badge.fury.io/rb/prop_logic.svg)](https://badge.fury.io/rb/prop_logic)
 
 PropLogic implements propositional logic in Ruby, usable like normal variables.
 
@@ -57,6 +58,9 @@ diff = (~a | ~b).equiv?(~(a & b)) # true
 SAT solver bundled with this gem is brute-force solver (intended only for testing), so it is inappropriate to use for
 real-scale problems.
 
+In CRuby and Rubinius, bindings to MiniSat ([jkr2255/prop_logic-minisat](https://github.com/jkr2255/prop_logic-minisat)) is available.
+It is a plugin for this gem, so no code (except require and Gemfile) needs to be changed to use `prop_logic-minisat`.
+
 ## References
 `PropLogic::Term` is immutable, meaning that all calculations return new Terms.
 ### `PropLogic::Term` instance methods
@@ -141,4 +145,3 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 ## ToDo
 
 - Introduce special blocks to build terms inside
-- Add nontrivial SAT solver for practical usage

data/lib/prop_logic/and_term.rb

@@ -67,8 +67,8 @@ module PropLogic
       return super unless reduced?
       return self if cnf?
       pool = []
-      without_pools = PropLogic.all_and(*@terms.map{|t| t.tseitin(pool)})
-      PropLogic.all_and(without_pools, *pool)
+      without_pools = all_and(*@terms.map{|t| t.tseitin(pool)})
+      all_and(without_pools, *pool)
     end
     
     def tseitin(pool)

data/lib/prop_logic/functions.rb

@@ -1,5 +1,6 @@
 module PropLogic
   module Functions
+    module_function
     def all_or(*args)
       Term.get OrTerm, *args
     end
@@ -14,6 +15,8 @@ module PropLogic
   end
   
   extend Functions
+  include Functions
+  public_class_method(*Functions.private_instance_methods(false))
   
   def all_combination(arr)
     0.upto(arr.length) do |num|

data/lib/prop_logic/not_term.rb

@@ -22,9 +22,9 @@ module PropLogic
       when ThenTerm
         (~(term.to_nnf)).to_nnf
       when AndTerm
-        PropLogic.all_or(*term.terms.map{|t| (~t).to_nnf})
+        all_or(*term.terms.map{|t| (~t).to_nnf})
       when OrTerm
-        PropLogic.all_and(*term.terms.map{|t| (~t).to_nnf})
+        all_and(*term.terms.map{|t| (~t).to_nnf})
       end
     end
     

data/lib/prop_logic/or_term.rb

@@ -66,13 +66,13 @@ module PropLogic
       return self if cnf?
       pool = []
       without_pools = tseitin(pool)
-      PropLogic.all_and(without_pools, *pool)
+      all_and(without_pools, *pool)
     end
     
     def tseitin(pool)
       val = Variable.new
       terms = @terms.map{|t| t.tseitin(pool)}
-      pool << (~val | PropLogic.all_or(*terms))
+      pool << (~val | all_or(*terms))
       val      
     end
 

data/lib/prop_logic/term.rb

@@ -1,7 +1,10 @@
 require 'ref'
+require 'prop_logic/functions'
 
 module PropLogic
   class Term
+    include Functions
+  
     def initialize
       raise NotImplementedError, 'Term cannot be initialized'
     end
@@ -104,6 +107,8 @@ module PropLogic
       return @table[key] if @table[key]
       ret = klass.__send__ :new, *terms
       @table[key] = ret
+      # kick caching mechanism
+      ret.variables
       ret.freeze
     end
     
@@ -112,7 +117,7 @@ module PropLogic
     end
     
     def variables
-      @terms.map(&:variables).flatten.uniq
+      @variables ||= @terms.map(&:variables).flatten.uniq
     end
     
     def assign(trues, falses, variables = nil)

data/lib/prop_logic/version.rb

@@ -1,3 +1,3 @@
 module PropLogic
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/prop_logic.rb

@@ -1,11 +1,11 @@
 require "prop_logic/version"
 require "prop_logic/term"
+require 'prop_logic/functions'
 require "prop_logic/and_term"
 require "prop_logic/or_term"
 require "prop_logic/not_term"
 require "prop_logic/then_term"
 require 'prop_logic/variable'
 require 'prop_logic/constants'
-require 'prop_logic/functions'
 require 'prop_logic/brute_force_sat_solver'
 require 'prop_logic/sat_solver'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prop_logic
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jkr2255
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ref
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Propositional logic for Ruby