wongi-engine 0.0.3 → 0.0.5

data/README.md

@@ -411,6 +411,16 @@ The Rete implementation in this library largely follows the outline presented in
 
 ## Changelog
 
+### 0.0.4
+
+* reintegrated RDF support
+* collapsible filter matchers
+
+### 0.0.3
+
+* bug fixes
+* `assert`, `assign`
+
 ### 0.0.1
 
 * initial repackaged release

data/examples/rdf.n3

@@ -0,0 +1,6 @@
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix test: <http://test/> .
+
+test:b test:x [
+	test:z test:y
+] .

data/examples/rdf.rb

@@ -0,0 +1,14 @@
+require 'wongi-rdf'
+require 'wongi-engine'
+
+engine = Wongi::Engine.create
+engine.rdf!
+parser = Wongi::RDF::Parser.new
+parser.parse_file File.expand_path( "rdf.n3", File.dirname(__FILE__) ), engine
+
+engine.each do |wme|
+  puts wme
+end
+
+serializer = Wongi::RDF::Serializer.new engine
+puts serializer.serialize

data/lib/wongi-engine.rb

@@ -6,6 +6,15 @@ module Wongi
     end
 
   end
+
+  # pre-declare things to avoid undefined constants
+  module RDF
+
+    class Document; end
+    class Statement; end
+    class Node; end
+
+  end
 end
 
 require 'wongi-engine/version'

data/lib/wongi-engine/beta/beta_node.rb

@@ -44,11 +44,11 @@ module Wongi::Engine
       beta
     end
 
-    def join_node alpha, tests, assignment, alpha_deaf
-      existing = children.find{ |node| JoinNode === node && node.equivalent?( alpha, tests, assignment ) }
+    def join_node alpha, tests, assignment, filters, alpha_deaf
+      existing = children.find{ |node| JoinNode === node && node.equivalent?( alpha, tests, assignment, filters ) }
       return existing if existing
 
-      node = JoinNode.new self, tests, assignment
+      node = JoinNode.new self, tests, assignment, filters
       node.alpha = alpha
       alpha.betas << node unless alpha_deaf
 

data/lib/wongi-engine/beta/join_node.rb

@@ -28,21 +28,26 @@ module Wongi
       attr_accessor :alpha
       attr_reader :tests
       attr_reader :assignment_pattern
+      attr_reader :filters
 
-      def initialize parent, tests, assignment
+      def initialize parent, tests, assignment, filters
         super(parent)
         @tests = tests
         @assignment_pattern = assignment
+        @filters = filters
       end
 
-      def equivalent? alpha, tests, assignment_pattern
+      def equivalent? alpha, tests, assignment_pattern, filters
         return false unless self.alpha == alpha
         return false unless self.assignment_pattern == assignment_pattern
