rbprolog 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dda78e71e7f2217c87e9a9c52e81be412f3adc15
-  data.tar.gz: 281cf156ef8af5401c8f6365bd7e10f7345d093e
+  metadata.gz: d723ef7238bd43d66ba6107479b1b3ceb3f2c343
+  data.tar.gz: bfa0dc55e11633ec5d83ad1dcbbb02a5008dfa4c
 SHA512:
-  metadata.gz: 70aab09d55abbe7a3ce29d0ceabd55dd149ed3cae2395dd16a038c17de64ec15ebcd7a3f3ddfed2fd4d73dab2a92d9304206ade6bf0aa900d9d010e9718337eb
-  data.tar.gz: 441e56975d5aecb431d0aa39801734052949e88a0ea4806d1d7b8a7f0d19ec32c99700d85ab19a0767dd5c2034d7e9342616f504013cd2fb9ce825608aa14093
+  metadata.gz: da369f5d469d14ee459e145ac505a4b513aa3db32f1617bf5262268c08b2b19c46960bf54eff4b577afaf063c91b561a1432bfe44bed9b8a168eeb0837b3c977
+  data.tar.gz: 1c8216be63234451c9ac110cf1b02173198ec3491ffba96bcc6a6d5159550b82f7f819ee2c2de2753fbc4bb3ebd525ad94561d8077310eedb523b71fcfaab3f4

data/Rakefile

@@ -1,4 +1,8 @@
+require 'rubygems'
+require 'bundler/setup'
 require "bundler/gem_tasks"
 require 'rake/testtask'
 
-Rake::TestTask.new
+Rake::TestTask.new do |t|
+  t.libs << 'lib' << 'test'
+end

data/lib/rbprolog/deduction.rb

@@ -14,7 +14,8 @@ module Rbprolog
         context.scope(self) do |scoped_args|
           puts " => #{@sym}?(#{scoped_args.join(', ')})" if rule_index == 0
 
-          rule.each_match(rules, *scoped_args, id + [rule_index]) do |hash|
+          # rules.reject is to avoid endless loop caused by self reference
+          rule.each_match(rules.reject {|item| item == rule}, *scoped_args, id + [rule_index]) do |hash|
             context.scope(self) do
               rule.args.each_with_index do |rule_arg, rule_arg_index|
                 if Var === scoped_args[rule_arg_index]

data/lib/rbprolog/evaluation.rb

@@ -0,0 +1,26 @@
+module Rbprolog
+  class Evaluation
+    #FIXME the design is not good to have an empty array as args
+    attr_accessor :args
+
+    def initialize(expression)
+      @args = []
+      @expression = expression
+    end
+
+    def each_deduce(context, rules, id)
+      print "#{"\t" * id.size}#{id.join('.')} ?(#{@args.join(', ')})"
+
+      context.scope(self) do |scoped_args|
+        puts " => ?(#{scoped_args.join(', ')})"
+
+        kclass = Class.new
+        kclass.send(:define_singleton_method, :const_missing) do |sym|
+          context.deduce(sym)
+        end
+
+        yield context.binds if kclass.class_eval(@expression)
+      end
+    end
+  end
+end

data/lib/rbprolog/rule.rb

@@ -1,5 +1,4 @@
 module Rbprolog
-
   #when fail at one predicate, the output values need be reset, and remove from the parent rule/s context
   class Rule
     attr_accessor :args, :sym
@@ -7,7 +6,7 @@ module Rbprolog
     def initialize(sym, *args, deductions)
       @sym = sym
       @args = args
-      @deductions = [deductions].flatten
+      @deductions = [deductions].flatten.map {|deduction| Deduction === deduction ? deduction : Evaluation.new(deduction.call)}
     end
 
     def each_match(rules, *args, id)
@@ -42,18 +41,9 @@ module Rbprolog
         yield
       else
         deduction = deductions.shift
-        if Deduction === deduction
-          deduction.each_deduce(context, rules, id + [@deductions.size - deductions.size - 1]) do |hash|
-            deduce_deductions(context, rules, *deductions, id, &block)
-          end
-        else
-          @logic.send(:define_singleton_method, :const_missing) do |sym|
-            context[sym]
-          end
-
-          deduction.call && deduce_deductions(context, rules, *deductions, id, &block)
+        deduction.each_deduce(context, rules, id + [@deductions.size - deductions.size - 1]) do |hash|
+          deduce_deductions(context, rules, *deductions, id, &block)
         end
-
       end
     end
   end

data/lib/rbprolog/version.rb

@@ -1,3 +1,3 @@
 module Rbprolog
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/rbprolog.rb

