wongi-engine 0.1.4 → 0.2.0

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

@@ -1,39 +1,25 @@
 module Wongi::Engine
 
   class BetaMemory < BetaNode
-
-    def initialize parent
-      super
-      @tokens = []
-    end
-
-    # @override
-    def beta_memory
-      self
-    end
+    include TokenContainer
 
     def seed assignments = {}
       @seed = assignments
       t = Token.new( self, nil, nil, assignments )
-      @tokens << t
+      rete.default_overlay.add_token(t, self)
     end
 
     def subst valuations
-      @tokens.first.destroy
-
+      beta_deactivate(tokens.first)
       token = Token.new( self, nil, nil, @seed )
-      @tokens << token
-
       valuations.each { |variable, value| token.subst variable, value }
-      self.children.each do |child|
-        child.beta_activate token
-      end
+      beta_activate(token)
     end
 
     def beta_activate token
-      existing = @tokens.reject(&:deleted?).find { |et| et.duplicate? token }
+      existing = tokens.find { |et| et.duplicate? token }
       return if existing # TODO really?
-      @tokens << token
+      token.overlay.add_token(token, self)
       children.each do |child|
         child.beta_activate token
       end
@@ -42,7 +28,7 @@ module Wongi::Engine
 
     def beta_deactivate token
       return nil unless tokens.find token
-      @tokens.delete token
+      token.overlay.remove_token(token, self)
       token.deleted!
       if token.parent
         token.parent.children.delete token # should this go into Token#destroy?
@@ -59,15 +45,5 @@ module Wongi::Engine
       end
     end
 
-    # def delete_token token
-    #   @tokens.delete token
-    # end
-
-    # => TODO: investigate if we really need this
-    #def beta_memory
-    #  self
-    #end
-
   end
-
 end

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

@@ -2,12 +2,32 @@ module Wongi::Engine
 
   class BetaNode
 
+    module TokenContainer
+      def tokens
+        Enumerator.new do |y|
+          rete.overlays.each do |overlay|
+            overlay.raw_tokens(self).dup.each do |token|
+              y << token unless token.deleted?
+            end
+            overlay.raw_tokens(self).reject! &:deleted?
+          end
+        end
+      end
+
+      def empty?
+        tokens.first.nil?
+      end
+
+      def size
+        tokens.count
+      end
+    end
+
     include CoreExt
 
     attr_writer :rete
     attr_reader :parent
     attr_accessor :children
-    attr_accessor :context
     attr_predicate :debug
 
     def initialize parent = nil
@@ -18,6 +38,10 @@ module Wongi::Engine
       end
     end
 
+    def root?
+      parent.nil?
+    end
+
     def depth
       @depth ||= if parent.nil?
         0
@@ -29,8 +53,6 @@ module Wongi::Engine
     def rete
       @rete ||= if parent
         parent.rete
-      else
-        @rete
       end
     end
 
@@ -41,86 +63,12 @@ module Wongi::Engine
     abstract :beta_deactivate
     abstract :beta_reactivate
 
-    def beta_memory
-      beta = children.find { |node| BetaMemory === node }
-      if beta.nil?
-        beta = BetaMemory.new self
-        beta.debug = debug?
-        beta.refresh
-      end
-      beta
-    end
-
-    def join_node alpha, tests, assignment, alpha_deaf
-      existing = children.find{ |node| JoinNode === node && node.equivalent?( alpha, tests, assignment ) }
-      return existing if existing
-
-      node = JoinNode.new self, tests, assignment
-      node.alpha = alpha
-      alpha.betas << node unless alpha_deaf
-
-      node
-    end
-
-    def optional_node alpha, tests, assignment, alpha_deaf
-      node = OptionalNode.new self, alpha, tests, assignment
-      alpha.betas << node unless alpha_deaf
-      node
-    end
-
-    def filter_node test
-      existing = children.find{ |node| FilterNode === node && node.equivalent?( test ) }
-      return existing if existing
-
-      node = FilterNode.new self, test
-      node.refresh
-      node
-    end
-
     def assignment_node variable, body
       node = AssignmentNode.new self, variable, body
       node.refresh
       node
     end
 
-    def neg_node alpha, tests, alpha_deaf, unsafe
-      node = NegNode.new self, tests, alpha, unsafe
-      alpha.betas << node unless alpha_deaf
-      node.refresh
-      node
-    end
-
-    def ncc_node condition, earlier, parameters, alpha_deaf
-      bottom = network condition.children, earlier, parameters, alpha_deaf
-      self.children.each do |node|
-        if node.kind_of?( NccNode ) and node.partner.parent == bottom
-          return node
-        end
-      end
-      ncc = NccNode.new self
-      partner = NccPartner.new bottom.beta_memory
-      ncc.partner = partner
-      partner.ncc = ncc
-      partner.divergent = self
-      #    partner.conjuncts = condition.children.size
-      ncc.refresh
-      partner.refresh
-      ncc
-    end
-
-    CompilationContext = Struct.new :node, :rete, :earlier, :parameters, :alpha_deaf do
-      def dup
-        self.class.new( node, rete, earlier.dup, parameters.dup, alpha_deaf )
-      end
-    end
-    
-    def network conditions, earlier, parameters, alpha_deaf
-      # puts "Getting beta subnetwork"
-      conditions.inject(CompilationContext.new self, self.rete, earlier, parameters, alpha_deaf) do |context, condition|
-        condition.compile context
-      end.node
-    end
-
     def refresh
       parent.refresh_child self
     end
@@ -133,24 +81,6 @@ module Wongi::Engine
       # => noop
     end
 
-    def tokens
-      Enumerator.new do |y|
-        @tokens.dup.each do |token|
-          y << token unless token.deleted?
-        end
-        @tokens.reject! &:deleted?
-      end
-    end
-
-    def empty?
-      @tokens.empty?
-    end
-
-    def size
-      @tokens.size
-    end
-    alias_method :length, :size
-
     private
 
     def dp message

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

@@ -6,7 +6,10 @@ module Wongi
         wme.send field
       end
       def inspect
-        "subject of #{wme}"
+        "#{field} of #{wme}"
+      end
+      def to_s
+        inspect
       end
     end
 
@@ -71,24 +74,18 @@ module Wongi
           child.tokens.each do |token|
             if token.wme == wme
               child.beta_deactivate token
-              #token.destroy
             end
           end
         end
       end
 
       def beta_activate token
-        dp "JOIN beta-activated"
         self.alpha.wmes.each do |wme|
-          dp "-TESTING WME #{wme}"
-          assignments = collect_assignments( wme )
           if matches?( token, wme )
-            dp "-WME MATCHED, PROPAGATING"
+            assignments = collect_assignments( wme )
             children.each do |beta|
               beta.beta_activate Token.new( beta, token, wme, assignments )
             end
-          else
-            dp "-NO MATCH"
           end
         end
       end
@@ -98,7 +95,6 @@ module Wongi
           child.tokens.each do |t|
             if t.parent == token
               child.beta_deactivate t
-              #token.destroy
             end
           end
         end
@@ -115,36 +111,6 @@ module Wongi
         end
       end
 
-      def self.compile condition, earlier, parameters
-        tests = []
-        assignment = Template.new :_, :_, :_
-        [:subject, :predicate, :object].each do |field|
-          member = condition.send field
-          if Template.variable?( member )
-
-            contains = parameters.include? member
-            if earlier.any? do |ec|
-                if ec.kind_of?( VariantSet )
-                  ec.introduces_variable?( member )
-                else
-                  ec.respond_to?( :contains? ) and ec.contains?( member )
-                end
-              end
-              contains = true
-            end
-
-            if contains
-              tests << BetaTest.new( field, member )
-            else
-              method = (field.to_s + "=").to_sym
-              assignment.send method, member
-            end
-
-          end
-        end
-        return tests, assignment
-      end
-
       protected
 
       def matches? token, wme
@@ -156,13 +122,15 @@ module Wongi
 
       def collect_assignments wme
         assignments = {}
-        return assignments if self.assignment_pattern.nil?
-        # puts "more assignments"
-        [:subject, :predicate, :object].each do |field|
-          if self.assignment_pattern.send(field) != :_
-            #puts "#{self.assignment_pattern.send(field)} = #{wme.send(field)}"
-            assignments[ self.assignment_pattern.send(field) ] = TokenAssignment.new( wme, field )
-          end
+        return assignments if assignment_pattern.nil?
+        if assignment_pattern.subject != :_
+          assignments[ assignment_pattern.subject ] = TokenAssignment.new(wme, :subject)
+        end
+        if assignment_pattern.predicate != :_
+          assignments[ assignment_pattern.predicate ] = TokenAssignment.new(wme, :predicate)
+        end
+        if assignment_pattern.object != :_
+          assignments[ assignment_pattern.object ] = TokenAssignment.new(wme, :object)
         end
         assignments
       end

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

@@ -1,35 +1,18 @@
 module Wongi
   module Engine
-    class NccSet
-
-      attr_reader :children
-      def initialize conditions
-        @children = conditions
-      end
-
-      def compile context
-        context.node = context.node.beta_memory.ncc_node( self, context.earlier, context.parameters, false )
-        context.node.context = context
-        context.earlier << self
-        context
-      end
-
-    end
-
     class NccNode < BetaNode
+      include TokenContainer
 
-      attr_reader :tokens
       attr_accessor :partner
 
       def initialize parent
         super
-        @tokens = []
       end
 
       def beta_activate token
-        return if @tokens.find { |t| t.parent == token }
+        return if tokens.find { |t| t.parent == token }
         t = Token.new self, token, nil, {}
-        @tokens << t
+        t.overlay.add_token(t, self)
         partner.tokens.each do |ncc_token|
           next unless ncc_token.ancestors.find { |a| a.equal? token }
           t.ncc_results << ncc_token
@@ -43,8 +26,9 @@ module Wongi
       end
 
       def beta_deactivate token
-        t = @tokens.find { |tok| tok.parent == token }
-        return unless @tokens.delete t
+        t = tokens.find { |tok| tok.parent == token }
+        return unless t
+        t.overlay.remove_token(t, self)
         t.deleted!
         partner.tokens.select { |ncc| ncc.owner == t }.each do |ncc_token|
           ncc_token.owner = nil
@@ -59,14 +43,14 @@ module Wongi
 
       def ncc_activate token
         token.deleted = false
-        @tokens << token unless @tokens.include?( token )
+        token.overlay.add_token(token, self)
         children.each do |child|
           child.beta_activate Token.new( child, token, nil, { } )
         end
       end
 
       def ncc_deactivate token
-        return unless @tokens.delete token
+        token.overlay.remove_token(token, self)
         token.deleted!
         children.each do |beta|
           beta.tokens.select { |t| t.parent == token }.each do |t|
@@ -82,16 +66,6 @@ module Wongi
           end
         end
       end
-
-      # def delete_token token
-      #   tokens.delete token
-      #   token.ncc_results.each do |nccr|
-      #     nccr.wme.tokens.delete( nccr ) if nccr.wme
-      #     nccr.parent.children.delete nccr
-      #   end
-      #   token.ncc_results.clear
-      # end
-
     end
   end
 end

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

@@ -1,22 +1,15 @@
 module Wongi
   module Engine
     class NccPartner < BetaNode
+      include TokenContainer
 
-      attr_reader :tokens
-      #  attr_accessor :conjuncts
       attr_accessor :ncc
       attr_accessor :divergent
 
-      def initialize parent
-        super
-        #    @conjuncts = 0
-        @tokens = []
-      end
-
       def beta_activate token
         t = Token.new self, token, nil, {}
         owner = owner_for( t )
-        tokens << t
+        t.overlay.add_token(t, self)
         if owner
           owner.ncc_results << t
           t.owner = owner
@@ -27,6 +20,7 @@ module Wongi
       def beta_deactivate t
         token = tokens.find { |tok| tok.parent == t }
         return unless token
+        token.overlay.remove_token(token, self)
         token.owner.ncc_results.delete token
         if token.owner.ncc_results.empty?
           ncc.ncc_activate token.owner
@@ -39,16 +33,6 @@ module Wongi
         divergent_token = token.ancestors.find { |t| t.node == divergent }
         ncc.tokens.find { |t| t.ancestors.include? divergent_token }
       end
-
-      # def delete_token token
-      #   token.owner.ncc_results.delete token
-      #   if token.owner.ncc_results.empty?
-      #     ncc.children.each do |node|
-      #       node.beta_activate token.owner, nil, {}
-      #     end
-      #   end
-
-      # end
     end
   end
 end

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

@@ -9,17 +9,17 @@ module Wongi
     end
 
     class NegNode < BetaNode
+      include TokenContainer
 
       attr_reader :alpha, :tests
 
       def initialize parent, tests, alpha, unsafe
         super(parent)
         @tests, @alpha, @unsafe = tests, alpha, unsafe
-        @tokens = []
       end
 
       def alpha_activate wme
-        self.tokens.each do |token|
+        tokens.each do |token|
           if matches?( token, wme ) && ( @unsafe || ! token.generated?( wme ) )# feedback loop protection
             # order matters for proper invalidation
             make_join_result(token, wme)
@@ -38,7 +38,7 @@ module Wongi
 
       def alpha_deactivate wme
         wme.neg_join_results.dup.each do |njr|
-          safe_tokens.each do |token|
+          tokens.each do |token|
             next unless token == njr.token
             njr.unlink
             if token.neg_join_results.empty?
@@ -51,8 +51,8 @@ module Wongi
       end
 
       def beta_activate token
-        return if @tokens.find { |et| et.duplicate? token }
-        @tokens << token
+        return if tokens.find { |et| et.duplicate? token }
+        token.overlay.add_token(token, self)
         alpha.wmes.each do |wme|
           if matches?( token, wme )
             make_join_result(token, wme)
@@ -67,7 +67,7 @@ module Wongi
 
       def beta_deactivate token
         return nil unless tokens.find token
-        @tokens.delete token
+        token.overlay.remove_token(token, self)
         token.deleted!
         if token.parent
           token.parent.children.delete token # should this go into Token#destroy?
@@ -85,7 +85,7 @@ module Wongi
       end
 
       def refresh_child child
-        safe_tokens.each do |token|
+        tokens.each do |token|
           if token.neg_join_results.empty?
             child.beta_activate Token.new( child, token, nil, {} )
           end
@@ -118,15 +118,6 @@ module Wongi
         token.neg_join_results << njr
         wme.neg_join_results << njr
       end
-
-      def safe_tokens
-        Enumerator.new do |y|
-          @tokens.dup.each do |token|
-            y << token unless token.deleted?
-          end
-        end
-      end
-
     end
   end
 end

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

@@ -9,15 +9,15 @@ module Wongi
     end
 
     class OptionalNode < BetaNode
+      include TokenContainer
 
-      attr_reader :alpha, :tests, :assignments, :tokens
+      attr_reader :alpha, :tests, :assignment_pattern
 
       def initialize parent, alpha, tests, assignments
         super( parent )
         @alpha = alpha
         @tests = tests
-        @assignments = assignments
-        @tokens = []
+        @assignment_pattern = assignments
       end
 
       def make_opt_result token, wme
@@ -28,13 +28,13 @@ module Wongi
 
       def alpha_activate wme
         assignments = collect_assignments( wme )
-        self.tokens.each do |token|
+        tokens.each do |token|
           if matches? token, wme
             children.each do |child|
               if token.optional?
                 token.no_optional!
-                child.tokens.select { |ct| ct.parent == token }.each do |ct|
-                  child.beta_deactivate ct
+                child.tokens.each do |ct|
+                  child.beta_deactivate(ct) if ct.parent == token
                 end
               end
               child.beta_activate Token.new( child, token, wme, assignments )
@@ -46,12 +46,13 @@ module Wongi
 
       def alpha_deactivate wme
         wme.opt_join_results.dup.each do |ojr|
-          safe_tokens.select { |token| token == ojr.token }.each do |token|
+          tokens.each do |token|
+            next unless token == ojr.token
             ojr.unlink
             if token.opt_join_results.empty?
               children.each do |child|
-                child.tokens.select { |ct| ct.parent == token }.each do |ct|
-                  child.beta_deactivate ct
+                child.tokens.each do |ct|
+                  child.beta_deactivate(ct) if ct.parent == token
                 end
                 token.optional!
                 child.beta_activate Token.new( child, token, nil, { } )
@@ -62,9 +63,9 @@ module Wongi
       end
 
       def beta_activate t
-        return if @tokens.find { |token| token.parent == t }
+        return if tokens.find { |token| token.parent == t }
         token = Token.new( self, t, nil, { } )
-        @tokens << token
+        token.overlay.add_token(token, self)
         match = false
         alpha.wmes.each do |wme|
           assignments = collect_assignments(wme)
@@ -85,9 +86,9 @@ module Wongi
       end
 
       def beta_deactivate t
-        token = @tokens.find { |token| token.parent == t }
+        token = tokens.find { |token| token.parent == t }
         return unless token
-        return unless @tokens.delete token
+        token.overlay.remove_token(token, self)
         token.deleted!
         if token.parent
           token.parent.children.delete token
@@ -97,7 +98,6 @@ module Wongi
           child.tokens.each do |t|
             if t.parent == token
               child.beta_deactivate t
-              #token.destroy
             end
           end
         end
@@ -133,25 +133,18 @@ module Wongi
 
       def collect_assignments wme
         assignments = {}
-        return assignments if self.assignments.nil?
-        # puts "more assignments"
-        [:subject, :predicate, :object].each do |field|
-          if self.assignments.send(field) != :_
-            #puts "#{self.assignments.send(field)} = #{wme.send(field)}"
-            assignments[ self.assignments.send(field) ] = TokenAssignment.new( wme, field )
-          end
+        return assignments if assignment_pattern.nil?
+        if assignment_pattern.subject != :_
+          assignments[ assignment_pattern.subject ] = TokenAssignment.new(wme, :subject)
         end
-        assignments
-      end
-
-      def safe_tokens
-        Enumerator.new do |y|
-          @tokens.dup.each do |token|
-            y << token unless token.deleted?
-          end
+        if assignment_pattern.predicate != :_
+          assignments[ assignment_pattern.predicate ] = TokenAssignment.new(wme, :predicate)
+        end
+        if assignment_pattern.object != :_
+          assignments[ assignment_pattern.object ] = TokenAssignment.new(wme, :object)
         end
+        assignments
       end
-
     end
   end
 end