ravensat 1.0.9 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b668d5f3c3a44e355f1cab471199b0ab4124a504e38081c40b33348b8d1611d
-  data.tar.gz: 9c622647b2a9bc34881178cbd546f332f882a07e8b2242c3c37e3f94e437c2c1
+  metadata.gz: 6bfe00570d2de6c7da2dfe2075f99d3372435290235f4f581c82697a19e9e415
+  data.tar.gz: 25e100b47651b0b146e7f392bc793059a0702bb58fe663618d3f2501059c7783
 SHA512:
-  metadata.gz: 986c50547e5026650eef971aaa706a8d7515e5a6e861d3c027ce6b273b56094448c62fcd796b6f9dd2734d96f10cde2e5ba7bd0ac58ac389e16ad5404a0cd623
-  data.tar.gz: 3a29d33a8761a862c8bf04ce69aa8b64c8241a64f867c1ee337eedf311eeafad2ffee899db6e1f3c544a0cec5df17ce554b24b16c125ca1181b1cb7b260ad099
+  metadata.gz: 2cdb626e3c97e72cb4b3221a6a89857cc1fe4d8704235f73b504ed3c2e0fcea13d49d3f17f074bf62ea982c64c5663708332ad86494d59c3bc8403a3c2d9c67c
+  data.tar.gz: 152988e5e50542e1bd63c842cee4024144c8154fbf6567383eebfd35dfff530de1342e0f44a3ec30365845aff79e41c964dd8fafb2d626718c94805162b95115

data/lib/ravensat/ast/and_node.rb

@@ -11,5 +11,9 @@ module Ravensat
     def to_dimacs
       " 0\n"
     end
+
+    def eval
+      @children.map(&:eval).reduce(:&)
+    end
   end
 end

data/lib/ravensat/ast/node.rb

@@ -87,6 +87,9 @@ module Ravensat
       @children.map(&:cnf?).reduce(:&)
     end
 
+    def eval
+    end
+
     def vars
       self.select{|node| node.is_a? VarNode}.uniq
     end

data/lib/ravensat/ast/not_node.rb

@@ -7,5 +7,9 @@ module Ravensat
     def to_dimacs
       "-"
     end
+
+    def eval
+      @children.map(&:eval).first ^ true
+    end
   end
 end

data/lib/ravensat/ast/or_node.rb

@@ -16,5 +16,9 @@ module Ravensat
     def to_dimacs
       " "
     end
+
+    def eval
+      @children.map(&:eval).reduce(:|)
+    end
   end
 end

data/lib/ravensat/ast/var_node.rb

@@ -22,5 +22,9 @@ module Ravensat
     def to_dimacs
       @dimacs_name
     end
+
+    def eval
+      @value
+    end
   end
 end

data/lib/ravensat/claw.rb

@@ -1,6 +1,13 @@
 module Ravensat
   module Claw
-    def self.alo(bool_vars)
+    def self.at_most_one(bool_vars)
+      return Ravensat::NilNode.new if bool_vars.size == 1
+      bool_vars.combination(2).map do |e|
+        e.map(&:~@).reduce(:|)
+      end.reduce(:&)
+    end
+
+    def self.at_least_one(bool_vars)
       return Ravensat::NilNode.new if bool_vars.size == 1
       bool_vars.reduce(:|)
     end
@@ -15,19 +22,13 @@ module Ravensat
     def self.at_least_k(bool_vars, k)
       return Ravensat::NilNode.new if bool_vars.size == 1
       bool_vars.combination(k-1).map do |e|
-        alo(bool_vars - e)
+        at_least_one(bool_vars - e)
       end.reduce(:&)
     end
 
-    def self.pairwise_amo(bool_vars)
-      return Ravensat::NilNode.new if bool_vars.size == 1
-      bool_vars.combination(2).map do |e|
-        e.map(&:~@).reduce(:|)
-      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)
+    def self.commander_at_most_one(bool_vars)
       return Ravensat::NilNode.new if bool_vars.size == 1
       # XXX: Operator unknown if bool_vars.size is very small.
       m = bool_vars.size / 2
@@ -36,16 +37,49 @@ module Ravensat
       bool_vars.each_slice(2) do |g|
         c = Ravensat::VarNode.new
         subset = g << ~c
-        formula &= pairwise_amo(subset)
-        formula &= alo(subset)
+        formula &= at_most_one(subset)
+        formula &= at_least_one(subset)
         commander_variables << c
       end
 
       if m < 6
-        formula &= pairwise_amo(commander_variables)
+        formula &= at_most_one(commander_variables)
       else
-        formula &= commander_amo(commander_variables)
+        formula &= commander_at_most_one(commander_variables)
+      end
+    end
+
+    def self.commander_at_most_k(bool_vars, k)
+      return Ravensat::NilNode.new if bool_vars.size == 1
+      return commander_at_most_one(bool_vars) if k == 1
+      group_size = k + 2
+      commander_variables = []
+      formula = Ravensat::InitialNode.new
+
+      bool_vars.each_slice(group_size) do |g|
+        cmds = Array.new(k){Ravensat::VarNode.new}
+        subset = g + cmds.map(&:~)
+        formula &= at_most_k(subset, k)
+        formula &= at_least_k(subset, k)
+        cmds.each_cons(2) do |e1, e2|
+          formula &= ~e1 | e2
+        end
+        commander_variables += cmds
       end
+
+      formula &= at_most_k(commander_variables, k)
+    end
+
+    def self.exactly_one(bool_vars)
+      formula = Ravensat::InitialNode.new
+      formula &= commander_at_most_one(bool_vars)
+      formula &= at_least_one(bool_vars)
+    end
+
+    def self.exactly_k(bool_vars, k)
+      formula = Ravensat::InitialNode.new
+      formula &= commander_at_most_k(bool_vars, k)
+      formula &= at_least_k(bool_vars, k)
     end
 
     def self.all_different(*int_vars)
@@ -57,7 +91,5 @@ module Ravensat
     def self.all_only_one(*int_vars)
       int_vars.map(&:only_one).reduce(:&)
     end
-
-    # alias :amo :pairwise_amo
   end
 end

data/lib/ravensat/version.rb

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

metadata

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