ravensat 0.2.2 → 0.3.2

data/lib/ravensat/ast/node.rb

@@ -7,10 +7,24 @@ module Ravensat
       @children = []
     end
 
+    # def each
+    #   yield(self)
+    #   @children.each do |child|
+    #     child.each {|c| yield(c)}
+    #   end
+    # end
+
     def each
-      yield(self)
-      @children.each do |child|
-        child.each {|c| yield(c)}
+      case self
+      when AndNode, OrNode
+        @children.first.each{|c| yield(c)}
+        yield(self)
+        @children.last.each{|c| yield(c)}
+      when NotNode
+        yield(self)
+        @children.first.each{|c| yield(c)}
+      when VarNode
+        yield(self)
       end
     end
 
@@ -22,12 +36,6 @@ module Ravensat
       OrNode.new(self, object)
     end
 
-    # def tree_text
-    #   self.each do |child|
-    #     child.to_s
-    #   end
-    # end
-
     def to_s
       self.class.name
     end

data/lib/ravensat/ast/not_node.rb

@@ -1,4 +1,7 @@
 module Ravensat
   class NotNode < OprNode
+    def ~@
+      @children.first
+    end
   end
 end

data/lib/ravensat/ast/var_node.rb

@@ -13,5 +13,9 @@ module Ravensat
     def cnf?
       true
     end
+
+    def result
+      @value
+    end
   end
 end

data/lib/ravensat/ast.rb

@@ -0,0 +1,11 @@
+module Ravensat
+  dir = File.dirname(__FILE__) + '/ast'
+
+  autoload :Node, dir + '/node.rb'
+  autoload :VarNode, dir + '/var_node.rb'
+  autoload :OprNode, dir + '/opr_node.rb'
+  autoload :AndNode, dir + '/and_node.rb'
+  autoload :OrNode, dir + '/or_node.rb'
+  autoload :NotNode, dir + '/not_node.rb'
+  autoload :InitialNode, dir + '/initial_node.rb'
+end

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_encoder.rb → dimacs/dimacs_encoder.rb}

@@ -13,16 +13,13 @@ module Ravensat
       create_table(formula)
       formula.each do |node|
         case node
-        when AndNode
-        when OrNode then dimacs_body << "\n"
+        when AndNode then dimacs_body << " 0\n"
+        when OrNode then dimacs_body << " "
         when NotNode then dimacs_body << "-"
-        when VarNode then dimacs_body << @name_table[node] << " "
+        when VarNode then dimacs_body << @name_table[node]
         end
       end
-
-      # dimacs_body formatting
-      dimacs_body.strip! << ' '
-      dimacs_body.gsub!(/\n{2,}/, "\n").gsub!(/\n/, "0\n") << '0'
+      dimacs_body << " 0\n"
 
       dimacs_header + dimacs_body
     end

data/lib/ravensat/dimacs.rb

@@ -0,0 +1,6 @@
+module Ravensat
+  dir = File.dirname(__FILE__) + '/dimacs'
+
+  autoload :DimacsEncoder, dir + '/dimacs_encoder.rb'
+  autoload :DimacsDecoder, dir + '/dimacs_decoder.rb'
+end

data/lib/ravensat/extension/domain.rb

@@ -0,0 +1,24 @@
+module Ravensat
+  module Extension
+    module Domain
+      LOCAL_VARIABLE_TABLE = {}
+      def int(*vars)
+        vars.each do |var|
+          next if var.is_defined?
+          LOCAL_VARIABLE_TABLE[var.name] = Ravensat::Extension::IntegerVariable.new(var.name, var.args)
+        end
+      end
+
+      def bool(*vars)
+        vars.each do |var|
+          next if var.is_defined?
+          LOCAL_VARIABLE_TABLE[var.name] = Ravensat::Extension::BooleanVariable.new(var.name, var.args)
+        end
+      end
+
+      def method_missing(name, *args)
+        LOCAL_VARIABLE_TABLE[name] || UndefinedVariable.new(name, args)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+require 'forwardable'
+
+module Ravensat
+  module Extension
+    class BooleanVariable < Variable
+      extend Forwardable
+      delegate Node.public_instance_methods(false) => :@var_node
+      delegate OprNode.public_instance_methods(false) => :@var_node
+      delegate VarNode.public_instance_methods(false) => :@var_node
+
+      def initialize(name, args)
+        super
+        @var_node = VarNode.new
+      end
+    end
+  end
+end

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

@@ -0,0 +1,63 @@
+module Ravensat
+  module Extension
+    class IntegerVariable < Variable
+
+      attr_reader :var_nodes
+      def initialize(name, args)
+        super
+        return unless args.first.is_a? Range
+        @var_nodes = args.first.zip(Array.new(args.first.size){Ravensat::VarNode.new}).to_h
+      end
+
+      def ==(object)
+        case object
+        when Integer
+          return @var_nodes[object]
+        when IntegerVariable
+          result_formula = Ravensat::InitialNode.new
+          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::Claw.alo(var_nodes.zip(duplicated_keys).map{|arr| arr.first[arr.last]})
+          end
+          return result_formula
+        else
+          raise ArgumentError
+        end
+      end
+
+      def !=(object)
+        case object
+        when Integer
+          return ~(@var_nodes[object])
+        when IntegerVariable
+          result_formula = Ravensat::InitialNode.new
+          duplicated_keys = self.var_nodes.keys & object.var_nodes.keys
+
+          duplicated_keys.each do |index|
+            result_formula &= ~(self.var_nodes[index]) | ~(object.var_nodes[index])
+          end
+          return result_formula
+        else
+          raise ArgumentError
+        end
+      end
+
+      def only_one
+        result_formula = Ravensat::InitialNode.new
+        result_formula &= Ravensat::Claw.alo @var_nodes.values
+        result_formula &= Ravensat::Claw.amo @var_nodes.values
+        result_formula
+      end
+
+      def result
+        result = @var_nodes.select{|key, var_node| var_node.value}.keys
+        if result.one?
+          result.first
+        else
+          result
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module Ravensat
+  module Extension
+    class UndefinedVariable < Variable
+      def is_defined?
+        false
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Ravensat
+  module Extension
+    class Variable
+
+      attr_reader :name, :args
+      def initialize(name, args)
+        @name = name
+        @args = args
+      end
+
+      def is_defined?
+        true
+      end
+    end
+  end
+end

