rbprolog 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6af2d1c30e5537ecd0129fb9ff8ec732751091c2
-  data.tar.gz: fdb511793cdaa753e458f6c7629209f0c1a9744a
+  metadata.gz: 53b585062269fdd1b34299a6062ed17d194a24a0
+  data.tar.gz: 189dee03f4f9bf9d6af6ad3ab04a1b1a6f6b8b1a
 SHA512:
-  metadata.gz: 8e9cb8fa7831f2b504b440b2a31ccc2f4a14c0db2ac1e5380af7079d46b14d09d8cc5cec21db243e19eb57f17fb3666a6a94ec1074fb64f822fd216e346eff43
-  data.tar.gz: 61703cdc1663c95c817dd7ebc032712c701b8c12fb1180e1b907ae13a546d9aeedc5d1e0c422078c8f163caa6f4dab47ed07ecba27871d6c3015e7aa1c0364c9
+  metadata.gz: f268165d241aeaf52c27044b3a69c89a92ae4ad5380e1274189d01b6efbab70d117719ec7dd3c9ccf710fd353d64d17a7f0fa9437549cffc5461537029163965
+  data.tar.gz: d615a690017127e4a957412ce550b2beaf832f3a97d0ccb48a80c810b5672ee1b37bd5ea431fbbdc646ada966daaf8583b2043468cb8f17f9f5d87b25adf4048

data/.gitignore

@@ -14,4 +14,5 @@ rdoc
 spec/reports
 test/tmp
 test/version_tmp
-tmp
+tmp
+.project

data/lib/rbprolog/context.rb

@@ -9,12 +9,7 @@ module Rbprolog
 
     def match!(v1, v2)
       if match?(v1, v2)
-        if Var === v1 && !(Var === v2)
-          @binds[v1.sym] = v2
-        # elsif Var === v2 && !(Var === v1)
-          # @binds[v2.sym] = v1
-        end
-
+        @binds[v1.sym] = v2 if Var === v1 && !(Var === v2)
         true
       else
         false

data/lib/rbprolog/deduction.rb

@@ -1,6 +1,7 @@
 module Rbprolog
   class Deduction
     include Enumerable
+
     attr_accessor :args, :sym
 
     def initialize(logic, sym, *args)
@@ -11,19 +12,19 @@ module Rbprolog
     end
 
     def each
-      each_deduce(Context.new, @logic.rules, "", []) do |hash|
+      each_deduce(Context.new, @logic.rules, []) do |hash|
         yield hash
       end
     end
 
-    def each_deduce(context, rules, tabs, id)
-      print "#{tabs}#{id.join('.')} #{@sym}?(#{@args.map(&:to_s).join(', ')})"
+    def each_deduce(context, rules, id)
+      print "#{"\t" * id.size}#{id.join('.')} #{@sym}?(#{@args.map(&:to_s).join(', ')})"
 
       rules.select {|rule| rule.sym == @sym}.each_with_index do |rule, i|
         context.scope(self) do
-          puts " => #{@sym}?(#{@args.map {|arg| context.deduce(arg).to_s}.join(', ')})" if i == 0 #{context.to_s} #{context.binds.inspect}" if i == 0
+          puts " => #{@sym}?(#{@args.map {|arg| context.deduce(arg).to_s}.join(', ')})" if i == 0
 
-          rule.each_deduce(rules, *@args.map {|arg| context.deduce(arg)}, tabs + "\t", id + [i]) do |hash|
+          rule.each_deduce(rules, *@args.map {|arg| context.deduce(arg)}, id + [i]) do |hash|
             context.scope(self) do
               rule.args.each_with_index do |rule_arg, rule_arg_index|
                 deduced_arg = context.deduce(@args[rule_arg_index])

data/lib/rbprolog/rule.rb

@@ -4,20 +4,20 @@ module Rbprolog
   class Rule
     attr_accessor :args, :sym
 
-    def initialize(sym, *args, predicates)
+    def initialize(sym, *args, deductions)
       @sym = sym
       @args = args
-      @predicates = [predicates].flatten
+      @deductions = [deductions].flatten
     end
 
-    def each_deduce(rules, *args, tabs, id)
-      print "#{tabs}#{id.join('.')} #{@sym}(#{@args.map(&:to_s).join(', ')}).deduce(#{args.map(&:to_s).join(', ')})"
+    def each_deduce(rules, *args, id)
+      print "#{"\t" * id.size}#{id.join('.')} #{@sym}(#{@args.map(&:to_s).join(', ')}).deduce(#{args.map(&:to_s).join(', ')})"
 
       context = Context.new
       context.scope(self) do
         if self.match!(context, args)
           puts " => #{@sym}(#{@args.map {|arg| context.deduce(arg).to_s}.join(', ')})" #{context.to_s} #{context.binds.inspect}"
-          deduce_predicates(context, rules, *@predicates, tabs, id) do
+          deduce_deductions(context, rules, *@deductions, id) do
             yield context.binds
           end
         else
@@ -26,34 +26,35 @@ module Rbprolog
       end
     end
 
