ravensat 0.3.0 → 1.0.0

data/lib/ravensat/ast/node.rb

@@ -7,24 +7,91 @@ 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
+      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}"
+
+        case current_node
+        when AndNode
+          node_stack.push [current_parent, current_children.clone]
+          node_stack.push [current_node, current_node.children.clone]
+        when OrNode
+          node_stack.push [current_parent, current_children.clone]
+          node_stack.push [current_node, current_node.children.clone]
+        when NotNode
+          yield(current_node)
+          yield(current_node.children.first)
+
+          if current_children.empty?
+            yield(node_stack.last.first)
+          else
+            yield(current_parent)
+            node_stack.push [current_parent, current_children.clone]
+          end
+        when VarNode, Extension::BooleanVariable
+          yield(current_node)
+
+          if current_children.empty?
+            yield(node_stack.last.first)
+          else
+            yield(current_parent)
+            node_stack.push [current_parent, current_children.clone]
+          end
+        end
+
+      end
+    end
+
     def each
-      yield(self)
-      @children.each do |child|
-        child.each {|c| yield(c)}
+      return to_enum unless block_given?
+      node_stack = [self]
+
+      until node_stack.empty?
+        current_node = node_stack.shift
+        next unless current_node
+
+        yield current_node
+
+        node_stack = node_stack.concat(current_node.children)
       end
+
+      self if block_given?
     end
 
-    def each_with_clause
-      case self
-      when AndNode, OrNode
-        @children.first.each_with_clause{|c| yield(c)}
-        yield(self)
-        @children.last.each_with_clause{|c| yield(c)}
-      when NotNode
-        yield(self)
-        @children.first.each_with_clause{|c| yield(c)}
-      when VarNode
-        yield(self)
+    def each_naive
+      yield(self)
+      @children.each do |child|
+        child.each {|c| yield(c)}
       end
     end
 
@@ -36,16 +103,13 @@ module Ravensat
       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 to_dimacs
+    end
+
     def cnf?
       @children.map(&:cnf?).reduce(:&)
     end

data/lib/ravensat/ast/not_node.rb

@@ -1,4 +1,11 @@
 module Ravensat
   class NotNode < OprNode
+    def ~@
+      @children.first
+    end
+
+    def to_dimacs
+      "-"
+    end
   end
 end

data/lib/ravensat/ast/or_node.rb

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

data/lib/ravensat/ast/var_node.rb

@@ -1,9 +1,10 @@
 module Ravensat
   class VarNode < Node
-    attr_accessor :value
+    attr_accessor :value, :dimacs_name
     def initialize
       @value
       @children = []
+      @dimacs_name
     end
 
     def ~@
@@ -13,5 +14,13 @@ module Ravensat
     def cnf?
       true
     end
+
+    def result
+      @value
+    end
+
+    def to_dimacs
+      @dimacs_name
+    end
   end
 end

data/lib/ravensat/claw.rb

@@ -0,0 +1,44 @@
+module Ravensat
+  module Claw
+    def self.alo(bool_vars)
+      bool_vars.reduce(:|)
+    end
+
+    def self.pairwise_amo(bool_vars)
+      bool_vars.combination(2).map do |e|
+        e.map(&:~@).reduce(:|)
+      end.reduce(:&)
+    end
+
+    def self.commander_amo(bool_vars)
+      m = bool_vars.size / 2
+      commander_variables = []
+      formula = Ravensat::InitialNode.new
+      bool_vars.each_slice(2) do |g|
+        c = Ravensat::VarNode.new
+        subset = g << ~c
+        formula &= pairwise_amo(subset)
+        formula &= alo(subset)
+        commander_variables << c
+      end
+
+      if m < 6
+        formula &= pairwise_amo(commander_variables)
+      else
+        formula &= commander_amo(commander_variables)
+      end
+    end
+
+    def self.all_different(*int_vars)
+      int_vars.combination(2).map do |int_var|
+        int_var.reduce(:!=)
+      end.reduce(:&)
+    end
+
+    def self.all_only_one(*int_vars)
+      int_vars.map(&:only_one).reduce(:&)
+    end
+
+    # alias :amo :pairwise_amo
+  end
+end

