ravensat 0.3.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f369c1036cde3ea2ff754109809d5b4ce62f826a2ab409e9ec19fdd07ff341dc
-  data.tar.gz: 76df72fb98e5140fcd1b2b394643f23de5218ea47f4ec03f450dc0a05074f801
+  metadata.gz: bd6bb73a8f6668c36675461d24272ae8e02632c5b2d3f768b5a81347ad29956a
+  data.tar.gz: 48e4f44fa76bd1716b32ed98ddaa82d198cb83064e944269ecfd57ab21645860
 SHA512:
-  metadata.gz: b59a47f2b7a899e49d506f839c892178523ea3920e611278e0f31399dc1c0e5c868bb8f8a74adab5a848f26f2d2efb8779f6391a20ec566ec177a1fdacfb4565
-  data.tar.gz: 9ed85ceb8abc589197c9241679bb5c5486ce525e427d91f84568dcc4b4ab7a58b0d110688cba999d78dacc9fd0e067d6e4f3908ef87d2d3851ed7c30331d22ca
+  metadata.gz: 5365bfdf37eeb55b5a7ccab53f0ecca8cf8c73ecdfcac2eb9c92ce843aa6fa2e77f711f14a9b00f37cb9a37bfade19c65ea38cbd3f7478398b0d1ef8a5cf416a
+  data.tar.gz: abf648c3097425241ae106e7ed42876f9c9a33e55bf4615cefc16c77943aedf62b0bd99fc6b9c2062147dbaf6c9b690b13f5a28204771e03934e4c59bdf98a9e

data/lib/ravensat/ast/and_node.rb

@@ -1,4 +1,12 @@
 module Ravensat
   class AndNode < OprNode
+    def &(object)
+      @children.append object
+      self
+    end
+
+    def to_dimacs
+      " 0\n"
+    end
   end
 end

data/lib/ravensat/ast/node.rb

@@ -14,17 +14,84 @@ module Ravensat
     #   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
-      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)
+      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_naive
+      yield(self)
+      @children.each do |child|
+        child.each {|c| yield(c)}
       end
     end
 
@@ -40,6 +107,9 @@ module Ravensat
       self.class.name
     end
 
+    def to_dimacs
+    end
+
     def cnf?
       @children.map(&:cnf?).reduce(:&)
     end

data/lib/ravensat/ast/not_node.rb

@@ -3,5 +3,9 @@ module Ravensat
     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 ~@
@@ -17,5 +18,9 @@ module Ravensat
     def result
       @value
     end
+
+    def to_dimacs
+      @dimacs_name
+    end
   end
 end

data/lib/ravensat/claw.rb

@@ -12,20 +12,20 @@ module Ravensat
 
     def self.commander_amo(bool_vars)
       m = bool_vars.size / 2
-      introductory_variables = []
+      commander_variables = []
       formula = Ravensat::InitialNode.new
-      bool_vars.each_slice(2) do |e|
+      bool_vars.each_slice(2) do |g|
         c = Ravensat::VarNode.new
-        subset = e << ~c
+        subset = g << ~c
         formula &= pairwise_amo(subset)
         formula &= alo(subset)
-        introductory_variables << c
+        commander_variables << c
       end
 
       if m < 6
-        formula &= pairwise_amo(introductory_variables)
+        formula &= pairwise_amo(commander_variables)
       else
-        formula &= commander_amo(introductory_variables)
+        formula &= commander_amo(commander_variables)
       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 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/solver.rb

@@ -24,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.2"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ravensat
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 1.0.0
 platform: ruby
 authors:
 - rikuto matsuda
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-15 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies: []
 description:
 email: