ravensat 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2206c8010f299d713c19b74682a2c46470d0c4cc7e27ade7e429ee0de09622de
-  data.tar.gz: 14b05657764ab053b091da8f0ddb339201ea2cd469d2828eccc04fd0b3c4e49e
+  metadata.gz: 9d0f5a2e88e6b17130dc2101a9c2e85d0e401fba9bcba081299cf14ded1c683b
+  data.tar.gz: ee09cdeb7da7fd0cd04a80a5017ae351b836cf9a6d63ab92fddaa9181f36dff2
 SHA512:
-  metadata.gz: ba52ce15498089d710d8e7ded3b8f35da11364a74a6f72241482ceb794cec83164423142e5b3d3feb90b0a444d8ec62327d7be830cac6d4390844fb9ce10cb6e
-  data.tar.gz: 83509b606c6693373ce2918fe4ae9feda5aafbd241bca5510ed795cc52aae6dc0120cfc0e0294dd76a53004dbb825c1a9b0aa27664c47ff04a5e311ebf7bb167
+  metadata.gz: d763bab0b969a710ef42cae2e1aed39161e4b49488c1d898f8665b14a4763df09a881508875576f6505fc25c75daed694b805cb82ca081c95ac61d31bb49c12d
+  data.tar.gz: d5ff19dd7503194401664bba22b12bbe16a7ce8b6f1ff8cb54d19d1fcfde0d8912ad25d9762549d19f50dcc0d9d82161f020fae1c1207bd015ce530178eb8b62

data/README.md

@@ -22,7 +22,7 @@ Or install it yourself as:
     $ gem install ravensat
 
 ## Usage
-
+### General Usage
 ```ruby
 require 'ravensat'
 
@@ -41,6 +41,42 @@ a.value #=> true
 b.value #=> true
 ```
 
+### Extension Usage(SAT)
+```ruby
+require 'ravensat'
+
+module Ravensat
+  module Extension
+    bool a, b
+    logic = (a | b) & (~a | b) & (a | ~b)
+
+    solver = Ravensat::Solver.new
+    solver.solve logic #=> true
+
+    a.value #=> true
+    b.value #=> true
+  end
+end
+```
+
+### Extension Usage(CSP; Constraint Satisfaction Problem)
+```ruby
+require 'ravensat'
+
+module Ravensat
+  module Extension
+    int a(1..10), b(1..10)
+    constraint = (a.only_one & b.only_one & (a != b))
+
+    solver = Ravensat::Solver.new
+    solver.solve constraint #=> true
+
+    a.result #=> 1
+    b.result #=> 2
+  end
+end
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/exe/ravensat

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
+require 'ravensat'
+require 'pry'
+
+module Ravensat
+  module Extension
+    binding.pry
+  end
+end

data/lib/ravensat/ast/initial_node.rb

@@ -0,0 +1,11 @@
+module Ravensat
+  class InitialNode < Node
+    def &(object)
+      object
+    end
+
+    def |(object)
+      object
+    end
+  end
+end

data/lib/ravensat/ast/node.rb

@@ -14,6 +14,20 @@ module Ravensat
       end
     end
 
+    def each_with_clause
+      case self
+      when AndNode, OrNode
+        @children.first.each_with_clause{|c| yield(c)}
+        yield(self)
+        @children.last.each_with_clause{|c| yield(c)}
+      when NotNode
+        yield(self)
+        @children.first.each_with_clause{|c| yield(c)}
+      when VarNode
+        yield(self)
+      end
+    end
+
     def &(object)
       AndNode.new(self, object)
     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/{dimacs_encoder.rb → dimacs/dimacs_encoder.rb}

@@ -11,18 +11,15 @@ module Ravensat
       dimacs_header = "p cnf #{formula.vars_size} #{formula.clauses_size}\n"
       dimacs_body = ""
       create_table(formula)
-      formula.each do |node|
+      formula.each_with_clause 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,25 @@
+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::VarNode.new
+          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::RavenClaw.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::RavenClaw.alo @var_nodes.values
+        result_formula &= Ravensat::RavenClaw.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/ravenclaw.rb

@@ -1,15 +1,19 @@
 module Ravensat
-  class RavenClaw
-    def initialize; end
-
-    def self.alo(prop_vars)
-      prop_vars.reduce(:|)
+  module RavenClaw
+    def self.alo(bool_vars)
+      bool_vars.reduce(:|)
     end
 
-    def self.amo(prop_vars)
-      prop_vars.combination(2).map do |e|
+    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

data/lib/ravensat/version.rb

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

data/lib/ravensat.rb

@@ -7,17 +7,12 @@ module Ravensat
   ast = File.dirname(__FILE__) + '/ravensat/ast'
   arcteryx = File.dirname(__FILE__) + '/arcteryx'
 
+  require_relative ravensat + "/ast.rb"
+  require_relative ravensat + "/dimacs.rb"
+
   autoload :Solver, ravensat + '/solver.rb'
-  autoload :DimacsEncoder, ravensat + '/dimacs_encoder.rb'
-  autoload :DimacsDecoder, ravensat + '/dimacs_decoder.rb'
   autoload :RavenClaw, ravensat + '/ravenclaw.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 :Extension, ravensat + '/extension.rb'
 
   autoload :Arcteryx, arcteryx + '/arcteryx.rb'
 end

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: ravensat
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - rikuto matsuda
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-16 00:00:00.000000000 Z
+date: 2022-05-18 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
 - p99y92og@s.okayama-u.ac.jp
-executables: []
+executables:
+- ravensat
 extensions: []
 extra_rdoc_files: []
 files:
@@ -28,17 +29,27 @@ files:
 - bin/console
 - bin/setup
 - 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/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/ravenclaw.rb
 - lib/ravensat/solver.rb
 - lib/ravensat/version.rb