ravensat 1.0.0 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd6bb73a8f6668c36675461d24272ae8e02632c5b2d3f768b5a81347ad29956a
-  data.tar.gz: 48e4f44fa76bd1716b32ed98ddaa82d198cb83064e944269ecfd57ab21645860
+  metadata.gz: 430c194a8bc6d59ba234e117839a244c0ee4bb61b507615b1a12b1d52609013c
+  data.tar.gz: e2090935ff06835501061059e47156889e13bc9afe7c3a57746958afe6c4abb0
 SHA512:
-  metadata.gz: 5365bfdf37eeb55b5a7ccab53f0ecca8cf8c73ecdfcac2eb9c92ce843aa6fa2e77f711f14a9b00f37cb9a37bfade19c65ea38cbd3f7478398b0d1ef8a5cf416a
-  data.tar.gz: abf648c3097425241ae106e7ed42876f9c9a33e55bf4615cefc16c77943aedf62b0bd99fc6b9c2062147dbaf6c9b690b13f5a28204771e03934e4c59bdf98a9e
+  metadata.gz: 5500d691a90e8153d994db9c9fb0f5e4c0729232820fb41b7b6ddf1726a95090a783cf09c272e9459d139b2693effccb1c3e7e55625d15e269fc0595b5235327
+  data.tar.gz: 2e9f44f44ef99640f370eb2329059438670b84e743729e8d4eaa19d585cc02bab17d506c45324971b2034cba7a41af890081f03803ebb7155fafced6d5c5725f

data/README.md

