prop_logic 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77ccbf85c3d54fc4d5bcd5032353a28e74e6d612
-  data.tar.gz: dccfb3cf95f54aeeeb6a1cfd649d107177ea47da
+  metadata.gz: 3ed096886dc984eabcd875c578b78a074b5c8b90
+  data.tar.gz: e449635063d3c36226d7efae7db50d0aaddc26be
 SHA512:
-  metadata.gz: 3e6ea89510d51a1ffe984a38304194d6137c0b31bf47b9b798cfca56dce12d5e9a697a70e2475470d0608380fedd4aa31833f117fc0ab155f4747ed5dc558dd6
-  data.tar.gz: ae70b208a30819b3302e1deb9559ee31b5c9266ad4ad8640ae20d4a214b8d3a92a96b43a8e6a45d4226866edc36e8aa74e70954151935bcaa5df01cac7b7b3c2
+  metadata.gz: 8635b171e757d2e5bde2f2e16cf37baae110780dedaec0d76b703ae5c5c7189ca3095e45d8d4f31db3d4feb957c6bb990c38a782ad633544623b7f2e4e8067f6
+  data.tar.gz: 66febccd6887ec890e1e56aca6d6929c13381843d2953fc32b30233f0ac528ac9940482cb7eb08dfba5108c01016963d8198fb42a340de31476c40f31ccefa94

data/.gitignore

@@ -8,3 +8,5 @@
 /spec/reports/
 /tmp/
 /vendor/
+/.ruby-version
+/.vscode/

data/CHANGELOG.md

@@ -1,9 +1,13 @@
+# Ver. 0.1.3 (2016/03/11)
+- Code cleanup
+- save `PropLogic.sat_solver` to module instance variable (no interface change)
+
 # 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 
+- And/or terms with duplicated subterms are no longer regarded as reduced
 
 # Ver. 0.1.0 (2016/01/27)
 Initial version

data/lib/prop_logic/and_term.rb

@@ -26,12 +26,12 @@ module PropLogic
       negated_variales = not_terms.map{|t| t.terms[0]}
       @is_reduced = false unless (negated_variales & @terms).empty?
     end
-    
+
     def to_s(in_term = false)
       str = @terms.map(&:to_s_in_term).join(' & ')
       in_term ? "( #{str} )" : str
     end
-    
+
     def nnf?
       @is_nnf
     end
@@ -39,7 +39,7 @@ module PropLogic
     def reduced?
       @is_reduced
     end
-    
+
     def reduce
       return self if reduced?
       reduced_terms = @terms.map(&:reduce).uniq
@@ -57,12 +57,12 @@ module PropLogic
         Term.get self.class, *reduced_terms
       end
     end
-    
+
     def cnf?
       return false unless reduced?
       @terms.all?(&:cnf?)
     end
-    
+
     def to_cnf
       return super unless reduced?
       return self if cnf?
@@ -70,13 +70,13 @@ module PropLogic
       without_pools = all_and(*@terms.map{|t| t.tseitin(pool)})
       all_and(without_pools, *pool)
     end
-    
+
     def tseitin(pool)
       val = Variable.new
       terms = @terms.map{|t| t.cnf? ? t : t.tseitin(pool)}
       pool.concat terms.map{|t| ~val | t }
       val
     end
-    
+
   end
 end

data/lib/prop_logic/constants.rb

@@ -5,28 +5,28 @@ module PropLogic
     def variables
       []
     end
-  
+
     def to_cnf
       self
     end
-    
+
   end
-  
+
   class TrueConstant < Constant
     include Singleton
     def to_s(*)
       'true'
     end
-    
+
     def assign(trues, falses, variables = nil)
       if falses.include?(self)
         raise ArgumentError, 'Contradicted assignment'
       end
       self
     end
-    
+
   end
-  
+
   class FalseConstant < Constant
     include Singleton
     def to_s(*)
@@ -39,7 +39,7 @@ module PropLogic
       self
     end
   end
-  
+
   True = TrueConstant.instance.freeze
   False = FalseConstant.instance.freeze
 end

data/lib/prop_logic/functions.rb

@@ -4,26 +4,26 @@ module PropLogic
     def all_or(*args)
       Term.get OrTerm, *args
     end
-    
+
     def all_and(*args)
       Term.get AndTerm, *args
     end
-    
+
     def new_variable(*args)
       Variable.new *args
     end
   end
