wongi-engine 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 685d73d3400c03903114505a66f2bb6ca6ca8ba2
-  data.tar.gz: ac0de44ac50ad33b7a040bcc786e82f50fa16946
+  metadata.gz: 5ab2c246ebcf7d3a4a381b39195f950b72f9ac22
+  data.tar.gz: 0378728b15e4a72274333ba56ac78e16c67bdb36
 SHA512:
-  metadata.gz: 6d9402a2c69eda4a5262b66fefdba7212c20e62f5a98a3b9290e0279de58ec7d0a0631ee71cf106bc0dbfd0545302d3665bf4e233f630a1ff907b22203d91933
-  data.tar.gz: 231b6574013f60209ea5debf67bc81afa575fa112861d9afc1a78ef9b098af16985c9fff9f0ca73393e474abba3e263b44f3a6b219dc051b8229ea36ff8619ac
+  metadata.gz: 66819b8d5b0165c204e091debcc4de62b1f7a03d4067fdc6d966bd2b17fb0d7196f08244cfa33c7426399caef75929bf6157abe8407170d908dd9009b4d2acb0
+  data.tar.gz: 414beb220fd40675deff5563a1c8b59a79ed644e0ef1c688c3ce559f00c239e5516c39bc1a06ec44d95da7503ba56f1a5131be5fa4dfcc207ba2a3d7d0fa3a82

data/.gitignore

@@ -17,3 +17,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.ruby-version

data/README.md

@@ -197,6 +197,25 @@ Passes if the arguments are not equal. Alias: `ne`.
 
 Should be obvious by now.
 
+#### `assuming rule_name`
+
+This is a shortcut for extending a common base rule with additional matchers. `rule_name` must already be installed on the same engine instance. `assuming` must be the first clause in the extending rule.
+
+```ruby
+engine << rule( :base ) {
+  forall {
+    has :x, :y, :Z
+  }
+}
+
+engine << rule {
+  forall {
+    assuming :base
+    has :Z, :u, :W
+  }
+}
+```
+
 #### `assert { |token| ... }`, `assert var1, var2, ... do |val1, val2, ... | ... end`
 
 Passes if the block evaluates to `true`. Having no arguments passes the entire token as an argument, listing some variables passes only their values.
@@ -440,6 +459,10 @@ The Rete implementation in this library largely follows the outline presented in
 
 ## Changelog
 
+### 0.0.17
+
+* introduced the `assuming` matcher
+
 ### 0.0.13
 
 * fixed a bug with recursive generations of multiple facts

data/lib/wongi-engine/alpha_memory.rb

@@ -44,12 +44,9 @@ module Wongi::Engine
 
     def wmes
       Enumerator.new do |y|
-        copy = @wmes.dup
-        @wmes.reject! &:deleted?
-        copy.each do |wme|
+        @wmes.dup.each do |wme|
           y << wme unless wme.deleted?
         end
-        @wmes.reject! &:deleted?
       end
     end
 

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

@@ -8,6 +8,7 @@ module Wongi::Engine
 
     def compile context
       context.node = context.node.beta_memory.assignment_node( @variable, @body )
+      context.node.context = context
       context.earlier << self
       context
     end
@@ -22,7 +23,7 @@ module Wongi::Engine
     end
 
     def beta_activate token, wme = nil, assignments = { }
-      propagate_activation token, nil, { @variable => @body.call(token) }
+      propagate_activation token, nil, { @variable => @body }
     end
 
     def refresh_child child

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

@@ -7,6 +7,11 @@ module Wongi::Engine
       @tokens = []
     end
 
+    # @override
+    def beta_memory
+      self
+    end
+
     def seed assignments = {}
       @seed = assignments
       t = Token.new( nil, nil, assignments )
@@ -15,7 +20,7 @@ module Wongi::Engine
     end
 
     def subst valuations
-      @tokens.first.delete
+      @tokens.first.destroy
 
       token = Token.new( nil, nil, @seed )
       token.node = self
@@ -29,7 +34,7 @@ module Wongi::Engine
 
     def beta_activate token, wme, assignments
       dp "MEMORY beta-activated with #{wme} #{wme.object_id}"
-      existing = @tokens.reject(&:deleted?).find { |et| et.duplicate? self, token, wme, assignments }
+      existing = @tokens.reject(&:deleted?).find { |et| et.duplicate? token, wme, assignments }
       if existing
         t = existing
       else

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

@@ -7,6 +7,7 @@ module Wongi::Engine
     attr_writer :rete
     attr_reader :parent
     attr_accessor :children
+    attr_accessor :context
     attr_predicate :debug
 
     def initialize parent = nil
@@ -34,7 +35,6 @@ module Wongi::Engine
     end
 
     def beta_memory