@@ -1,24 +1,26 @@
-# Ravensat
-
 [![GitHub Actions](https://github.com/matsuda0528/ravensat/actions/workflows/main.yml/badge.svg)](https://github.com/matsuda0528/ravensat/actions/workflows/main.yml)
 [![Gem Version](https://badge.fury.io/rb/ravensat.svg)](https://badge.fury.io/rb/ravensat)
 [![LICENSE](https://img.shields.io/github/license/matsuda0528/ravensat)](https://opensource.org/licenses/MIT)
 
-[![GitHub Pages](https://img.shields.io/badge/GitHub%20Pages--brightgreen.svg?logo=github&style=social)](https://matsuda0528.github.io/ravensat/)
+<!-- [![GitHub Pages](https://img.shields.io/badge/GitHub%20Pages--brightgreen.svg?logo=github&style=social)](https://matsuda0528.github.io/ravensat/) -->
 
-Ravensat is an interface to SAT solver in Ruby.
+# Ravensat
 
+Ravensat provides an intuitive interface for working with SAT solver.
+SAT solver is a useful tool for solving various problems, but it is not user-friendly.
+Ravensat wraps the SAT solver and makes it easier to use.
 In order to use Ravensat, you need to install SAT solver.
 If you do not install SAT solver, it will use the one bundled in the gem.
 
 About [SAT](https://en.wikipedia.org/wiki/Boolean_satisfiability_problem), [SAT solver](https://en.wikipedia.org/wiki/SAT_solver)
 
 ## Description
-To solve SAT, we usually use SAT solver.
+To solve SAT(Boolean Satisfiability Problem), we usually use SAT solver.
 Now, let's solve the following SAT with SAT solver.
 
 $$(p_{1} \lor \lnot p_{5} \lor p_{4}) \land (\lnot p_{1} \lor p_{5} \lor p_{3} \lor p_{4}) \land (\lnot p_{3} \lor \lnot p_{4})$$
 
+To solve the above SAT, give it to the SAT solver.
 Most SAT solvers are input in [DIMACS Format](https://www.cs.utexas.edu/users/moore/acl2/manuals/current/manual/index-seo.php/SATLINK____DIMACS).
 Converting the example SAT to DIMACS Format yields the following.
 
@@ -34,22 +36,31 @@ However, when solving a large SAT, the following problems occur.
 - Need to create a file with thousands of lines.
 - Confusion arises because of the inability to name variables meaningfully.
 
-To solve these problems, Ravensat can be used.
+Therefore, we need an interface that can flexibly determine the names of variables and imperatively write loginal expressions.
+To achieve these requirements, we are developing Ravensat.
 Using Ravensat, propositional variables can be defined as local variables in Ruby.
 
 ```ruby
-fuji_is_the_highest_mountain_in_japan = Ravensat::VarNode.new
+John_is_a_male = Ravensat::VarNode.new
 ```
 
-In addition, you can write logical expressions intuitively.
+In addition, you can write logical expressions intuitively and imperatively.
 
 ```ruby
 x = Ravensat::VarNode.new
 y = Ravensat::VarNode.new
 
-(x | y) & (~x | y) # (x or y) and (not x or y)
+(x | y) & (~x | y)
 ```
 
+```ruby
+x = Ravensat::VarNode.new
+y = Ravensat::VarNode.new
+z = Ravensat::VarNode.new
+
+# (~x | ~y) & (~x | ~z) & (~y | ~z)
+Ravensat::Claw.pairwise_amo [x,y,z]
+```
 
 ## Installation
 
@@ -102,7 +113,7 @@ At least, we have confirmed that it works properly with [MiniSat](https://github
 If you do not use an external SAT solver, create a SAT solver object without any constructor arguments.
 In that case, **Arcteryx**(the very simple SAT solver built into Ravensat) will launch.
 
-### Extension Usage
+### Extension Usage(prototype)
 In Ravensat::Extension, C-like variable definitions are available.
 
 *Note: In Ravensat::Extension, all undefined variables and methods are caught by method_missing method.*
@@ -124,7 +135,6 @@ module Ravensat
 end
 ```
 
-### Extension Usage(CSP; Constraint Satisfaction Problem)
 It is possible to define integer variables and to describe some integer constraints.
 
 ```ruby

data/lib/ravensat/ast/node.rb

@@ -7,39 +7,14 @@ module Ravensat
       @children = []
     end
 
-    # def each
-    #   yield(self)
-    #   @children.each do |child|
-    #     child.each {|c| yield(c)}
-    #   end
-    # end
-
-    # def each
-    #   case self
-    #   when AndNode, OrNode
-    #     @children.first.each{|c| yield(c)}
-    #     yield(self)
-    #     @children.last.each{|c| yield(c)}
-    #   when NotNode
-    #     yield(self)
-    #     @children.first.each{|c| yield(c)}
-    #   when VarNode
-    #     yield(self)
-    #   end
-    # end
-
-    def each_DP
+    def each_by_descriptive
       node_stack = [[self, self.children.clone]] #[[parent, children], ...]
 
       until node_stack.empty?
         current_parent, current_children = node_stack.pop
         current_node = current_children.shift
 
-#         puts 'loop'
-#         puts "node_stack.size:#{node_stack.size}"
-#         puts "current_parent:#{current_parent.class}"
-#         puts "current_children.size:#{current_children.size}"
-#         puts "current_node:#{current_node.class}"
+        and_node_obj = AndNode.new
 
         case current_node
         when AndNode
@@ -53,7 +28,7 @@ module Ravensat
           yield(current_node.children.first)
 
           if current_children.empty?
-            yield(node_stack.last.first)
+            yield(and_node_obj)
           else
             yield(current_parent)
             node_stack.push [current_parent, current_children.clone]
@@ -62,13 +37,12 @@ module Ravensat
           yield(current_node)
 
           if current_children.empty?
-            yield(node_stack.last.first)
+            yield(and_node_obj)
           else
             yield(current_parent)
             node_stack.push [current_parent, current_children.clone]
           end
         end
-
       end
     end
 
@@ -88,13 +62,6 @@ module Ravensat
       self if block_given?
     end
 
-    def each_naive
-      yield(self)
-      @children.each do |child|
-        child.each {|c| yield(c)}
-      end
-    end
-
     def &(object)
       AndNode.new(self, object)
     end
@@ -123,7 +90,12 @@ module Ravensat
     end
 
     def clauses_size
-      self.count{|node| node.is_a? AndNode} + 1
+      cnt = 0
+      self.each_by_descriptive do |node|
+        cnt+=1 if node.is_a? AndNode
+      end
+      cnt
+      # self.count{|node| node.is_a? AndNode} + 1
     end
   end
 end

data/lib/ravensat/claw.rb

@@ -10,6 +10,7 @@ module Ravensat
       end.reduce(:&)
     end
 
+    # NOTE: Klieber, W. and Kwon, G.: Efficient CNF Encoding for Selecting 1 from N Objects (2007).
     def self.commander_amo(bool_vars)
       m = bool_vars.size / 2
       commander_variables = []

data/lib/ravensat/dimacs/dimacs_decoder.rb

@@ -1,22 +1,13 @@
 module Ravensat
   class DimacsDecoder
     def decode(model, cnf)
-      # inverted_name_table = name_table.invert
       prop_vars = cnf.vars
       case model.first
       when "SAT"
-        model.last.split.each do |e|
-          if e == '0'
-            next
-          elsif e[0] == "-"
-            dimacs_name = e.slice(1..-1)
-            var = prop_vars.find{|i| i.dimacs_name == dimacs_name}
-            var.value = false
-          else
-            dimacs_name = e
-            var = prop_vars.find{|i| i.dimacs_name == dimacs_name}
-            var.value = true
-          end
+        model.last.split.each_with_index do |e,i|
+          break if e == '0'
+          var = prop_vars[i]
+          var.value = !(e[0] == '-')
         end
         true
       when "UNSAT"

data/lib/ravensat/dimacs/dimacs_encoder.rb

@@ -12,7 +12,7 @@ module Ravensat
 
       set_dimacs_name(formula)
 
-      formula.each_DP do |node|
+      formula.each_by_descriptive do |node|
         dimacs_body << node.to_dimacs
       end
 

data/lib/ravensat/solver.rb

@@ -1,4 +1,5 @@
 require 'tempfile'
+require 'open3'
 
 module Ravensat
   class Solver
@@ -7,7 +8,7 @@ module Ravensat
       @name = default_solver_name
     end
 
-    def solve( cnf )
+    def solve( cnf , solver_log: false)
       encoder = DimacsEncoder.new
       @input_file = Tempfile.open(["ravensat",".cnf"])
       @output_file = Tempfile.open(["ravensat",".mdl"])
@@ -19,7 +20,8 @@ module Ravensat
       when "arcteryx"
         Arcteryx.solve(@input_file.to_path, @output_file.to_path)
       else
-        system("#{@name} #{@input_file.to_path} #{@output_file.to_path}")
+        result, err, status = Open3.capture3("#{@name} #{@input_file.to_path} #{@output_file.to_path}")
+        puts result if solver_log
       end
 
       decoder = DimacsDecoder.new

data/lib/ravensat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ravensat
-  VERSION = "1.0.0"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ravensat
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.3
 platform: ruby
 authors:
 - rikuto matsuda
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-11 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -23,7 +23,6 @@ files:
 - ".rspec"
 - ".ruby-version"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,45 +0,0 @@
-PATH
-  remote: .
-  specs:
-    ravensat (0.1.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    byebug (11.1.3)
-    coderay (1.1.3)
-    diff-lcs (1.4.4)
-    method_source (1.0.0)
-    pry (0.14.0)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    pry-byebug (3.8.0)
-      byebug (~> 11.0)
-      pry (~> 0.10)
-    rake (13.0.3)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-
-PLATFORMS
-  x86_64-linux
-
-DEPENDENCIES
-  pry
-  pry-byebug
-  rake (~> 13.0)
-  ravensat!
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   2.2.24