prop_logic-minisat 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58166c821ac76416df796855ec4d203773622c36
-  data.tar.gz: 043106dc5a4e9a44dd5e019b451fc39afdb3ffec
+  metadata.gz: df49bc6a7fe99cd4e8044c5144f665d70e9603bc
+  data.tar.gz: 2b5e486b052007bf599bce2d9ace0e16b4e75276
 SHA512:
-  metadata.gz: fafbfa7566a822727b7b14c1249a64a3759c61c34da2f88c04593055aeffa4009e7bf3e9f417c5b177443508d261881d71f7acb8bd6897667c144b4c2b8f788c
-  data.tar.gz: 974fa6a311e00da20d0b70bf2969e428ab409fafba8136287cb2427a3acb952aa54f10bf6cb5c2a9ff2dec34bd85d730b4c72335dafad9e32ae13282a52b32eb
+  metadata.gz: 09c64b2a20fa00c62e29090d5c25fb005b956839b64733986ecd0544d97d7f21b3a16ccf791a45bcf0da774e0465cc132147cd191bd672be4aab850121915bff
+  data.tar.gz: d945b3604d337a4a8f39a99c1fd88f98ce66cdd3a97ee6ac1b3fd21c15e6ecfb631dbd3f742fc1adbdeae6abe25119e137b3f2020ec2e7d9735989685a46ff0b

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 /vendor
+/.vscode/

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+# Ver. 0.2.0 (Mar 27, 2016)
+- Introduce incremental solver
+- requires `prop_logic >= 0.2.0`
+
+# Ver. 0.1.0 (Jan 18, 2016)
+- Initial version

data/lib/prop_logic/minisat.rb

@@ -1,62 +1,16 @@
 require 'prop_logic'
 require 'minisat'
-require "prop_logic/minisat/version"
+require 'prop_logic/minisat/version'
+require 'prop_logic/minisat/incremental_solver'
 
 module PropLogic
   module Minisat
-    class Solver
+    module Solver
       def self.call(term)
-        new.sat?(term)
+        IncrementalSolver.new(term).sat?
       end
-      
-      private_class_method :new      
-      
-      def initialize
-        @solver = ::MiniSat::Solver.new
-      end
-      
-      def parse_variable_or_not(term)
-        if term.is_a?(Variable)
-          @variable_map[term]
-        else
-          -(@variable_map[term.terms[0]])
-        end
-      end
-      
-      def parse_or_term(term)
-        if term.is_a?(OrTerm)
-          @solver << term.terms.map{ |t| parse_variable_or_not(t) }
-        else
-          @solver << parse_variable_or_not(term)
-        end
-      end
-      
-      def sat?(term)
-        cnf = term.to_cnf
-        orig_variables = term.variables
-        # no need to use SAT solver
-        return false if cnf == False
-        if cnf == True
-          return True if orig_variables.length == 0
-          return PropLogic.all_and(*orig_variables)
-        end
-        #prepare for solver
-        using_variables = cnf.variables
-        @variable_map = {}
-        using_variables.each{ |v| @variable_map[v] = @solver.new_var }
-        if cnf.is_a?(AndTerm)
-          cnf.terms.each{ |t| parse_or_term t}
-        else
-          parse_or_term term
-        end
-        return false unless @solver.solve
-        # return value generation
-        assign_variables = using_variables & orig_variables
-        extra_variables = orig_variables - assign_variables
-        PropLogic.all_and(*assign_variables.map{ |v| @solver[@variable_map[v]] ? v : -v }, *extra_variables)
-      end
-      
     end
   end
   PropLogic.sat_solver = Minisat::Solver
+  PropLogic.incremental_solver = Minisat::IncrementalSolver
 end

data/lib/prop_logic/minisat/incremental_solver.rb

@@ -0,0 +1,100 @@
+require 'prop_logic'
+require 'minisat'
+
+module PropLogic
+  module Minisat
+    #
+    # Incremental solver using minisat.
+    # @note currently only Ruby part is incremental.
+    #
+    class IncrementalSolver
+      # constructor.
+      # @param [Term] initial term for starting SAT solver.
+      def initialize(initial_term)
+        @solver = ::MiniSat::Solver.new
+        # automagically add variable in Hash
+        @variables_map = Hash.new { |h, k| h[k] = @solver.new_var }
+        @terms = []
+        @variables = []
+        # true if False was added
+        @contradicted = false
+        add initial_term
+      end
+
+      # @return [Array] containing variables
+      def variables
+        @variables.dup
+      end
+
+      def term
+        return False if @contradicted
+        return True if @terms.empty?
+        PropLogic.all_and(*@terms)
+      end
+
+      # add terms to this solver.
+      # @return [IncrementalSolver] returns self
+      def add(*terms)
+        terms.each { |term| add_one_term term }
+        self
+      end
+
+      alias_method :<<, :add
+
+      # check if terms are satisfiable.
+      # @return [Term] term satisfying conditions.
+      # @return [false] if unsatisfied.
+      def sat?
+        return false if @contradicted
+        return True if variables.empty?
+        vars = []
+        unless @terms.empty?
+          return false unless @solver.solve
+          ret_vars = variables & @variables_map.keys
+          vars = ret_vars.map { |k| @solver[@variables_map[k]] ? k : ~k }
+        end
+        extra_vars = variables - @variables_map.keys
+        PropLogic.all_and(*vars, *extra_vars)
+      end
+
+      private
+
+      def sat_variable(maybe_inversed_variable)
+        case maybe_inversed_variable
+        when Variable
+          @variables_map[maybe_inversed_variable]
+        when NotTerm
+          -@variables_map[maybe_inversed_variable.terms[0]]
+        else
+          raise TypeError
+        end
+      end
+
+      def add_or_term(term)
+        vars = if term.is_a?(OrTerm)
+                 term.terms.map { |v| sat_variable v }
+               else
+                 [sat_variable(term)]
+               end
+        @solver << vars
+        @terms << term
+      end
+
+      def add_one_term(term)
+        @variables |= term.variables
+        term = term.to_cnf
+        return if term == True
+        if term == False
+          @contradicted = true
+          return
+        end
+        if term.is_a?(AndTerm)
+          term.terms.each { |t| add_or_term t }
+        else
+          add_or_term term
+        end
+      end
+
+    end
+  end
+end

data/lib/prop_logic/minisat/version.rb

@@ -1,5 +1,5 @@
 module PropLogic
   module Minisat
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/prop_logic-minisat.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "prop_logic", '>= 0.1.1'
+  spec.add_dependency "prop_logic", '>= 0.2.0'
   spec.add_dependency "ruby-minisat", '>= 2.2.0'
   spec.required_ruby_version = '>= 2.0.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prop_logic-minisat
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jkr2255
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prop_logic
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
-  prerelease: false
-  type: :runtime
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: ruby-minisat
   requirement: !ruby/object:Gem::Requirement
@@ -31,13 +31,13 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -45,13 +45,13 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -59,13 +59,13 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -73,13 +73,13 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  prerelease: false
-  type: :development
 description: 
 email:
 - magnesium.oxide.play@gmail.com
@@ -90,6 +90,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -97,6 +98,7 @@ files:
 - bin/console
 - bin/setup
 - lib/prop_logic/minisat.rb
+- lib/prop_logic/minisat/incremental_solver.rb
 - lib/prop_logic/minisat/version.rb
 - prop_logic-minisat.gemspec
 homepage: https://github.com/jkr2255/prop_logic-minisat
@@ -119,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Minisat binding for PropLogic