data/lib/ravensat/dimacs/dimacs_decoder.rb

@@ -1,18 +1,21 @@
 module Ravensat
   class DimacsDecoder
-    def decode(model, name_table)
-      inverted_name_table = name_table.invert
+    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] == "-"
-            index = e.slice(1..-1)
-            inverted_name_table[index].value = false
+            dimacs_name = e.slice(1..-1)
+            var = prop_vars.find{|i| i.dimacs_name == dimacs_name}
+            var.value = false
           else
-            index = e
-            inverted_name_table[index].value = true
+            dimacs_name = e
+            var = prop_vars.find{|i| i.dimacs_name == dimacs_name}
+            var.value = true
           end
         end
         true

data/lib/ravensat/dimacs/dimacs_encoder.rb

@@ -6,26 +6,23 @@ module Ravensat
     end
 
     def to_dimacs(formula)
-      return nil unless formula.cnf?
-
       dimacs_header = "p cnf #{formula.vars_size} #{formula.clauses_size}\n"
       dimacs_body = ""
-      create_table(formula)
-      formula.each_with_clause do |node|
-        case node
-        when AndNode then dimacs_body << " 0\n"
-        when OrNode then dimacs_body << " "
-        when NotNode then dimacs_body << "-"
-        when VarNode then dimacs_body << @name_table[node]
-        end
+      return nil unless formula.cnf?
+
+      set_dimacs_name(formula)
+
+      formula.each_DP do |node|
+        dimacs_body << node.to_dimacs
       end
-      dimacs_body << " 0\n"
 
       dimacs_header + dimacs_body
     end
 
-    def create_table(formula)
-      @name_table = formula.vars.zip((1..formula.vars.size).map(&:to_s)).to_h
+    def set_dimacs_name(formula)
+      formula.vars.each_with_index do |node, i|
+        node.dimacs_name = (i+1).to_s
+      end
     end
   end
 end

data/lib/ravensat/extension/domain.rb

@@ -12,7 +12,6 @@ module Ravensat
       def bool(*vars)
         vars.each do |var|
           next if var.is_defined?
-          # LOCAL_VARIABLE_TABLE[var.name] = Ravensat::VarNode.new
           LOCAL_VARIABLE_TABLE[var.name] = Ravensat::Extension::BooleanVariable.new(var.name, var.args)
         end
       end

data/lib/ravensat/extension/variable/integer_variable.rb

@@ -18,7 +18,7 @@ module Ravensat
           duplicated_keys = self.var_nodes.keys & object.var_nodes.keys
 
           [self.var_nodes, object.var_nodes].repeated_permutation(duplicated_keys.size) do |var_nodes|
-            result_formula &= Ravensat::RavenClaw.alo(var_nodes.zip(duplicated_keys).map{|arr| arr.first[arr.last]})
+            result_formula &= Ravensat::Claw.alo(var_nodes.zip(duplicated_keys).map{|arr| arr.first[arr.last]})
           end
           return result_formula
         else
@@ -45,8 +45,8 @@ module Ravensat
 
       def only_one
         result_formula = Ravensat::InitialNode.new
-        result_formula &= Ravensat::RavenClaw.alo @var_nodes.values
-        result_formula &= Ravensat::RavenClaw.amo @var_nodes.values
+        result_formula &= Ravensat::Claw.alo @var_nodes.values
+        result_formula &= Ravensat::Claw.amo @var_nodes.values
         result_formula
       end
 

data/lib/ravensat/solver.rb

@@ -5,15 +5,8 @@ module Ravensat
     attr_accessor :name
     def initialize( default_solver_name = "arcteryx" )
       @name = default_solver_name
-      # @cnf = Array.new
-      # @nr_vars
-      # @nr_clses
     end
 