-    def deduce_predicates(context, rules, *predicates, tabs, id, &block)
-      if predicates.empty?
+    def match?(context, args)
+      @args.size == args.size && @args.zip(args).all? {|v1, v2| context.match?(v1, v2)}
+    end
+
+    def match!(context, args)
+      match = match?(context, args)
+      @args.zip(args).each {|v1, v2| context.match!(v1, v2)} if match
+      match
+    end
+
+    private
+    def deduce_deductions(context, rules, *deductions, id, &block)
+      if deductions.empty?
         yield
       else
-        predicate = predicates.shift
+        predicate = deductions.shift
         if Deduction === predicate
-          predicate.each_deduce(context, rules, tabs + "\t", id + [@predicates.size - predicates.size - 1]) do |hash|
-            deduce_predicates(context, rules, *predicates, tabs, id, &block)
+          predicate.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.binds[sym]
           end
 
-          predicate.call && deduce_predicates(context, rules, *predicates, tabs, id, &block)
+          predicate.call && deduce_deductions(context, rules, *deductions, id, &block)
         end
 
       end
     end
-
-    def match?(context, args)
-      @args.size == args.size && @args.zip(args).all? {|v1, v2| context.match?(v1, v2)}
-    end
-
-    def match!(context, args)
-      match = match?(context, args)
-      @args.zip(args).each {|v1, v2| context.match!(v1, v2)} if match
-      match
-    end
   end
 end

data/lib/rbprolog/version.rb

@@ -1,3 +1,3 @@
 module Rbprolog
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/rbprolog.gemspec

@@ -6,11 +6,11 @@ require 'rbprolog/version'
 Gem::Specification.new do |spec|
   spec.name          = "rbprolog"
   spec.version       = Rbprolog::VERSION
-  spec.authors       = ["ruijia.li"]
+  spec.authors       = ["Ruijia Li"]
   spec.email         = ["ruijia.li@gmail.com"]
   spec.description   = %q{A ruby implementation to simulate prolog partially}
   spec.summary       = %q{A prolog DSL in ruby to do AI logic analysis}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/rli9/rbprolog"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.metadata = { "Source Code" => "https://github.com/rli9/rbprolog" }
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

data/test/test_rbprolog.rb

@@ -1,5 +1,5 @@
 require 'test/unit'
-require_relative '../lib/rbprolog'
+require 'rbprolog'
 
 class FriendLogic
   include Rbprolog
@@ -17,20 +17,43 @@ class FriendLogic
 end
 
 class TestRbprolog < Test::Unit::TestCase
-  def test_friend_logic
-    l = FriendLogic.new do
-      likes 'p5', 's1'
-    end
+  def test_fact_should_be_deduced
+    l = FriendLogic.new
 
     assert_equal true, l.likes?('p1', 's1')
     assert_equal true, l.likes?('p1', 's2')
+
+    assert_equal ['s1', 's2'], l.likes!('p1', Rbprolog::Var.new(:X)).map {|hash| hash[:X]}.uniq
+  end
+
+  def test_rule_should_be_deduced
+    l = FriendLogic.new
+
     assert_equal true, l.friends?('p1', 'p2')
     assert_equal true, l.friends?('p1', 'p3')
     assert_equal true, l.friends?('p1', 'p4')
     assert_equal false, l.friends?('p1', 'p6')
-    assert_equal true, l.likes?('p5', 's1')
 
-    assert_equal ['s1', 's2'], l.likes!('p1', Rbprolog::Var.new(:X)).map {|hash| hash[:X]}.uniq
-    assert_equal ['p1', 'p2', 'p3', 'p4', 'p5'], l.friends!('p1', Rbprolog::Var.new(:W)).map {|hash| hash[:W]}.uniq.sort
+    assert_equal ['p1', 'p2', 'p3', 'p4'], l.friends!('p1', Rbprolog::Var.new(:W)).map {|hash| hash[:W]}.uniq.sort
+  end
+
+  def test_logic_instances_should_be_independent
+    l1 = FriendLogic.new do
+      likes 'p5', 's1'
+    end
+
+    l2 = FriendLogic.new do
+      likes 'p5', 's2'
+    end
+
+    assert_equal true, l1.likes?('p5', 's1')
+    assert_equal false, l1.likes?('p5', 's2')
+    assert_equal true, l1.friends?('p5', 'p3')
+    assert_equal false, l1.friends?('p5', 'p2')
+
+    assert_equal false, l2.likes?('p5', 's1')
+    assert_equal true, l2.likes?('p5', 's2')
+    assert_equal false, l2.friends?('p5', 'p3')
+    assert_equal true, l2.friends?('p5', 'p2')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbprolog
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
-- ruijia.li
+- Ruijia Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,10 +58,11 @@ files:
 - lib/rbprolog/version.rb
 - rbprolog.gemspec
 - test/test_rbprolog.rb
-homepage: ''
+homepage: https://github.com/rli9/rbprolog
 licenses:
 - MIT
-metadata: {}
+metadata:
+  Source Code: https://github.com/rli9/rbprolog
 post_install_message: 
 rdoc_options: []
 require_paths: