wongi-engine 0.0.17 → 0.1.0.alpha1

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

@@ -1,45 +1,107 @@
 module Wongi
   module Engine
 
-    OptionalJoinResult = Struct.new :owner, :wme
+    OptionalJoinResult = Struct.new :token, :wme do
+      def unlink
+        wme.opt_join_results.delete self
+        token.opt_join_results.delete self
+      end
+    end
+
+    class OptionalNode < BetaNode
+
+      attr_reader :alpha, :tests, :assignments, :tokens
 
-    class OptionalNode < JoinNode
+      def initialize parent, alpha, tests, assignments
+        super( parent )
+        @alpha = alpha
+        @tests = tests
+        @assignments = assignments
+        @tokens = []
+      end
 
-      def initialize parent, tests, assignment
-        super parent, tests, assignment, []
+      def make_opt_result token, wme
+        jr = OptionalJoinResult.new token, wme
+        token.opt_join_results << jr
+        wme.opt_join_results << jr
       end
 
       def alpha_activate wme
-        parent.tokens.each do |token|
+        assignments = collect_assignments( wme )
+        self.tokens.each do |token|
           if matches? token, wme
-            if token.has_optional?
-              token.has_optional = false
-              token.delete_children
+            children.each do |child|
+              if token.optional?
+                token.no_optional!
+                child.tokens.select { |ct| ct.parent == token }.each do |ct|
+                  child.beta_deactivate ct
+                end
+              end
+              child.beta_activate Token.new( child, token, wme, assignments )
             end
-            propagate_activation(token, wme, collect_assignments(wme))
-            jr = OptionalJoinResult.new token, wme
-            token.opt_join_results << jr
-            wme.opt_join_results << jr
+            make_opt_result token, wme
           end
         end
       end
 
-      def beta_activate token
+      def alpha_deactivate wme
+        wme.opt_join_results.dup.each do |ojr|
+          safe_tokens.select { |token| token == ojr.token }.each do |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
+                end
+                token.optional!
+                child.beta_activate Token.new( child, token, nil, { } )
+              end
+            end
+          end
+        end
+      end
+
+      def beta_activate t
+        return if @tokens.find { |token| token.parent == t }
+        token = Token.new( self, t, nil, { } )
+        @tokens << token
         match = false
         alpha.wmes.each do |wme|
           assignments = collect_assignments(wme)
           if matches? token, wme
             match = true
-            propagate_activation(token, wme, assignments)
-            jr = OptionalJoinResult.new token, wme
-            token.opt_join_results << jr
-            wme.opt_join_results << jr
+            children.each do |child|
+              child.beta_activate Token.new( child, token, wme, assignments )
+            end
+            make_opt_result token, wme
           end
         end
         unless match
-          token.has_optional = true
-          propagate_activation(token, nil, {})
+          token.optional!
+          children.each do |child|
+            child.beta_activate Token.new( child, token, nil, { } )
+          end
+        end
+      end
+
+      def beta_deactivate t
+        token = @tokens.find { |token| token.parent == t }
+        return unless token
+        return unless @tokens.delete token
+        token.deleted!
+        if token.parent
+          token.parent.children.delete token
         end
+        token.opt_join_results.each &:unlink
+        children.each do |child|
+          child.tokens.each do |t|
+            if t.parent == token
+              child.beta_deactivate t
+              #token.destroy
+            end
+          end
+        end
+        token
       end
 
       def refresh_child child
@@ -60,6 +122,36 @@ module Wongi
         token.opt_join_results.clear
       end
 
+      private
+
+      def matches? token, wme
+        @tests.each do |test|
+          return false unless test.matches?( token, wme )
+        end
+        true
+      end
+
+      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
+        end
+        assignments
+      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/production_node.rb

@@ -7,17 +7,20 @@ module Wongi
 
       def initialize parent, actions
         super(parent)
-        @actions = actions
-        @actions.each { |action| action.production = self }
+        @actions = actions.each { |action| action.production = self }
       end
 
-      def beta_activate token, wme, assignments
-        generated = super
+      def beta_activate token
+        return unless super
         @actions.each do |action|
-          # @tokens.each do |t|
-          #  action.execute t
-          # end
-          action.execute generated if action.respond_to? :execute
+          action.execute token if action.respond_to? :execute
+        end
+      end
+
+      def beta_deactivate token
+        return unless super
+        @actions.each do |action|
+          action.deexecute token if action.respond_to? :deexecute
         end
       end
 

data/lib/wongi-engine/core_ext.rb

@@ -46,6 +46,12 @@ module Wongi::Engine
         end
       end
 