data/lib/ravensat/extension.rb

@@ -0,0 +1,13 @@
+module Ravensat
+  module Extension
+    dir = File.dirname(__FILE__) + '/extension'
+
+    autoload :Domain, dir + '/domain.rb'
+    autoload :Variable, dir + '/variable/variable.rb'
+    autoload :BooleanVariable, dir + '/variable/boolean_variable.rb'
+    autoload :IntegerVariable, dir + '/variable/integer_variable.rb'
+    autoload :UndefinedVariable, dir + '/variable/undefined_variable.rb'
+
+    extend Domain
+  end
+end

data/lib/ravensat/solver.rb

@@ -5,15 +5,8 @@ module Ravensat
     attr_accessor :name
     def initialize( default_solver_name = "arcteryx" )
       @name = default_solver_name
-      # @cnf = Array.new
-      # @nr_vars
-      # @nr_clses
     end
 
-    # def <<( clause )
-    #   'this is << method'
-    # end
-
     def solve( cnf )
       encoder = DimacsEncoder.new
       @input_file = Tempfile.open(["ravensat",".cnf"])

data/lib/ravensat/version.rb

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

data/lib/ravensat.rb

@@ -7,17 +7,12 @@ module Ravensat
   ast = File.dirname(__FILE__) + '/ravensat/ast'
   arcteryx = File.dirname(__FILE__) + '/arcteryx'
 
-  autoload :Solver, ravensat + '/solver.rb'
-  autoload :DimacsEncoder, ravensat + '/dimacs_encoder.rb'
-  autoload :DimacsDecoder, ravensat + '/dimacs_decoder.rb'
-  autoload :RavenClaw, ravensat + '/ravenclaw.rb'
+  require_relative ravensat + "/ast.rb"
+  require_relative ravensat + "/dimacs.rb"
 
-  autoload :Node, ast + '/node.rb'
-  autoload :VarNode, ast + '/var_node.rb'
-  autoload :OprNode, ast + '/opr_node.rb'
-  autoload :AndNode, ast + '/and_node.rb'
-  autoload :OrNode, ast + '/or_node.rb'
-  autoload :NotNode, ast + '/not_node.rb'
+  autoload :Solver, ravensat + '/solver.rb'
+  autoload :Claw, ravensat + '/claw.rb'
+  autoload :Extension, ravensat + '/extension.rb'
 
   autoload :Arcteryx, arcteryx + '/arcteryx.rb'
 end

metadata

@@ -1,22 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: ravensat
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.2
 platform: ruby
 authors:
 - rikuto matsuda
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-16 00:00:00.000000000 Z
+date: 2022-06-15 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
 - p99y92og@s.okayama-u.ac.jp
-executables: []
+executables:
+- ravensat
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
@@ -27,19 +29,63 @@ 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
 - lib/arcteryx/cnf.rb
 - lib/ravensat.rb
+- lib/ravensat/ast.rb
 - lib/ravensat/ast/and_node.rb
+- lib/ravensat/ast/initial_node.rb
 - lib/ravensat/ast/node.rb
 - lib/ravensat/ast/not_node.rb
 - lib/ravensat/ast/opr_node.rb
 - lib/ravensat/ast/or_node.rb
 - lib/ravensat/ast/var_node.rb
-- lib/ravensat/dimacs_decoder.rb
-- lib/ravensat/dimacs_encoder.rb
-- lib/ravensat/ravenclaw.rb
+- lib/ravensat/claw.rb
+- lib/ravensat/dimacs.rb
+- lib/ravensat/dimacs/dimacs_decoder.rb
+- lib/ravensat/dimacs/dimacs_encoder.rb
+- lib/ravensat/extension.rb
+- lib/ravensat/extension/domain.rb
+- lib/ravensat/extension/variable/boolean_variable.rb
+- lib/ravensat/extension/variable/integer_variable.rb
+- lib/ravensat/extension/variable/undefined_variable.rb
+- lib/ravensat/extension/variable/variable.rb
 - lib/ravensat/solver.rb
 - lib/ravensat/version.rb
 - ravensat.gemspec

data/lib/ravensat/ravenclaw.rb

@@ -1,15 +0,0 @@
-module Ravensat
-  class RavenClaw
-    def initialize; end
-
-    def self.alo(prop_vars)
-      prop_vars.reduce(:|)
-    end
-
-    def self.amo(prop_vars)
-      prop_vars.combination(2).map do |e|
-        e.map(&:~@).reduce(:|)
-      end.reduce(:&)
-    end
-  end
-end