ravensat 1.0.2 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78a4fe449b52b526589311a1d8bd4203e121e0d490ff86a870f08833328bda05
-  data.tar.gz: f7dfe20367b98c416ed30cdbf4061b1662268181007f188942d6f393d0aff687
+  metadata.gz: 56180e12d568856b7aecc556c6351157b35214ee2b8baccfbdf7069db9f87f11
+  data.tar.gz: 61d38033566cc2c5683300765589938e45e2a8140b9fc74646ca7cb9f838818a
 SHA512:
-  metadata.gz: c7a341443b901bb3d3717a380af641956d7d9552d217e88250c6146f5fa9f1c0dd81fef9db5f5f38b37dca40f092030c6c99ef967ba534816e7a160b3525074e
-  data.tar.gz: 4d994c5983f2d66d988140aec41385533039dac96e62c6952416604efa2ecf9ede311241a6e4c5eb322da8396128f44ff6b5fcf3f8a55e36ea4ce5d8a0ea6be2
+  metadata.gz: 6ad53a3be42a987284db8d89f5e3fa4da21097e6c019c82e3fb34f49718b2907de49f9235922dd1892e318d94f193fba2b899b5317e5da780fceb1894cddbfb9
+  data.tar.gz: 38439434b8b7e40492743a7ee5b8815ffe71adfe8894ec678761c041af0e49db0f81e8ea684d5d3e4aef5288a68ff46796c871ccab9e9b349c424da3d0cdc500

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

@@ -4,7 +4,20 @@ module Ravensat
       bool_vars.reduce(:|)
     end
 
+    def self.at_most_k(bool_vars, k)
+      bool_vars.combination(k+1).map do |e|
+        e.map(&:~@).reduce(:|)
+      end.reduce(:&)
+    end
+
+    def self.at_least_k(bool_vars, k)
+      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
       bool_vars.combination(2).map do |e|
         e.map(&:~@).reduce(:|)
       end.reduce(:&)
@@ -12,6 +25,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/version.rb

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

metadata

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