+      def abstract name
+        define_method name do |*args|
+          raise NoMethodError.new "#{name} is not implemented for #{self.class.name}", name
+        end
+      end
+
     end
 
     def self.included mod

data/lib/wongi-engine/dsl/actions/simple_action.rb

@@ -3,14 +3,20 @@ module Wongi::Engine
   class SimpleAction < Action
 
     def initialize action = nil, *args, &block
-      @action = if action.is_a? Class
-        action.new *args, &block
-      else
-        action || block
+      @args = args
+      case action
+      when Class
+        @action = @deaction = @reaction = action.new *args, &block
+      when Hash
+        @action   = instance_or_proc action[:activate]
+        @deaction = instance_or_proc action[:deactivate]
+        @reaction = instance_or_proc action[:reactivate]
       end
+      @action ||= block
     end
 
     def execute token
+      return unless @action
       if @action.is_a?( Proc ) || @action.respond_to?( :to_proc )
         rete.instance_exec token, &@action
       elsif @action.respond_to? :call
@@ -20,6 +26,37 @@ module Wongi::Engine
       end
     end
 
+    def deexecute token
+      return unless @deaction
+      if @deaction.is_a?( Proc ) || @deaction.respond_to?( :to_proc )
+        rete.instance_exec token, &@deaction
+      elsif @deaction.respond_to? :call
+        @deaction.call token
+      elsif @deaction.respond_to? :deexecute
+        @deaction.execute token
+      end
+    end
+
+    def reexecute token, newtoken
+      return unless @reaction
+      if @reaction.is_a?( Proc ) || @reaction.respond_to?( :to_proc )
+        rete.instance_exec token, newtoken, &@reaction
+      elsif @reaction.respond_to? :call
+        @reaction.call token, newtoken
+      elsif @reaction.respond_to? :reexecute
+        @reaction.execute token, newtoken
+      end
+    end
+
+    def instance_or_proc thing
+      case thing
+      when Class
+        thing.new
+      when Proc
+        thing
+      end
+    end
+
   end
 
 end

data/lib/wongi-engine/dsl/actions/statement_generator.rb

@@ -51,5 +51,16 @@ module Wongi::Engine
 
     end
 
+    def deexecute token
+      token.generated_wmes.reject( &:manual? ).inject( [] ) do |list, wme|
+        list.tap do |l|
+          wme.generating_tokens.delete token
+          l << wme if wme.generating_tokens.empty?
+        end
+      end.each do |wme|
+        rete.retract wme
+      end
+    end
+
   end
 end

data/lib/wongi-engine/network.rb

@@ -83,6 +83,43 @@ module Wongi::Engine
     end
 
     def assert wme
+      @next_cascade ||= []
+      @next_cascade << [:assert, wme]
+      if @current_cascade.nil?
+        @current_cascade = @next_cascade
+        @next_cascade = nil
+        process_cascade
+      end
+    end
+
+    def retract wme
+      @next_cascade ||= []
+      @next_cascade << [:retract, wme]
+      if @current_cascade.nil?
+        @current_cascade = @next_cascade
+        @next_cascade = nil
+        process_cascade
+      end
+    end
+
+    def process_cascade
+      iterations = 0
+      while @current_cascade
+        @current_cascade.each do |(operation, wme)|
+          case operation
+          when :assert
+            real_assert wme
+          when :retract
+            real_retract wme
+          end
+        end
+        @current_cascade = @next_cascade
+        @next_cascade = nil
+        iterations += 1
+      end
+    end
+
+    def real_assert wme
 
       unless wme.rete == self
         wme = wme.import_into self
@@ -98,18 +135,7 @@ module Wongi::Engine
       # puts "ASSERTING #{wme}"
       @cache[wme] = wme
 
-      s = wme.subject
-      p = wme.predicate
-      o = wme.object
-
-      alpha_activate(lookup( s,  p,  o), wme)
-      alpha_activate(lookup( s,  p, :_), wme)
-      alpha_activate(lookup( s, :_,  o), wme)
-      alpha_activate(lookup(:_,  p,  o), wme)
-      alpha_activate(lookup( s, :_, :_), wme)
-      alpha_activate(lookup(:_,  p, :_), wme)
-      alpha_activate(lookup(:_, :_,  o), wme)
-      alpha_activate(lookup(:_, :_, :_), wme)
+      alphas_for( wme ).each { |a| a.activate wme }
 
       wme
     end
@@ -192,10 +218,10 @@ module Wongi::Engine
       end
     end
 
-    def retract wme, is_real = false
+    def real_retract wme, is_real = false
 
       if wme.is_a? Array