-    # def <<( clause )
-    #   'this is << method'
-    # end
-
     def solve( cnf )
       encoder = DimacsEncoder.new
       @input_file = Tempfile.open(["ravensat",".cnf"])
@@ -31,7 +24,7 @@ module Ravensat
 
       decoder = DimacsDecoder.new
       model = @output_file.read.split("\n")
-      decoder.decode(model, encoder.name_table)
+      decoder.decode(model, cnf)
     end
 
   end

data/lib/ravensat/version.rb

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

data/lib/ravensat.rb

@@ -11,7 +11,7 @@ module Ravensat
   require_relative ravensat + "/dimacs.rb"
 
   autoload :Solver, ravensat + '/solver.rb'
-  autoload :RavenClaw, ravensat + '/ravenclaw.rb'
+  autoload :Claw, ravensat + '/claw.rb'
   autoload :Extension, ravensat + '/extension.rb'
 
   autoload :Arcteryx, arcteryx + '/arcteryx.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ravensat
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - rikuto matsuda
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-18 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -18,6 +18,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
@@ -28,6 +29,40 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- docs/Arcteryx.html
+- docs/Arcteryx/CNF.html
+- docs/Ravensat.html
+- docs/Ravensat/AndNode.html
+- docs/Ravensat/Claw.html
+- docs/Ravensat/DimacsDecoder.html
+- docs/Ravensat/DimacsEncoder.html
+- docs/Ravensat/Extension.html
+- docs/Ravensat/Extension/BooleanVariable.html
+- docs/Ravensat/Extension/Domain.html
+- docs/Ravensat/Extension/IntegerVariable.html
+- docs/Ravensat/Extension/UndefinedVariable.html
+- docs/Ravensat/Extension/Variable.html
+- docs/Ravensat/InitialNode.html
+- docs/Ravensat/Node.html
+- docs/Ravensat/NotNode.html
+- docs/Ravensat/OprNode.html
+- docs/Ravensat/OrNode.html
+- docs/Ravensat/Solver.html
+- docs/Ravensat/VarNode.html
+- docs/_index.html
+- docs/class_list.html
+- docs/css/common.css
+- docs/css/full_list.css
+- docs/css/style.css
+- docs/file.README.html
+- docs/file_list.html
+- docs/frames.html
+- docs/index.html
+- docs/js/app.js
+- docs/js/full_list.js
+- docs/js/jquery.js
+- docs/method_list.html
+- docs/top-level-namespace.html
 - example/magic_square_3x3.rb
 - exe/ravensat
 - lib/arcteryx/arcteryx.rb
@@ -41,6 +76,7 @@ files:
 - lib/ravensat/ast/opr_node.rb
 - lib/ravensat/ast/or_node.rb
 - lib/ravensat/ast/var_node.rb
+- lib/ravensat/claw.rb
 - lib/ravensat/dimacs.rb
 - lib/ravensat/dimacs/dimacs_decoder.rb
 - lib/ravensat/dimacs/dimacs_encoder.rb
@@ -50,7 +86,6 @@ files:
 - lib/ravensat/extension/variable/integer_variable.rb
 - lib/ravensat/extension/variable/undefined_variable.rb
 - lib/ravensat/extension/variable/variable.rb
-- lib/ravensat/ravenclaw.rb
 - lib/ravensat/solver.rb
 - lib/ravensat/version.rb
 - ravensat.gemspec

data/lib/ravensat/ravenclaw.rb

@@ -1,19 +0,0 @@
-module Ravensat
-  module RavenClaw
-    def self.alo(bool_vars)
-      bool_vars.reduce(:|)
-    end
-
-    def self.amo(bool_vars)
-      bool_vars.combination(2).map do |e|
-        e.map(&:~@).reduce(:|)
-      end.reduce(:&)
-    end
-
-    def self.all_different(*int_vars)
-      int_vars.combination(2).map do |int_var|
-        int_var.reduce(:!=)
-      end.reduce(:&)
-    end
-  end
-end