-      return self if BetaMemory === self # the easiest way to do this at the top
       beta = children.find { |node| BetaMemory === node }
       if beta.nil?
         beta = BetaMemory.new self
@@ -102,7 +102,12 @@ module Wongi::Engine
       ncc
     end
 
-    CompilationContext = Struct.new :node, :rete, :earlier, :parameters, :alpha_deaf
+    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|

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

@@ -1,6 +1,12 @@
 module Wongi
   module Engine
 
+    TokenAssignment = Struct.new(:wme, :field) do
+      def call token = nil
+        wme.send field
+      end
+    end
+
     class BetaTest
 
       attr_reader :field
@@ -103,7 +109,7 @@ module Wongi
                 if ec.kind_of?( VariantSet )
                   ec.introduces_variable?( member )
                 else
-                  ! ec.kind_of?( NegTemplate ) and ec.contains?( member )
+                  ec.respond_to?( :contains? ) and ec.contains?( member )
                 end
               end
               contains = true
@@ -142,7 +148,7 @@ module Wongi
         [: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) ] = wme.send(field)
+            assignments[ self.assignment_pattern.send(field) ] = TokenAssignment.new( wme, field )
           end
         end
         assignments

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

@@ -9,6 +9,7 @@ module Wongi
 
       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

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

@@ -1,92 +1,92 @@
-module Wongi
-  module Engine
-
-    NegJoinResult = Struct.new :owner, :wme
-
-    class NegNode < BetaNode
-
-      attr_reader :tokens, :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|
-          if matches?( token, wme ) && ( @unsafe || ! token.generated?( wme ) )# feedback loop protection
-            # order matters for proper invalidation
-            make_join_result(token, wme)
-            token.delete_children #if token.neg_join_results.empty? # TODO why was this check here? it seems to break things
-          end
-        end
-      end
-
-      def beta_activate token, newwme, assignments
-        existing = @tokens.find { |et| et.duplicate? self, token, newwme, assignments }
-        if existing
-          t = existing
-        else
-          t = Token.new( token, newwme, assignments)
-          t.node = self
-          @tokens << t
-        end
-        @alpha.wmes.each do |wme|
-          if matches?( t, wme )
-            make_join_result(t, wme)
-          end
-        end
-        if t.neg_join_results.empty?
-          self.children.each do |child|
-            child.beta_activate t, nil, {}
-          end
-        end
-      end
-
-      def refresh_child child
-        safe_tokens.each do |token|
-          if token.neg_join_results.empty?
-            child.beta_activate token, nil, {}
-          end
-        end
-        alpha.wmes.each do |wme|
-          alpha_activate wme
-        end
-      end
-
-      def delete_token token
-        tokens.delete token
-        token.neg_join_results.each do |njr|
-          njr.wme.neg_join_results.delete njr if njr.wme
-        end
-        token.neg_join_results.clear
-      end
-
-      protected
-
-      def matches? token, wme
-        puts "matching #{wme} against #{token}" if debug?
-        @tests.each do |test|
-          return false unless test.matches?( token, wme )
-        end
-        true
-      end
-
-      def make_join_result token, wme
-        njr = NegJoinResult.new token, wme
-        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
+module Wongi
+  module Engine
+
+    NegJoinResult = Struct.new :owner, :wme
+
+    class NegNode < BetaNode
+
+      attr_reader :tokens, :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|
+          if matches?( token, wme ) && ( @unsafe || ! token.generated?( wme ) )# feedback loop protection
+            # order matters for proper invalidation
+            make_join_result(token, wme)
+            token.delete_children #if token.neg_join_results.empty? # TODO why was this check here? it seems to break things
+          end
+        end
+      end
+
+      def beta_activate token, newwme, assignments
+        existing = @tokens.find { |et| et.duplicate? token, newwme, assignments }
+        if existing
+          t = existing
+        else
+          t = Token.new( token, newwme, assignments)
+          t.node = self
+          @tokens << t
+        end
+        alpha.wmes.each do |wme|
+          if matches?( t, wme )
+            make_join_result(t, wme)
+          end
+        end
+        if t.neg_join_results.empty?
+          self.children.each do |child|
+            child.beta_activate t, nil, {}
+          end
+        end
+      end
+
+      def refresh_child child
+        safe_tokens.each do |token|
+          if token.neg_join_results.empty?
+            child.beta_activate token, nil, {}
+          end
+        end
+        alpha.wmes.each do |wme|
+          alpha_activate wme
+        end
+      end
+
+      def delete_token token
+        tokens.delete token
+        token.neg_join_results.each do |njr|
+          njr.wme.neg_join_results.delete njr if njr.wme
+        end
+        token.neg_join_results.clear
+      end
+
+      protected
+
+      def matches? token, wme
+        puts "matching #{wme} against #{token}" if debug?
+        @tests.each do |test|
+          return false unless test.matches?( token, wme )
+        end
+        true
+      end
+
+      def make_join_result token, wme
+        njr = NegJoinResult.new token, wme
+        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/or_node.rb