-        return retract( WME.new(*wme), is_real )
+        return real_retract( WME.new(*wme), is_real )
       end
 
       if ! is_real
@@ -211,14 +237,11 @@ module Wongi::Engine
         @cache[wme]
       end
 
-      return false if real.nil?
+      return if real.nil?
       raise "Cannot retract inferred statements" unless real.manual?
       @cache.delete(real)
 
-      real.destroy
-
-      true
-
+      alphas_for( real ).each { |a| a.deactivate real }
     end
 
     def compile_alpha condition
@@ -362,6 +385,20 @@ module Wongi::Engine
       "rule_#{productions.length}"
     end
 
+    def alphas_for wme
+      s, p, o = wme.subject, wme.predicate, wme.object
+      [
+        lookup( s,  p,  o),
+        lookup( s,  p, :_),
+        lookup( s, :_,  o),
+        lookup(:_,  p,  o),
+        lookup( s, :_, :_),
+        lookup(:_,  p, :_),
+        lookup(:_, :_,  o),
+        lookup(:_, :_, :_),
+      ].compact.uniq
+    end
+
     def lookup s, p, o
       key = Template.hash_for(s, p, o)
       # puts "Lookup for #{key}"

data/lib/wongi-engine/template.rb

@@ -4,7 +4,7 @@ module Wongi::Engine
 
     include CoreExt
 
-    attr_reader :filters, :unsafe
+    attr_reader :unsafe
     attr_predicate debug: false
 
     def self.variable? thing
@@ -72,7 +72,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, @filters, context.alpha_deaf )
+      context.node = context.node.beta_memory.join_node( alpha, tests, assignment, context.alpha_deaf )
       context.node.context = context
       context.node.debug = debug?
       context.earlier << self
@@ -97,8 +97,6 @@ module Wongi::Engine
 
   class NegTemplate < Template
 
-    undef_method :filters
-
     # :arg: context => Wongi::Rete::BetaNode::CompilationContext
     def compile context
       tests, assignment = *JoinNode.compile( self, context.earlier, context.parameters )
@@ -114,8 +112,6 @@ module Wongi::Engine
 
   class OptionalTemplate < Template
 
-    undef_method :filters
-
     def compile context
       tests, assignment = *JoinNode.compile( self, context.earlier, context.parameters )
       alpha = context.rete.compile_alpha( self )

data/lib/wongi-engine/token.rb

@@ -5,15 +5,18 @@ module Wongi::Engine
     include CoreExt
 
     attr_reader :children
-    attr_accessor :node, :owner, :parent
+    attr_reader :wme
+    attr_reader :node
+    attr_accessor :owner, :parent
     attr_reader :neg_join_results
     attr_reader :opt_join_results
     attr_reader :ncc_results
     attr_reader :generated_wmes
-    attr_predicate :has_optional
+    attr_predicate :optional
+    attr_predicate :deleted
 
-    def initialize token, wme, assignments
-      @parent, @wme, @assignments = token, wme, assignments
+    def initialize node, token, wme, assignments
+      @node, @parent, @wme, @assignments = node, token, wme, assignments
       @children = []
       @deleted = false
       @neg_join_results = []
@@ -49,8 +52,9 @@ module Wongi::Engine
       end
     end
 
-    def duplicate? parent, wme, assignments
-      self.parent.equal?(parent) && @wme.equal?(wme) && self.assignments == assignments
+    # TODO ignore assignments?
+    def duplicate? other
+      self.parent.equal?(other.parent) && @wme.equal?(other.wme) && self.assignments == other.assignments
     end
 
     def to_s
@@ -61,29 +65,26 @@ module Wongi::Engine
     end
 
     def destroy
-      delete_children
-      #@node.tokens.delete self unless @node.kind_of?( NccPartner )
-      @wme.tokens.delete self if @wme
-      @parent.children.delete self if @parent
-
-      retract_generated
-      @deleted = true
-      @node.delete_token self
-    end
-
-    def deleted?
-      @deleted
+      # delete_children
+      # #@node.tokens.delete self unless @node.kind_of?( NccPartner )
+      # @wme.tokens.delete self if @wme
+      # @parent.children.delete self if @parent
+
+      # retract_generated
+      deleted!
+      # @node.delete_token self
     end
 
-    def delete_children
-      children = @children
-      @children = []
-      children.each do |token|
-        token.parent = nil
-        token.destroy
-      end
-    end
+    # def delete_children
+    #   children = @children
+    #   @children = []
+    #   children.each do |token|
+    #     token.parent = nil
+    #     token.destroy
+    #   end
+    # end
 