-        return false unless (self.tests.empty? && tests.empty?) || self.tests.all? { |my_test|
+        return false unless (self.tests.empty? && tests.empty?) || self.tests.length == tests.length && self.tests.all? { |my_test|
           tests.any? { |new_test|
             my_test.equivalent? new_test
           }
         }
+        return false unless (self.filters.empty? && filters.empty?) || self.filters.length == filters.length && self.filters.all? { |my_filter|
+          filters.include? my_filter
+        }
         true
       end
 
@@ -58,7 +63,7 @@ module Wongi
         # puts "PARENT HAS #{parent.tokens.length} TOKENS"
         self.parent.tokens.each do |token|
           # puts "#{ws}matching with token"
-          if matches?( token, wme )
+          if matches?( token, wme ) && passes_filters?( token, wme, collected )
             # puts "#{ws}JOIN RIGHT-MATCHED, PROPAGATING"
             propagate_activation token, wme, collected
           end
@@ -68,8 +73,9 @@ module Wongi
       def beta_activate token
         ws = '  ' * depth
         self.alpha.wmes.uniq.each do |wme|
-          if matches?( token, wme )
-            propagate_activation token, wme, collect_assignments( wme )
+          collected = collect_assignments( wme )
+          if matches?( token, wme ) && passes_filters?( token, wme, collected )
+            propagate_activation token, wme, collected
           end
         end
       end
@@ -118,6 +124,11 @@ module Wongi
         true
       end
 
+      def passes_filters? token, wme, assignments
+        t = FakeToken.new token, wme, assignments
+        @filters.all? { |filter| filter.passes? t }
+      end
+
       def collect_assignments wme
         assignments = {}
         return assignments if self.assignment_pattern.nil?

data/lib/wongi-engine/beta/optional_node.rb

@@ -5,6 +5,10 @@ module Wongi
 
     class OptionalNode < JoinNode
 
+      def initialize parent, tests, assignment
+        super parent, tests, assignment, []
+      end
+
       def alpha_activate wme
         parent.tokens.each do |token|
           if matches? token, wme

data/lib/wongi-engine/dsl.rb

@@ -46,10 +46,10 @@ dsl {
   section :forall
 
   clause :has, :fact
-  action Wongi::Engine::Template
+  accept Wongi::Engine::Template
 
   clause :missing, :neg
-  action Wongi::Engine::NegTemplate
+  accept Wongi::Engine::NegTemplate
 
   clause :none, :ncc
   accept Wongi::Engine::NccProductionRule

data/lib/wongi-engine/dsl/generic_production_rule.rb

@@ -68,7 +68,11 @@ module Wongi::Engine
     attr_writer :conditions, :actions
 
     def accept stuff
-      @acceptors[@current_section] << stuff
+      if stuff.respond_to? :accept_into
+        stuff.accept_into @acceptors[@current_section]
+      else
+        @acceptors[@current_section] << stuff
+      end
     end
 
 

data/lib/wongi-engine/filter/filter_test.rb

@@ -6,6 +6,14 @@ module Wongi::Engine
       raise "#{self.class} must implement #passes?"
     end
 
+    def accept_into acceptors
+      if acceptors.last && acceptors.last.respond_to?( :filters )
+        acceptors.last.filters << self
+      else
+        acceptors << self
+      end
+    end
+
     def compile context
       context.node = context.node.beta_memory.filter_node( self )
       context.earlier << self
@@ -13,7 +21,7 @@ module Wongi::Engine
     end
 
     def == other
-      self.class == other.class
+      false
     end
 
   end

data/lib/wongi-engine/graph.rb

@@ -8,6 +8,8 @@ module Wongi::Engine
 
     def dot io, opts = { }
 
+      @seen_betas = []
+
       if String === io
         File.open io, "w" do |actual_io|
           dot actual_io
@@ -47,10 +49,9 @@ module Wongi::Engine
     end
 
     def dump_beta beta, opts
+      return if @seen_betas.include? beta
+      @seen_betas << beta
       @io.puts "node#{print_hash beta.hash} [label=\"#{beta.class.name.split('::').last}\"];"
-      if beta.parent
-        @io.puts "node#{print_hash beta.parent.hash} -> node#{print_hash beta.hash};"
-      end
       if beta.is_a? NccNode
         @io.puts "node#{print_hash beta.partner.hash} -> node#{print_hash beta.hash};"
         @io.puts "{ rank=same; node#{print_hash beta.partner.hash} node#{print_hash beta.hash} }"
@@ -62,6 +63,7 @@ module Wongi::Engine
         end
       end
       beta.children.each do |child|
+        @io.puts "node#{print_hash beta.hash} -> node#{print_hash child.hash};"
         dump_beta child, opts
       end
     end

data/lib/wongi-engine/network.rb

@@ -21,6 +21,28 @@ module Wongi::Engine
       extend NetworkParts::Debug
     end
 
+    def rdf!
+      if ! defined? Wongi::RDF::DocumentSupport
+        begin
+          require 'wongi-rdf'
+        rescue LoadError => e
+          raise "'wongi-rdf' is required for RDF support"
+        end
+      end
+
+      extend Wongi::RDF::DocumentSupport
+      class << self
+        def statements
+          alpha_top.wmes
+        end
+      end
+
+      @namespaces = { }
+      @blank_counter = 1
+      @ns_counter = 0
+      @used_blanks = { }
+    end
+
     def initialize
       @timeline = []
       self.alpha_top = AlphaMemory.new( Template.new( :_, :_, :_ ), self )
@@ -51,12 +73,12 @@ module Wongi::Engine
 
     def import thing
       case thing
-      when String, Numeric, TrueClass, FalseClass, NilClass
+      when String, Numeric, TrueClass, FalseClass, NilClass, Wongi::RDF::Node
         thing
       when Symbol
         thing
       else
-        raise "I don't know how to import a #{thing.class}"
+        thing
       end
     end
 
@@ -154,11 +176,13 @@ module Wongi::Engine
         something.install self
       when WME
         assert something
+      when Wongi::RDF::Statement
+        assert WME.new( something.subject, something.predicate, something.object, self )
       #when Wongi::RDF::Document
         #  something.statements.each do |st|
         #    assert WME.new( st.subject, st.predicate, st.object, self )
         #  end
-      when Rete
+      when Network
         something.each do |st|
           assert st.import_into( self )
         end

data/lib/wongi-engine/template.rb

@@ -4,6 +4,7 @@ module Wongi::Engine
 
     include CoreExt
 
+    attr_reader :filters
     attr_predicate debug: false
 
     def self.variable? thing
@@ -14,10 +15,13 @@ module Wongi::Engine
       raise "Cannot work with continuous time" unless time.integer?
       raise "Cannot look into the future" if time > 0
       super
+      @filters = []
     end
 
     def import_into r
-      self.class.new r.import( subject ), r.import( predicate ), r.import( object ), time
+      copy = self.class.new r.import( subject ), r.import( predicate ), r.import( object ), time
+      @filters.each { |f| copy.filters << f }
+      copy
     end
 
     def root?
@@ -60,7 +64,7 @@ module Wongi::Engine
     def compile context
       tests, assignment = *JoinNode.compile( self, context.earlier, context.parameters )
       alpha = context.rete.compile_alpha( self )
-      context.node = context.node.beta_memory.join_node( alpha, tests, assignment, context.alpha_deaf )
+      context.node = context.node.beta_memory.join_node( alpha, tests, assignment, @filters, context.alpha_deaf )
       context.earlier << self
       context
     end

data/lib/wongi-engine/token.rb

@@ -98,4 +98,15 @@ module Wongi::Engine
 
   end
 
+  class FakeToken < Token
+    def initialize token, wme, assignments
+      @parent, @wme, @assignments = token, wme, assignments
+      @children = []
+      @neg_join_results = []
+      @opt_join_results = []
+      @ncc_results = []
+      @generated_wmes = []
+    end
+  end
+
 end

data/lib/wongi-engine/version.rb

@@ -1,5 +1,5 @@
 module Wongi
   module Engine
-    VERSION = "0.0.3"
+    VERSION = "0.0.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wongi-engine
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-12-13 00:00:00.000000000 Z
 dependencies: []
 description: A rule engine.
 email:
@@ -26,6 +26,8 @@ files:
 - examples/ex01.rb
 - examples/ex02.rb
 - examples/graphviz.rb
+- examples/rdf.n3
+- examples/rdf.rb
 - examples/timeline.rb
 - lib/wongi-engine.rb
 - lib/wongi-engine/alpha_memory.rb