@@ -18,6 +18,7 @@ module Wongi
         end
         context.earlier += added
         context.node = OrNode.new( branches )
+        context.node.context = context
         context.node.refresh
         context
       end
@@ -33,6 +34,7 @@ module Wongi
 
       def compile context
         context.node = context.node.beta_memory.network( children, context.earlier, context.parameters, false )
+        context.node.context = context
         context.earlier << self
         context
       end
@@ -42,7 +44,7 @@ module Wongi
           if c.kind_of?( VariantSet )
             c.introduces_variable?( var )
           else
-            ! c.kind_of?( NegTemplate ) and c.contains?( var )
+            c.respond_to?( :contains? ) and c.contains?( var )
           end
         }
       end

data/lib/wongi-engine/dsl.rb

@@ -7,7 +7,7 @@ def ruleset name = nil, &definition
   rs
 end
 
-def rule name, &definition
+def rule name = nil, &definition
   r = Wongi::Engine::ProductionRule.new name
   r.instance_eval &definition
   r
@@ -33,6 +33,7 @@ require 'wongi-engine/dsl/production_rule'
 require 'wongi-engine/dsl/ncc_production_rule'
 require 'wongi-engine/dsl/any_rule'
 require 'wongi-engine/dsl/query'
+require 'wongi-engine/dsl/assuming'
 require 'wongi-engine/dsl/actions/simple_action'
 require 'wongi-engine/dsl/actions/statement_generator'
 require 'wongi-engine/dsl/actions/simple_collector'
@@ -102,6 +103,8 @@ dsl {
     missing s, p, o, time: 0
   }
 
+  clause :assuming
+  accept Wongi::Engine::AssumingClause
 
   section :make
 

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

@@ -1,55 +1,55 @@
-module Wongi::Engine
-  class StatementGenerator < Action
-
-    def initialize template
-      @template = template
-    end
-
-    def execute token
-
-      subject = if Template.variable?( @template.subject )
-        v = token[ @template.subject ]
-        raise "Unbound variable #{@template.subject} in token #{token}" if v.nil?
-        v
-      else
-        @template.subject
-      end
-
-      predicate = if Template.variable?( @template.predicate )
-        v = token[ @template.predicate ]
-        raise "Unbound variable #{@template.predicate} in token #{token}" if v.nil?
-        v
-      else
-        @template.predicate
-      end
-
-      object = if Template.variable?( @template.object )
-        v = token[ @template.object ]
-        raise "Unbound variable #{@template.object} in token #{token}" if v.nil?
-        v
-      else
-        @template.object
-      end
-
-      # link to rete here to ensure proper linking with token
-      wme = WME.new subject, predicate, object, rete
-
-      production.tracer.trace( action: self, wme: wme ) if production.tracer
-      if existing = rete.exists?( wme )
-        generated = existing.generating_tokens.size
-        if generated > 0 && ! token.generated_wmes.include?( existing )
-          token.generated_wmes << existing
-          existing.generating_tokens << token
-        end
-      else
-        token.generated_wmes << wme
-        wme.generating_tokens << token
-        # this MUST be done after we link the wme and the token
-        # in order for neg rule invalidation to work
-        rete << wme
-      end
-
-    end
-
-  end
-end
+module Wongi::Engine
+  class StatementGenerator < Action
+
+    def initialize template
+      @template = template
+    end
+
+    def execute token
+
+      subject = if Template.variable?( @template.subject )
+        v = token[ @template.subject ]
+        raise "Unbound variable #{@template.subject} in token #{token}" if v.nil?
+        v
+      else
+        @template.subject
+      end
+
+      predicate = if Template.variable?( @template.predicate )
+        v = token[ @template.predicate ]
+        raise "Unbound variable #{@template.predicate} in token #{token}" if v.nil?
+        v
+      else
+        @template.predicate
+      end
+
+      object = if Template.variable?( @template.object )
+        v = token[ @template.object ]
+        raise "Unbound variable #{@template.object} in token #{token}" if v.nil?
+        v
+      else
+        @template.object
+      end
+
+      # link to rete here to ensure proper linking with token
+      wme = WME.new subject, predicate, object, rete
+
+      production.tracer.trace( action: self, wme: wme ) if production.tracer
+      if existing = rete.exists?( wme )
+        generated = existing.generating_tokens.size
+        if generated > 0 && ! token.generated_wmes.include?( existing )
+          token.generated_wmes << existing
+          existing.generating_tokens << token
+        end
+      else
+        token.generated_wmes << wme
+        wme.generating_tokens << token
+        # this MUST be done after we link the wme and the token
+        # in order for neg rule invalidation to work
+        rete << wme
+      end
+
+    end
+
+  end
+end