+    # for neg feedback loop protection
     def generated? wme
       return true if generated_wmes.any? { |w| w == wme }
       return children.any? { |t| t.generated? wme }
@@ -91,21 +92,21 @@ module Wongi::Engine
 
     protected
 
-    def retract_generated
-      for_retraction = []
-
-      @generated_wmes.dup.each do |wme|
-        unless wme.manual?  # => TODO: does this ever fail at all?
-          wme.generating_tokens.delete self
-          if wme.generating_tokens.empty?
-            for_retraction << wme
-          end
-        end
-      end
-      @generated_wmes = []
-      for_retraction.each { |wme| wme.rete.retract wme, true }
-
-    end
+    # def retract_generated
+    #   for_retraction = []
+
+    #   @generated_wmes.dup.each do |wme|
+    #     unless wme.manual?  # => TODO: does this ever fail at all?
+    #       wme.generating_tokens.delete self
+    #       if wme.generating_tokens.empty?
+    #         for_retraction << wme
+    #       end
+    #     end
+    #   end
+    #   @generated_wmes = []
+    #   for_retraction.each { |wme| wme.rete.retract wme, true }
+
+    # end
 
     def all_assignments
       raise "Assignments is not a hash" unless @assignments.kind_of?( Hash )

data/lib/wongi-engine/version.rb

@@ -1,5 +1,5 @@
 module Wongi
   module Engine
-    VERSION = "0.0.17"
+    VERSION = "0.1.0.alpha1"
   end
 end

data/lib/wongi-engine/wme.rb

@@ -2,10 +2,13 @@ module Wongi::Engine
 
   class WME < Struct.new( :subject, :predicate, :object )
 
+    include CoreExt
+
     attr_reader :rete
 
     attr_reader :alphas, :tokens, :generating_tokens
     attr_reader :neg_join_results, :opt_join_results
+    attr_predicate :deleted
 
     def initialize s, p, o, r = nil
 
@@ -54,25 +57,21 @@ module Wongi::Engine
       !manual?
     end
 
-    def deleted?
-      @deleted
-    end
+    # def destroy
+    #   return if deleted?
+    #   @deleted = true
+    #   alphas.each { |alpha| alpha.remove self }.clear
+    #   tokens = @tokens
+    #   @tokens = []
+    #   tokens.each &:destroy
 
-    def destroy
-      return if deleted?
-      @deleted = true
-      alphas.each { |alpha| alpha.remove self }.clear
-      tokens = @tokens
-      @tokens = []
-      tokens.each &:destroy
+    #   destroy_neg_join_results
+    #   destroy_opt_join_results
 
-      destroy_neg_join_results
-      destroy_opt_join_results
-
-    end
+    # end
 
     def inspect
-      "<WME #{subject.inspect} #{predicate.inspect} #{object.inspect}>"
+      "{#{subject.inspect} #{predicate.inspect} #{object.inspect}}"
     end
 
     def to_s
@@ -89,38 +88,38 @@ module Wongi::Engine
       @array_form ||= [ subject, predicate, object ]
     end
 
-    def destroy_neg_join_results
-      neg_join_results.each do |njr|
+    # def destroy_neg_join_results
+    #   neg_join_results.each do |njr|
 
-        token = njr.owner
-        results = token.neg_join_results
-        results.delete njr
+    #     token = njr.owner
+    #     results = token.neg_join_results
+    #     results.delete njr
 
-        if results.empty? #&& !rete.in_snapshot?
-          token.node.children.each { |beta|
-            beta.beta_activate token, nil, { }
-          }
-        end
+    #     if results.empty? #&& !rete.in_snapshot?
+    #       token.node.children.each { |beta|
+    #         beta.beta_activate token, nil, { }
+    #       }
+    #     end
 
-      end.clear
-    end
+    #   end.clear
+    # end
 
-    def destroy_opt_join_results
-      opt_join_results.each do |ojr|
+    # def destroy_opt_join_results
+    #   opt_join_results.each do |ojr|
 
-        token = ojr.owner
-        results = token.opt_join_results
-        results.delete ojr
+    #     token = ojr.owner
+    #     results = token.opt_join_results
+    #     results.delete ojr
 
-        if results.empty?
-          token.delete_children
-          token.node.children.each { |beta|
-            beta.beta_activate token
-          }
-        end
+    #     if results.empty?
+    #       token.delete_children
+    #       token.node.children.each { |beta|
+    #         beta.beta_activate token
+    #       }
+    #     end
 
-      end.clear
-    end
+    #   end.clear
+    # end
 
     def match_member mine, theirs
       result = WMEMatchData.new