ravensat 1.0.8 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d64d337bf293ce23f27a118bc1896ecf7c35709f3d0a0a7c217fa3bef2e495a6
-  data.tar.gz: 38c00c661b514dff04fd0fdcc2854ae9c37104598fb6dc2f8235eac0178595dd
+  metadata.gz: e2be04a5683be973ab9a882393a2ac6ed25d40d19899d3222841a0727e7a9ccc
+  data.tar.gz: 6674ab1b25282eb389672ed0e53857272fe048a0d08c6ec0d632c56ff126bbc9
 SHA512:
-  metadata.gz: 853077cca8f5220f9ecfbcec4c14323678b5f6d36f197892a3b49646ca6cff39a032fbcdf2199e524ab46f3d5806cf86a9f45152a71bd968d4d0388dcf0cacb7
-  data.tar.gz: 10de270cfe07b3c1041dd0e398b8c1e8c1bd58d103917b8e116fb3f84caa8235747e5cb775ca9601a2b3be63b673efac5d0b6dade9451e0c121f8dcc9872594b
+  metadata.gz: fb557522b6b17eeaec4171a76169887b1392a9d321ed6e723911df41d6caddcc00dd31e376e340c78cc71dd5a29267a0c4050a6f1c91bba21dbb4d4aafcebb61
+  data.tar.gz: d046a5e639fdb03a2c372b96cc992ef6c8ef6b1c3a73bf0c26f460a82acfce84495bc20ce4661cef99a858e7dc5ed5b6a373bb1788d78cb737c0c8eb7e20e273

data/lib/ravensat/ast/and_node.rb

@@ -2,6 +2,8 @@ module Ravensat
   class AndNode < OprNode
     def &(object)
       raise TypeError.new("#{object.class} can't be coerced into Ravensat::Node") unless object.is_a? Node
+      return self if object.is_a? NilNode
+
       @children.append object
       self
     end
@@ -9,5 +11,9 @@ module Ravensat
     def to_dimacs
       " 0\n"
     end
+
+    def eval
+      @children.map(&:eval).reduce(:&)
+    end
   end
 end

data/lib/ravensat/ast/initial_node.rb

@@ -2,11 +2,15 @@ module Ravensat
   class InitialNode < Node
     def &(object)
       raise TypeError.new("#{object.class} can't be coerced into Ravensat::Node") unless object.is_a? Node
+      return self if object.is_a? NilNode
+
       object
     end
 
     def |(object)
       raise TypeError.new("#{object.class} can't be coerced into Ravensat::Node") unless object.is_a? Node
+      return self if object.is_a? NilNode
+
       object
     end
   end

data/lib/ravensat/ast/nil_node.rb

@@ -0,0 +1,17 @@
+module Ravensat
+  class NilNode < Node
+    def initialize
+      @children = []
+    end
+
+    def &(object)
+      raise TypeError.new("#{object.class} can't be coerced into Ravensat::Node") unless object.is_a? Node
+      object
+    end
+
+    def |(object)
+      raise TypeError.new("#{object.class} can't be coerced into Ravensat::Node") unless object.is_a? Node
+      object
+    end
+  end
+end

data/lib/ravensat/ast/node.rb

@@ -64,11 +64,15 @@ module Ravensat
 
     def &(object)
       raise TypeError.new("#{object.class} can't be coerced into Ravensat::Node") unless object.is_a? Node
+      return self if object.is_a? NilNode
+
       AndNode.new(self, object)
     end
 
     def |(object)
       raise TypeError.new("#{object.class} can't be coerced into Ravensat::Node") unless object.is_a? Node
+      return self if object.is_a? NilNode
+
       OrNode.new(self, object)
     end
 
@@ -83,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

@@ -2,6 +2,8 @@ module Ravensat
   class OrNode < OprNode
     def |(object)
       raise TypeError.new("#{object.class} can't be coerced into Ravensat::Node") unless object.is_a? Node
+      return self if object.is_a? NilNode
+
       @children.append object
       self
     end
@@ -14,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/ast.rb

@@ -8,4 +8,5 @@ module Ravensat
   autoload :OrNode, dir + '/or_node.rb'
   autoload :NotNode, dir + '/not_node.rb'
   autoload :InitialNode, dir + '/initial_node.rb'
+  autoload :NilNode, dir + '/nil_node.rb'
 end

data/lib/ravensat/claw.rb

@@ -1,34 +1,35 @@
 module Ravensat
   module Claw
-    def self.alo(bool_vars)
-      return bool_vars.first if bool_vars.size == 1
+    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
 
     def self.at_most_k(bool_vars, k)
-      return bool_vars.first if bool_vars.size == 1
+      return Ravensat::NilNode.new if bool_vars.size == 1
       bool_vars.combination(k+1).map do |e|
         e.map(&:~@).reduce(:|)
       end.reduce(:&)
     end
 
     def self.at_least_k(bool_vars, k)
-      return bool_vars.first if bool_vars.size == 1
+      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 bool_vars.first 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)
-      return bool_vars.first if bool_vars.size == 1
+    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
       commander_variables = []
@@ -36,18 +37,50 @@ 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
+      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)
       int_vars.combination(2).map do |int_var|
         int_var.reduce(:!=)
@@ -57,7 +90,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.8"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ravensat
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.0
 platform: ruby
 authors:
 - rikuto matsuda
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-23 00:00:00.000000000 Z
+date: 2022-11-07 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -70,6 +70,7 @@ files:
 - lib/ravensat/ast.rb
 - lib/ravensat/ast/and_node.rb
 - lib/ravensat/ast/initial_node.rb
+- lib/ravensat/ast/nil_node.rb
 - lib/ravensat/ast/node.rb
 - lib/ravensat/ast/not_node.rb
 - lib/ravensat/ast/opr_node.rb