-  
+
   extend Functions
   include Functions
   public_class_method(*Functions.private_instance_methods(false))
-  
+
   def all_combination(arr)
     0.upto(arr.length) do |num|
       arr.combination(num){|c| yield c}
     end
   end
-  
+
   module_function :all_combination
-  
+
 end

data/lib/prop_logic/not_term.rb

@@ -3,15 +3,15 @@ module PropLogic
     def initialize(term)
       @terms = [term].freeze
     end
-    
+
     def to_s(*)
       "~" + @terms[0].to_s(true)
     end
-    
+
     def nnf?
       @terms[0].is_a?(Variable)
     end
-    
+
     def to_nnf
       term = @terms[0]
       case term
@@ -27,11 +27,11 @@ module PropLogic
         all_and(*term.terms.map{|t| (~t).to_nnf})
       end
     end
-    
+
     def reduced?
       nnf? && ! (@terms[0].is_a?(Constant))
     end
-    
+
     def reduce
       return self if reduced?
       reduced_term = @terms[0].reduce
@@ -44,7 +44,7 @@ module PropLogic
         (~reduced_term).to_nnf
       end
     end
-    
+
     def to_cnf
       if reduced?
         self
@@ -52,7 +52,7 @@ module PropLogic
         super
       end
     end
-    
+
     def tseitin(pool)
       if nnf?
         self
@@ -62,7 +62,7 @@ module PropLogic
         raise 'Non-NNF terms cannot be converted to Tseitin form.' + self.to_s
       end
     end
-    
+
     alias_method :cnf?, :reduced?
   end
-end
+end

data/lib/prop_logic/or_term.rb

@@ -2,7 +2,7 @@ module PropLogic
   class OrTerm < Term
     def initialize(*terms)
       @terms = terms.map{|t| t.is_a?(OrTerm) ? t.terms : t}.flatten.freeze
-      @is_nnf = @terms.all?(&:nnf?) 
+      @is_nnf = @terms.all?(&:nnf?)
       @is_reduced = @is_nnf && @terms.all? do |term|
         if term.is_a?(Constant) || !(term.reduced?)
           false
@@ -25,20 +25,20 @@ module PropLogic
       negated_variales = not_terms.map{|t| t.terms[0]}
       @is_reduced = false unless (negated_variales & @terms).empty?
     end
-    
+
     def to_s(in_term = false)
       str = @terms.map(&:to_s_in_term).join(' | ')
       in_term ? "( #{str} )" : str
     end
-    
+
     def nnf?
       @is_nnf
     end
-    
+
     def reduced?
       @is_reduced
     end
-    
+
     def reduce
       return self if reduced?
       reduced_terms = @terms.map(&:reduce).uniq
@@ -55,12 +55,12 @@ module PropLogic
         Term.get self.class, *reduced_terms
       end
     end
-    
+
     def cnf?
       return false unless reduced?
       ! @terms.any?{ |term| term.is_a?(AndTerm) }
     end
-    
+
     def to_cnf
       return super unless reduced?
       return self if cnf?
@@ -68,12 +68,12 @@ module PropLogic
       without_pools = tseitin(pool)
       all_and(without_pools, *pool)
     end
-    
+
     def tseitin(pool)
       val = Variable.new
       terms = @terms.map{|t| t.tseitin(pool)}
       pool << (~val | all_or(*terms))
-      val      
+      val
     end
 
   end

data/lib/prop_logic/sat_solver.rb

@@ -1,13 +1,18 @@
+# :nodoc:
 module PropLogic
-  #default
-  @@sat_solver = PropLogic::BruteForceSatSolver
-  
-  def self.sat_solver
-    @@sat_solver
-  end
-  
-  def self.sat_solver=(engine)
-    raise TypeError unless engine.respond_to?(:call)
-    @@sat_solver = engine
+  # default SAT solver.
+  # only intended for test use.
+  @sat_solver = PropLogic::BruteForceSatSolver
+
+  class << self
+    # @return [Object] current SAT solver
+    attr_reader :sat_solver
+
+    # @param [Object] new SAT solver.
+    #   It must have #call(term) method
+    def sat_solver=(engine)
+      raise TypeError unless engine.respond_to?(:call)
+      @sat_solver = engine
+    end
   end
 end

data/lib/prop_logic/term.rb

@@ -4,52 +4,52 @@ require 'prop_logic/functions'
 module PropLogic
   class Term
     include Functions
-  
+
     def initialize
       raise NotImplementedError, 'Term cannot be initialized'
     end
