ravensat 0.3.1 → 0.3.2

data/lib/ravensat/claw.rb

@@ -0,0 +1,44 @@
+module Ravensat
+  module Claw
+    def self.alo(bool_vars)
+      bool_vars.reduce(:|)
+    end
+
+    def self.pairwise_amo(bool_vars)
+      bool_vars.combination(2).map do |e|
+        e.map(&:~@).reduce(:|)
+      end.reduce(:&)
+    end
+
+    def self.commander_amo(bool_vars)
+      m = bool_vars.size / 2
+      introductory_variables = []
+      formula = Ravensat::InitialNode.new
+      bool_vars.each_slice(2) do |e|
+        c = Ravensat::VarNode.new
+        subset = e << ~c
+        formula &= pairwise_amo(subset)
+        formula &= alo(subset)
+        introductory_variables << c
+      end
+
+      if m < 6
+        formula &= pairwise_amo(introductory_variables)
+      else
+        formula &= commander_amo(introductory_variables)
+      end
+    end
+
+    def self.all_different(*int_vars)
+      int_vars.combination(2).map do |int_var|
+        int_var.reduce(:!=)
+      end.reduce(:&)
+    end
+
+    def self.all_only_one(*int_vars)
+      int_vars.map(&:only_one).reduce(:&)
+    end
+
+    # alias :amo :pairwise_amo
+  end
+end

data/lib/ravensat/dimacs/dimacs_encoder.rb

@@ -11,7 +11,7 @@ module Ravensat
       dimacs_header = "p cnf #{formula.vars_size} #{formula.clauses_size}\n"
       dimacs_body = ""
       create_table(formula)
-      formula.each_with_clause do |node|
+      formula.each do |node|
         case node
         when AndNode then dimacs_body << " 0\n"
         when OrNode then dimacs_body << " "

data/lib/ravensat/extension/variable/integer_variable.rb

@@ -18,7 +18,7 @@ module Ravensat
           duplicated_keys = self.var_nodes.keys & object.var_nodes.keys
 
           [self.var_nodes, object.var_nodes].repeated_permutation(duplicated_keys.size) do |var_nodes|
-            result_formula &= Ravensat::RavenClaw.alo(var_nodes.zip(duplicated_keys).map{|arr| arr.first[arr.last]})
+            result_formula &= Ravensat::Claw.alo(var_nodes.zip(duplicated_keys).map{|arr| arr.first[arr.last]})
           end
           return result_formula
         else
@@ -45,8 +45,8 @@ module Ravensat
 
       def only_one
         result_formula = Ravensat::InitialNode.new
-        result_formula &= Ravensat::RavenClaw.alo @var_nodes.values
-        result_formula &= Ravensat::RavenClaw.amo @var_nodes.values
+        result_formula &= Ravensat::Claw.alo @var_nodes.values
+        result_formula &= Ravensat::Claw.amo @var_nodes.values
         result_formula
       end
 

data/lib/ravensat/version.rb

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

data/lib/ravensat.rb

@@ -11,7 +11,7 @@ module Ravensat
   require_relative ravensat + "/dimacs.rb"
 
   autoload :Solver, ravensat + '/solver.rb'
-  autoload :RavenClaw, ravensat + '/ravenclaw.rb'
+  autoload :Claw, ravensat + '/claw.rb'
   autoload :Extension, ravensat + '/extension.rb'
 
   autoload :Arcteryx, arcteryx + '/arcteryx.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ravensat
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - rikuto matsuda
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-24 00:00:00.000000000 Z
+date: 2022-06-15 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -29,6 +29,40 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- docs/Arcteryx.html
+- docs/Arcteryx/CNF.html
+- docs/Ravensat.html
+- docs/Ravensat/AndNode.html
+- docs/Ravensat/Claw.html
+- docs/Ravensat/DimacsDecoder.html
+- docs/Ravensat/DimacsEncoder.html
+- docs/Ravensat/Extension.html
+- docs/Ravensat/Extension/BooleanVariable.html
+- docs/Ravensat/Extension/Domain.html
+- docs/Ravensat/Extension/IntegerVariable.html
+- docs/Ravensat/Extension/UndefinedVariable.html
+- docs/Ravensat/Extension/Variable.html
+- docs/Ravensat/InitialNode.html
+- docs/Ravensat/Node.html
+- docs/Ravensat/NotNode.html
+- docs/Ravensat/OprNode.html
+- docs/Ravensat/OrNode.html
+- docs/Ravensat/Solver.html
+- docs/Ravensat/VarNode.html
+- docs/_index.html
+- docs/class_list.html
+- docs/css/common.css
+- docs/css/full_list.css
+- docs/css/style.css
+- docs/file.README.html
+- docs/file_list.html
+- docs/frames.html
+- docs/index.html
+- docs/js/app.js
+- docs/js/full_list.js
+- docs/js/jquery.js
+- docs/method_list.html
+- docs/top-level-namespace.html
 - example/magic_square_3x3.rb
 - exe/ravensat
 - lib/arcteryx/arcteryx.rb
@@ -42,6 +76,7 @@ files:
 - lib/ravensat/ast/opr_node.rb
 - lib/ravensat/ast/or_node.rb
 - lib/ravensat/ast/var_node.rb
+- lib/ravensat/claw.rb
 - lib/ravensat/dimacs.rb
 - lib/ravensat/dimacs/dimacs_decoder.rb
 - lib/ravensat/dimacs/dimacs_encoder.rb
@@ -51,7 +86,6 @@ files:
 - lib/ravensat/extension/variable/integer_variable.rb
 - lib/ravensat/extension/variable/undefined_variable.rb
 - lib/ravensat/extension/variable/variable.rb
-- lib/ravensat/ravenclaw.rb
 - lib/ravensat/solver.rb
 - lib/ravensat/version.rb
 - ravensat.gemspec

data/lib/ravensat/ravenclaw.rb

@@ -1,19 +0,0 @@
-module Ravensat
-  module RavenClaw
-    def self.alo(bool_vars)
-      bool_vars.reduce(:|)
-    end
-
-    def self.amo(bool_vars)
-      bool_vars.combination(2).map do |e|
-        e.map(&:~@).reduce(:|)
-      end.reduce(:&)
-    end
-
-    def self.all_different(*int_vars)
-      int_vars.combination(2).map do |int_var|
-        int_var.reduce(:!=)
-      end.reduce(:&)
-    end
-  end
-end