ravensat 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d64d337bf293ce23f27a118bc1896ecf7c35709f3d0a0a7c217fa3bef2e495a6
-  data.tar.gz: 38c00c661b514dff04fd0fdcc2854ae9c37104598fb6dc2f8235eac0178595dd
+  metadata.gz: 8b668d5f3c3a44e355f1cab471199b0ab4124a504e38081c40b33348b8d1611d
+  data.tar.gz: 9c622647b2a9bc34881178cbd546f332f882a07e8b2242c3c37e3f94e437c2c1
 SHA512:
-  metadata.gz: 853077cca8f5220f9ecfbcec4c14323678b5f6d36f197892a3b49646ca6cff39a032fbcdf2199e524ab46f3d5806cf86a9f45152a71bd968d4d0388dcf0cacb7
-  data.tar.gz: 10de270cfe07b3c1041dd0e398b8c1e8c1bd58d103917b8e116fb3f84caa8235747e5cb775ca9601a2b3be63b673efac5d0b6dade9451e0c121f8dcc9872594b
+  metadata.gz: 986c50547e5026650eef971aaa706a8d7515e5a6e861d3c027ce6b273b56094448c62fcd796b6f9dd2734d96f10cde2e5ba7bd0ac58ac389e16ad5404a0cd623
+  data.tar.gz: 3a29d33a8761a862c8bf04ce69aa8b64c8241a64f867c1ee337eedf311eeafad2ffee899db6e1f3c544a0cec5df17ce554b24b16c125ca1181b1cb7b260ad099

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

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
 

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

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,26 +1,26 @@
 module Ravensat
   module Claw
     def self.alo(bool_vars)
-      return bool_vars.first if bool_vars.size == 1
+      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)
       end.reduce(:&)
     end
 
     def self.pairwise_amo(bool_vars)
-      return bool_vars.first if bool_vars.size == 1
+      return Ravensat::NilNode.new if bool_vars.size == 1
       bool_vars.combination(2).map do |e|
         e.map(&:~@).reduce(:|)
       end.reduce(:&)
@@ -28,7 +28,7 @@ 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
+      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 = []

data/lib/ravensat/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ravensat
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - rikuto matsuda
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-23 00:00:00.000000000 Z
+date: 2022-08-25 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