-    
+
     def initialize_copy(*)
       raise TypeError, 'Term cannot be duplicated (immutable, not necessary)'
     end
-    
+
     class << self
       protected :new
     end
 
     attr_reader :terms
-    
+
     def and(*others)
       others.unshift self
       Term.get AndTerm, *others
     end
-    
+
     alias_method :&, :and
-    
+
     def or(*others)
       others.unshift self
       Term.get OrTerm, *others
     end
-    
+
     alias_method :|, :or
-    
+
     def not
       Term.get NotTerm, self
     end
-    
+
     alias_method :~, :not
     alias_method :-@, :not
-    
+
     def then(other)
       Term.get ThenTerm, self, other
     end
-    
+
     alias_method :>>, :then
-    
+
     def to_s_in_term
       to_s true
     end
-    
+
     def to_nnf
       if nnf?
         self
@@ -57,11 +57,11 @@ module PropLogic
         Term.get self.class, *@terms.map(&:to_nnf)
       end
     end
-    
+
     def nnf?
       false
     end
-    
+
     def reduce
       if reduced?
         self
@@ -69,15 +69,15 @@ module PropLogic
         Term.get self.class, *@terms.map(&:reduce)
       end
     end
-    
+
     def reduced?
       false
     end
-    
+
     def to_cnf
       reduce.to_cnf
     end
-    
+
     def self.validate_terms(*terms)
       raise ArgumentError, 'no terms given' if terms.empty?
       terms.map do |term|
@@ -93,16 +93,16 @@ module PropLogic
         end
       end
     end
-    
+
     private_class_method :validate_terms
-    
+
     def self.get(klass, *terms)
       @table ||= Ref::WeakValueMap.new
       terms = validate_terms(*terms)
       if klass == AndTerm || klass == OrTerm
         terms = terms.map{|t| t.is_a?(klass) ? t.terms : t}.flatten
         return terms[0] if terms.length == 1
-      end 
+      end
       key = klass.name + terms.map(&:object_id).join(',')
       return @table[key] if @table[key]
       ret = klass.__send__ :new, *terms
@@ -111,15 +111,15 @@ module PropLogic
       ret.variables
       ret.freeze
     end
-    
+
     def cnf?
       false
     end
-    
+
     def variables
       @variables ||= @terms.map(&:variables).flatten.uniq
     end
-    
+
     def assign(trues, falses, variables = nil)
       # contradicted assignment
       raise ArgumentError, 'Contradicted assignment' unless (trues & falses).empty?
@@ -133,26 +133,26 @@ module PropLogic
       end
       Term.get self.class, *assigned_terms
     end
-    
+
     def assign_true(*variables)
       assign variables, []
     end
-    
+
     def assign_false(*variables)
       assign [], variables
     end
-        
+
     def sat?
       PropLogic.sat_solver.call(self)
     end
-    
+
     def unsat?
       sat? == false
     end
-    
+
     def equiv?(other)
-      ((self | other) & (~self | ~other)).unsat? 
+      ((self | other) & (~self | ~other)).unsat?
     end
-    
+
   end
 end

data/lib/prop_logic/then_term.rb

@@ -3,20 +3,20 @@ module PropLogic
     def initialize(term1, term2)
       @terms = [term1, term2].freeze
     end
-    
+
     def to_s(in_term = false)
       str = "#{@terms[0].to_s(true)} => #{@terms[1].to_s(true)}"
       in_term ? "( #{str} )" : str
     end
-    
+
     def nnf?
       false
     end
-    
+
     def to_nnf
       (~@terms[0]).to_nnf | @terms[1].to_nnf
     end
-    
+
     def reduce
       to_nnf.reduce
     end

data/lib/prop_logic/variable.rb

@@ -5,37 +5,37 @@ module PropLogic
       @terms = [].freeze
       freeze
     end
-    
+
     public_class_method :new
-    
+
     def to_s(*)
       @name
     end
-    
+
     def nnf?
       true
     end
-    
+
     def reduced?
       true
     end
-    
+
     def to_cnf
       self
     end
-    
+
     def tseitin(pool)
       self
     end
-    
+
     def cnf?
       true
     end
-    
+
     def variables
       [self]
     end
-    
+
     def assign(trues, falses, variables = nil)
       if trues.include? self
         True

data/lib/prop_logic/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prop_logic
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jkr2255
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-03-11 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.7
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Propositional logic for Ruby