@@ -1,8 +1,54 @@
-require_relative "rbprolog/version"
-require_relative 'rbprolog/context'
-require_relative 'rbprolog/rule'
-require_relative 'rbprolog/deduction'
-require_relative 'rbprolog/var'
+require "rbprolog/version"
+require 'rbprolog/context'
+require 'rbprolog/rule'
+require 'rbprolog/deduction'
+require 'rbprolog/evaluation'
+require 'rbprolog/var'
+
+=begin rdoc
+Simulate the prolog logic processing partially by using ruby based DSL
+
+= Representations (Conventions)
+[rule - class level]
+  * name arg0, arg1, ..., {:if => [deduction0, deduction1, ...]}
+  * name: defined in the keywords
+  * arg: use const to present the variable, and non-const for value
+  * deduction: see below
+
+[fact - class level]
+  * name: arg0, arg1, ...
+
+[deduction - class level]
+  * name? arg0, arg1, ...
+  * return: true or false
+
+[question - instance level]
+  * name? arg0, arg1, ...
+
+[enumerator - instance level]
+  * name! arg0, arg1, ...
+  * Deduce all possible answers
+
+= Example
+  class FriendLogic
+    include Rbprolog
+
+    keywords :likes, :friends
+
+    likes 'p1', 's1'
+    likes 'p1', 's2'
+    likes 'p2', 's2'
+    likes 'p3', 's1'
+    likes 'p4', X
+
+    friends 'p1', W, :if => likes?(W, 's2')
+    friends X, Y, :if => [likes?(X, Z), likes?(Y, Z)]
+  end
+
+  l = FriendLogic.new
+  l.likes?('p1', 's1') #=> true
+  l.friends?('p1', 'p4') #=> true
+=end
 
 module Rbprolog
   def self.included(mod)
@@ -12,6 +58,18 @@ module Rbprolog
     end
   end
 
+  #
+  #Initialize the rbprolog instance, each instance can have its
+  #own fact and rules. The definition can be passed in as string or block.
+  #string is required when variable such as X is used.
+  #  l = FriendLogic.new do
+  #    likes 'p5', 's1'
+  #  end
+  #or
+  #  l = FriendLogic.new %q{
+  #    friends 'p2', X, :if => likes?(X, 's1')
+  #  }
+  #
   def initialize(string = nil, &block)
     if string || block
       self.extend(Rbprolog)
@@ -27,6 +85,7 @@ module Rbprolog
   end
 
   module ClassMethods
+    #Define the vocabulary of rules and facts
     def keywords(*syms)
       raise if syms.any? {|sym| sym.to_s.end_with? '?'}
 
@@ -38,6 +97,7 @@ module Rbprolog
       Var.new(sym)
     end
 
+    #Generate rule, fact and deduction based on conventions
     def method_missing(sym, *args)
       if self.syms.include? sym
         Hash === args.last ? rule(sym, *args) : rule(sym, *args, :if => [])
@@ -48,6 +108,7 @@ module Rbprolog
       end
     end
 
+    #Internal class method to install instance methods for question and enumerator
     def rule(sym, *args, options)
       self.rules ||= []
       self.rules << Rule.new(sym, *args, options[:if])

data/rbprolog.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "simplecov"
 end

data/test/test_evaluation.rb

@@ -0,0 +1,29 @@
+require 'test_helper'
+require 'test/unit'
+require 'rbprolog'
+
+class EvaluationLogic
+  include Rbprolog
+
+  keywords :must, :can, :can_not, :must_not
+
+  %w(a b c).each {|t| must 'win', t}
+  must_not 'linux', 'd'
+  can_not X, Y, :if => [must?(U, Y), ->{'U != X'}]
+  can_not X, Y, :if => must_not?(X, Y)
+  #can X, Y, :if => !can_not?(X, Y)
+end
+
+class TestEvaluation < Test::Unit::TestCase
+  def test_evaluation
+    l = EvaluationLogic.new
+
+    assert_equal true, l.must?('win', 'a')
+    assert_equal true, l.can_not?('linux', 'd')
+    assert_equal true, l.can_not?('linux', 'a')
+    assert_equal true, l.can_not?('linux', 'b')
+    assert_equal true, l.can_not?('linux', 'c')
+
+    assert_equal(['a', 'b', 'c', 'd'], l.can_not!('linux', Rbprolog::Var.new(:G)).map {|hash| hash[:G]}.uniq.sort)
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,2 @@
+require 'simplecov'
+SimpleCov.start

data/test/test_rbprolog.rb

@@ -1,3 +1,4 @@
+require 'test_helper'
 require 'test/unit'
 require 'rbprolog'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbprolog
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ruijia Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A ruby implementation to simulate prolog partially
 email:
 - ruijia.li@gmail.com
@@ -53,10 +67,13 @@ files:
 - lib/rbprolog.rb
 - lib/rbprolog/context.rb
 - lib/rbprolog/deduction.rb
+- lib/rbprolog/evaluation.rb
 - lib/rbprolog/rule.rb
 - lib/rbprolog/var.rb
 - lib/rbprolog/version.rb
 - rbprolog.gemspec
+- test/test_evaluation.rb
+- test/test_helper.rb
 - test/test_rbprolog.rb
 homepage: https://github.com/rli9/rbprolog
 licenses:
@@ -83,4 +100,6 @@ signing_key:
 specification_version: 4
 summary: A prolog DSL in ruby to do AI logic analysis
 test_files:
+- test/test_evaluation.rb
+- test/test_helper.rb
 - test/test_rbprolog.rb