ravensat 1.0.1 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fe48515db2ce222168fac2854fcab5b2057c84336195e129e6c532ab519082e
-  data.tar.gz: bc265a79298a55684d1bb1c83a196e0530b4670515c22d4388f65bdf7b872c67
+  metadata.gz: e53ca35aa21cc9c623de888c201c19d54146d586c34a549db7dab634e16ad3d6
+  data.tar.gz: bf87c8b08b9be42c7c9fbf7b1bddbfc88293ad266a8f190e1d8479e7131e1277
 SHA512:
-  metadata.gz: 7d715763470fe222f0ba71c998e27a43f8e40c04ae50cadceae48b324a962eaa75ceef92f02154cc74f9e04edbae47de1f36eb6e3c655019c0f3fedd72aae448
-  data.tar.gz: d2178778880fa55127ef5bd0b2b5d76fa5431452d20f06b0672374a99f9a718a881c01c1c055b11579c86e063decc607416c0f3450213f460dac756e28cc201c
+  metadata.gz: b1e524ea817f9f6ab63892e9c608b6aea58d7b499dc0db5275d9634206680de45a1e2a22c0e19f78b6efaff5fd5e972a164dded7e19d1ffde10785e60e2c5156
+  data.tar.gz: 06a06b8914d6d654c127b4b36e94afe84cfbfe322f50717d3d3cbbfb1598e8726c05155ecf624b21fc765ac3e32b003ab0374f806555255499b31778c674a7b1

data/lib/ravensat/ast/node.rb

@@ -14,6 +14,8 @@ module Ravensat
         current_parent, current_children = node_stack.pop
         current_node = current_children.shift
 
+        and_node_obj = AndNode.new
+
         case current_node
         when AndNode
           node_stack.push [current_parent, current_children.clone]
@@ -26,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]
@@ -35,7 +37,7 @@ 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]
@@ -88,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

@@ -5,6 +5,7 @@ module Ravensat
     end
 
     def self.pairwise_amo(bool_vars)
+      return bool_vars.first if bool_vars.size == 1
       bool_vars.combination(2).map do |e|
         e.map(&:~@).reduce(:|)
       end.reduce(:&)
@@ -12,6 +13,8 @@ module Ravensat
 
     # NOTE: Klieber, W. and Kwon, G.: Efficient CNF Encoding for Selecting 1 from N Objects (2007).
     def self.commander_amo(bool_vars)
+      return bool_vars.first if bool_vars.size == 1
+      # XXX: Operator unknown if bool_vars.size is very small.
       m = bool_vars.size / 2
       commander_variables = []
       formula = Ravensat::InitialNode.new

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.1"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ravensat
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.4
 platform: ruby
 authors:
 - rikuto matsuda
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-22 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies: []
 description:
 email: