ravensat 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a47d909acb01362653613bd0a4df6da1d426303a5e0919987b587fe3adcb77fd
-  data.tar.gz: 46f323addbd8e5f183eeb8bd81c28ffd0994553bc63a2e99689b991a43d1e508
+  metadata.gz: 76d71945818d257f977fde25685896cc7e8c7da0d290f329525beb5d7e5c2ca2
+  data.tar.gz: 2c201e0b4815822e40f7b15fe8b1492a532c6665bc456a87c8c6f42227468f38
 SHA512:
-  metadata.gz: 31ebd03521bce3df1d2447d9bddba7eef23deced640285f9bbfb79cf790bdc2a4af45b6c299e4ed5c6aa8000a43e4114b4d7045f1e963305175de85728a01cee
-  data.tar.gz: '097189b8c4d177f9cd8658fa4ff16481616dfb9ca72c65fbe80fbcbb63eaa453db55067312ff152c4fff01e613f4f82c745e7594b6a00861ee2b266c7ea740d1'
+  metadata.gz: 4a25a24ca9553e5ea66737f21d5cf9942b9202f106f3c0063d3a4fa84816b665797a761ac2399ef0de374e36bfa29a23c5dccaf7f78f0adfa73cd9e45558e591
+  data.tar.gz: 74baa2d28e39e50dca6d280a411cc0fd5727f15dca74ada2ec94eb4a1c1c7d785e686293de0202d0e249c03a78685be3c823917519936d79438740c0bd861b90

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ravensat (0.1.0)
+    ravensat (0.1.1)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,10 +1,11 @@
 # Ravensat
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/ravensat`. To experiment with that code, run `bin/console` for an interactive prompt.
+Ravensat is an interface to SAT Solver .
+In order to use Ravensat, you need to install SAT Solver and specify the name of the Solver .
+(If you do not specify SAT Solver, it will use the one bundled in the gem .)
 
-TODO: Delete this and the text above, and describe your gem
 
-## Installation(Not implemented)
+## Installation
 
 Add this line to your application's Gemfile:
 
@@ -25,8 +26,8 @@ Or install it yourself as:
 ```ruby
 require 'ravensat'
 
-a = Ravensat::PropVar.new
-b = Ravensat::PropVar.new
+a = Ravensat::VarNode.new
+b = Ravensat::VarNode.new
 
 a.value #=> nil
 b.value #=> nil
@@ -40,7 +41,7 @@ a.value #=> true
 b.value #=> true
 ```
 
-## Development(Not implemented)
+## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 

data/example/magic_square_3x3.rb

@@ -0,0 +1,48 @@
+require 'bundler/setup'
+require 'ravensat'
+require 'pry'
+
+# | ---- | ---- | ---- |
+# |  X1  |  X2  |  X3  |
+# |  X4  |  X5  |  X6  |
+# |  X7  |  X8  |  X9  |
+# | ---- | ---- | ---- |
+
+x1 = Array.new(9){ Ravensat::VarNode.new }
+x2 = Array.new(9){ Ravensat::VarNode.new }
+x3 = Array.new(9){ Ravensat::VarNode.new }
+x4 = Array.new(9){ Ravensat::VarNode.new }
+x5 = Array.new(9){ Ravensat::VarNode.new }
+x6 = Array.new(9){ Ravensat::VarNode.new }
+x7 = Array.new(9){ Ravensat::VarNode.new }
+x8 = Array.new(9){ Ravensat::VarNode.new }
+x9 = Array.new(9){ Ravensat::VarNode.new }
+x = [x1, x2, x3, x4, x5, x6, x7, x8, x9]
+
+logic = x1[4]
+
+# one square, one number
+9.times do |i|
+  logic &= Ravensat::RavenClaw.alo [x[i][0], x[i][1], x[i][2], x[i][3], x[i][4], x[i][5], x[i][6], x[i][7], x[i][8]]
+  logic &= Ravensat::RavenClaw.amo [x[i][0], x[i][1], x[i][2], x[i][3], x[i][4], x[i][5], x[i][6], x[i][7], x[i][8]]
+end
+
+# x1 ~ x9 are all different numbers
+9.times do |i|
+  logic &= Ravensat::RavenClaw.alo [x[0][i], x[1][i], x[2][i], x[3][i], x[4][i], x[5][i], x[6][i], x[7][i], x[8][i]]
+  logic &= Ravensat::RavenClaw.amo [x[0][i], x[1][i], x[2][i], x[3][i], x[4][i], x[5][i], x[6][i], x[7][i], x[8][i]]
+end
+
+# TODO: generate constraint that sum to 15 in a row
+# sum to 15 in a row
+
+solver = Ravensat::Solver.new
+solver.solve logic
+
+puts <<~"MAGIC_SQUARE"
+| --- | --- | --- |
+|  #{x1.index{|x| x.value} + 1}  |  #{x2.index{|x| x.value} + 1}  |  #{x3.index{|x| x.value} + 1}  |
+|  #{x4.index{|x| x.value} + 1}  |  #{x5.index{|x| x.value} + 1}  |  #{x6.index{|x| x.value} + 1}  |
+|  #{x7.index{|x| x.value} + 1}  |  #{x8.index{|x| x.value} + 1}  |  #{x9.index{|x| x.value} + 1}  |
+| --- | --- | --- |
+MAGIC_SQUARE

data/lib/ravensat/ast/and_node.rb

@@ -0,0 +1,4 @@
+module Ravensat
+  class AndNode < OprNode
+  end
+end

data/lib/ravensat/ast/node.rb

@@ -0,0 +1,51 @@
+module Ravensat
+  class Node
+    include Enumerable
+
+    attr_reader :children
+    def initialize
+      @children = []
+    end
+
+    def each
+      yield(self)
+      @children.each do |child|
+        child.each {|c| yield(c)}
+      end
+    end
+
+    def &(object)
+      AndNode.new(self, object)
+    end
+
+    def |(object)
+      OrNode.new(self, object)
+    end
+
+    # def tree_text
+    #   self.each do |child|
+    #     child.to_s
+    #   end
+    # end
+
+    def to_s
+      self.class.name
+    end
+
+    def cnf?
+      @children.map(&:cnf?).reduce(:&)
+    end
+
+    def vars
+      self.select{|node| node.is_a? VarNode}.uniq
+    end
+
+    def vars_size
+      self.vars.size
+    end
+
+    def clauses_size
+      self.count{|node| node.is_a? AndNode} + 1
+    end
+  end
+end

data/lib/ravensat/ast/not_node.rb

@@ -0,0 +1,4 @@
+module Ravensat
+  class NotNode < OprNode
+  end
+end

data/lib/ravensat/ast/opr_node.rb

@@ -0,0 +1,7 @@
+module Ravensat
+  class OprNode < Node
+    def initialize(*nodes)
+      @children = nodes
+    end
+  end
+end

data/lib/ravensat/ast/or_node.rb

@@ -0,0 +1,8 @@
+module Ravensat
+  class OrNode < OprNode
+    def cnf?
+      return false if @children.any?{|node| node.is_a? AndNode}
+      @children.map(&:cnf?).reduce(:&)
+    end
+  end
+end

data/lib/ravensat/ast/var_node.rb

@@ -0,0 +1,17 @@
+module Ravensat
+  class VarNode < Node
+    attr_accessor :value
+    def initialize
+      @value
+      @children = []
+    end
+
+    def ~@
+      NotNode.new(self)
+    end
+
+    def cnf?
+      true
+    end
+  end
+end

data/lib/ravensat/dimacs_decoder.rb

@@ -0,0 +1,24 @@
+module Ravensat
+  class DimacsDecoder
+    def decode(model, name_table)
+      inverted_name_table = name_table.invert
+      case model.first
+      when "SAT"
+        model.last.split.each do |e|
+          if e == '0'
+            next
+          elsif e[0] == "-"
+            index = e.slice(1..-1)
+            inverted_name_table[index].value = false
+          else
+            index = e
+            inverted_name_table[index].value = true
+          end
+        end
+        true
+      when "UNSAT"
+        false
+      end
+    end
+  end
+end

data/lib/ravensat/dimacs_encoder.rb

@@ -0,0 +1,32 @@
+module Ravensat
+  class DimacsEncoder
+    attr_reader :name_table
+    def initialize
+      @name_table = {}
+    end
+
+    def to_dimacs(formula)
+      return nil unless formula.cnf?
+
+      dimacs_header = "p cnf #{formula.vars_size} #{formula.clauses_size}"
+      dimacs_body = ""
+      create_table(formula)
+      formula.each do |node|
+        case node
+        when AndNode
+        when OrNode then dimacs_body << "\n"
+        when NotNode then dimacs_body << "-"
+        when VarNode then dimacs_body << @name_table[node] << " "
+        end
+      end
+
+      dimacs_body.gsub!(/\n{2,}/, "\n").gsub!(/\n/, "0\n") << '0'
+
+      dimacs_header + dimacs_body
+    end
+
+    def create_table(formula)
+      @name_table = formula.vars.zip((1..formula.vars.size).map(&:to_s)).to_h
+    end
+  end
+end

data/lib/ravensat/solver.rb

@@ -15,10 +15,11 @@ module Ravensat
     # end
 
     def solve( cnf )
+      encoder = DimacsEncoder.new
       @input_file = Tempfile.open(["ravensat",".cnf"])
       @output_file = Tempfile.open(["ravensat",".mdl"])
 
-      @input_file.write cnf.to_dimacs
+      @input_file.write encoder.to_dimacs(cnf)
       @input_file.flush
 
       case @name
@@ -28,18 +29,9 @@ module Ravensat
         system("#{@name} #{@input_file.to_path} #{@output_file.to_path}")
       end
 
+      decoder = DimacsDecoder.new
       model = @output_file.read.split("\n")
-
-      case model.first
-      when "SAT"
-        model.last.split.each do |e|
-          next if e == '0'
-          cnf.name_table.find{|key,value| value == e.to_i.abs.to_s}.first.value = !e.start_with?('-')
-        end
-        Arcteryx::SAT
-      when "UNSAT"
-        Arcteryx::UNSAT
-      end
+      decoder.decode(model, encoder.name_table)
     end
 
   end

data/lib/ravensat/version.rb

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

data/lib/ravensat.rb

@@ -4,12 +4,20 @@ require_relative "ravensat/version"
 
 module Ravensat
   ravensat = File.dirname(__FILE__) + '/ravensat'
+  ast = File.dirname(__FILE__) + '/ravensat/ast'
   arcteryx = File.dirname(__FILE__) + '/arcteryx'
 
   autoload :Solver, ravensat + '/solver.rb'
-  autoload :PropVar, ravensat + '/prop_var.rb'
-  autoload :PropLogic, ravensat + '/prop_logic.rb'
+  autoload :DimacsEncoder, ravensat + '/dimacs_encoder.rb'
+  autoload :DimacsDecoder, ravensat + '/dimacs_decoder.rb'
   autoload :RavenClaw, ravensat + '/ravenclaw.rb'
 
+  autoload :Node, ast + '/node.rb'
+  autoload :VarNode, ast + '/var_node.rb'
+  autoload :OprNode, ast + '/opr_node.rb'
+  autoload :AndNode, ast + '/and_node.rb'
+  autoload :OrNode, ast + '/or_node.rb'
+  autoload :NotNode, ast + '/not_node.rb'
+
   autoload :Arcteryx, arcteryx + '/arcteryx.rb'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ravensat
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - rikuto matsuda
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-16 00:00:00.000000000 Z
+date: 2022-05-16 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -27,11 +27,18 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- example/magic_square_3x3.rb
 - lib/arcteryx/arcteryx.rb
 - lib/arcteryx/cnf.rb
 - lib/ravensat.rb
-- lib/ravensat/prop_logic.rb
-- lib/ravensat/prop_var.rb
+- lib/ravensat/ast/and_node.rb
+- lib/ravensat/ast/node.rb
+- lib/ravensat/ast/not_node.rb
+- lib/ravensat/ast/opr_node.rb
+- lib/ravensat/ast/or_node.rb
+- lib/ravensat/ast/var_node.rb
+- lib/ravensat/dimacs_decoder.rb
+- lib/ravensat/dimacs_encoder.rb
 - lib/ravensat/ravenclaw.rb
 - lib/ravensat/solver.rb
 - lib/ravensat/version.rb

data/lib/ravensat/prop_logic.rb

@@ -1,92 +0,0 @@
-module Ravensat
-  class PropLogic
-    attr_reader :formula
-    attr_reader :name_table
-
-    def initialize( init_formula )
-      @formula = init_formula
-         # (a | b) & (~a | b) & (a | ~b) & (~a | ~b)
-
-         # [:and,
-         #    [:or, a, b],
-         #    [:or, [:not, a], b],
-         #    [:or, a, [:not, b]],
-         #    [:or, [:not, a], [:not, b]]
-         # ]
-    end
-
-    def to_cnf
-
-    end
-
-    def to_dimacs
-      cnf_text = String.new
-      tmp_name_table = @formula.flatten.uniq.reject{|e| e.class == Symbol}
-      @name_table = tmp_name_table.zip((1..tmp_name_table.size).to_a.map{|e| e.to_s}).to_h
-
-      nr_vars = tmp_name_table.size
-      nr_clses = @formula.size - 1
-      cnf_header = 'p cnf ' << nr_vars.to_s << ' ' << nr_clses.to_s << "\n"
-      # @formula.is_cnf?
-      @formula.each do |clause|
-        # next if clause.first != :and
-        case clause
-        when Symbol
-          next
-        when Array
-          case clause.first
-          when :or
-            clause.each do |literal|
-              case literal
-              when Symbol
-                next
-              when Ravensat::PropVar
-                cnf_text << @name_table[literal] << ' '
-              when Array #&& literal.first == :not
-                cnf_text << '-' << @name_table[literal.last] << ' '
-              end
-            end
-          when :not
-            cnf_text << '-' << @name_table[clause.last] << ' '
-          end
-        when Ravensat::PropVar
-          cnf_text << @name_table[clause] << ' '
-        end
-        cnf_text << '0' << "\n"
-      end
-      cnf_header + cnf_text
-    end
-
-    def &( object )
-      if @formula.first == :and
-        @formula.append object.formula
-      else
-        @formula = [:and, @formula, object.formula]
-      end
-      self
-      # Ravensat::PropLogic.new [:and, @formula, object]
-      # formulaがcnfである前提の実装
-      # @formula & other_formula
-    end
-
-    def |( object )
-      if @formula.first == :or
-        @formula.append object.formula
-      else
-        @formula = [:or, @formula, object.formula]
-      end
-      self
-      # Ravensat::PropLogic.new [:or, @formula, object]
-      # 木構造に落とすのが難しそう，実装見送り
-      # @formula | other_formula
-    end
-
-    # def to_a
-    #   @formula.each do |f|
-    #     if f.class == PropLogic
-    #       f = f.to_a
-    #     end
-    #   end
-    # end
-  end
-end

data/lib/ravensat/prop_var.rb

@@ -1,45 +0,0 @@
-module Ravensat
-  class PropVar
-    attr_accessor :value
-
-    def initialize
-      @value # => true | false | undef
-    end
-
-    # def +@
-    #   # unuse?
-    #   # return PropLogic object
-    #   'this is +@ method'
-    # end
-
-    # def -@
-    #   # return PropLogic object
-    #   'this is -@ method'
-    # end
-
-    def ~@
-      Ravensat::PropLogic.new [:not, self]
-      # return PropLogic object
-    end
-
-    def &( object )
-      Ravensat::PropLogic.new [:and, self, object.formula]
-      # return PropLogic object
-    end
-
-    def |( object )
-      Ravensat::PropLogic.new [:or, self, object.formula]
-      # return PropLogic object
-    end
-
-    def formula
-      # $BIU$1>F?O%a%=%C%I(B
-      self
-    end
-
-    # def self
-    #   'this is self method'
-    # end
-
-  end
-end