wongi-engine 0.4.0.pre.alpha10 → 0.4.0.pre.alpha11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dc2418ab6ffabbb410e83db899bed0479fc5912ec24bc6bf5c01f40ca306aa1
-  data.tar.gz: 4f22e6752c8dfe568eaae071cc7d10b062dee6ddaf8c8ddb2dc201773b7378a1
+  metadata.gz: c6618cdaae22d90fec75bb11bbfeb27477d9aca0661d0de91ab04ce3b434ce6e
+  data.tar.gz: c9973d3a202faa0882653e99a3db546af9b02f6d1e09af075e4749681903743b
 SHA512:
-  metadata.gz: 6f0d335b747ae2495a2cb259d4d538cb4b66f7f97fabb41ffd8c7dc78750df54c04990e60eea1913155388488d867e7090c71aee1ae647d0fdcf20447c455e00
-  data.tar.gz: d1db63d17198447da1f6761897cda0e5db7af1dc880203146e0deae4c30de89fe0486049ece689e1394d773a9bac79c67cc85ecf45a2655eee84ec25eab7855a
+  metadata.gz: 2ec734eba8278f9ed3b8571b67a5e7449c4d172143673953d568bc4299383dc60579c295457010a3e9160de5698ecd529713dad80940751fce6c8b599d05dc91
+  data.tar.gz: ead1a3405786c7be13882c24ce8457ff31efa003bd9a84722073ff543ddff028b201c5d769756a2fadadfa84bbf0d5289db810f4e06d574c6b5960cb3a55302e

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

@@ -61,12 +61,13 @@ module Wongi::Engine
         aggregated = aggregate.call(tokens.map(&map))
         assignment = { var => aggregated }
         children = child ? [child] : self.children
-        tokens.each do |token|
-          # TODO: optimize this to work with a diff of actual changes
-          beta_deactivate_children(token: token, children: children)
-        end
         children.each do |beta|
-          beta.beta_activate(Token.new(beta, tokens, nil, assignment))
+          new_token = Token.new(beta, tokens, nil, assignment)
+          # nothing changed, skip useless traversal
+          next if beta.tokens.find { _1.duplicate?(new_token) }
+
+          beta.tokens.select { |child| tokens.any? { child.child_of?(_1) } }.each { beta.beta_deactivate(_1) }
+          beta.beta_activate(new_token)
         end
       end
     end

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

@@ -58,7 +58,8 @@ module Wongi::Engine
     end
 
     private def select_wmes(template)
-      rete.current_overlay.select(template)
+      # capture the enumerator
+      rete.current_overlay.select(template).to_a
     end
 
     private def specialize(template, tests, token)

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

@@ -26,6 +26,8 @@ module Wongi::Engine
       end
 
       private def should_assert?(wme, token)
+        return true if rete.bypass_consistency_checks?
+
         considered_tokens = Set.new
         tokens_to_consider = [token]
         until tokens_to_consider.empty?
@@ -33,11 +35,17 @@ module Wongi::Engine
           considered_tokens.add(token)
 
           # self-affirming reasoning
-          return false if token.wme == wme
+          if token.wme == wme
+            # puts "detected self-affirming"
+            return false
+          end
 
           # asserting this WME would invalidate the match
           # TODO: clean up
-          return false if token.node.is_a?(NegNode) && wme =~ token.node.alpha.template && token.node.matches?(token, wme) # how much is actually necessary?
+          if token.node.is_a?(NegNode) && wme =~ token.node.alpha.template && token.node.matches?(token, wme) # how much is actually necessary?
+            # puts "detected self-negating"
+            return false
+          end
 
           token.parents.each { |parent| tokens_to_consider.push(parent) unless considered_tokens.include?(parent) }
 

data/lib/wongi-engine/network.rb

@@ -3,9 +3,12 @@ require 'wongi-engine/network/debug'
 
 module Wongi::Engine
   class Network
+    include CoreExt
     attr_accessor :alpha_top, :beta_top, :queries, :results, :alpha_hash
     attr_reader :productions, :overlays
 
+    attr_predicate :bypass_consistency_checks
+
     include NetworkParts::Collectable
     private :overlays
     private :alpha_hash, :alpha_hash=
@@ -202,9 +205,8 @@ module Wongi::Engine
       compile_alpha Template.new(s, p, o)
     end
 
-    # TODO: pick an alpha with fewer candidates to go through
     def initial_fill(alpha)
-      default_overlay.select(:_, :_, :_).each do |wme|
+      default_overlay.select(:_, :_, :_).to_a.each do |wme|
         alpha.activate wme if wme =~ alpha.template
       end
     end
@@ -253,16 +255,11 @@ module Wongi::Engine
     end
 
     def select(s, p, o, &block)
-      matching = current_overlay.select(s, p, o)
-      if block_given?
-        matching.each(&block)
-      else
-        matching.each
-      end
+      current_overlay.select(s, p, o, &block)
     end
 
     def find(s, p, o)
-      current_overlay.select(s, p, o).first
+      select(s, p, o).first
     end
 
     protected

data/lib/wongi-engine/overlay.rb

@@ -142,12 +142,12 @@ module Wongi::Engine
       when 1
         case args.first
         when Template
-          select_by_template(args.first)
+          each_by_template(args.first)
         else
           raise ArgumentError
         end
       when 3
-        select_by_template(Template.new(*args))
+        each_by_template(Template.new(*args))
       else
         raise ArgumentError
       end
@@ -165,25 +165,21 @@ module Wongi::Engine
     end
 
     def generators(wme)
-      own_generators = generator_tracker.for_wme(wme)
-      parent_generators =
+      Enumerator.new do |y|
+        generator_tracker.for_wme(wme).each {  y << _1 }
         if parent
-          parent.generators(wme).reject { |t| hidden_token?(t) }.to_set
-        else
-          Set.new
+          parent.generators(wme).reject { hidden_token?(_1) }.each { y << _1 }
         end
-      own_generators.union(parent_generators)
+      end
     end
 
     def generated_wmes(token)
-      own_wmes = generator_tracker.for_token(token)
-      parent_wmes =
+      Enumerator.new do |y|
+        generator_tracker.for_token(token).each { y << _1 }
         if parent && !hidden_token?(token)
-          parent.generated_wmes(token).reject { hidden_wme?(_1) }.to_set
-        else
-          Set.new
+          parent.generated_wmes(token).reject { hidden_wme?(_1) }.each { y << _1 }
         end
-      own_wmes.union(parent_wmes)
+      end
     end
 
     private def own_manual?(wme)
@@ -202,7 +198,9 @@ module Wongi::Engine
       has_own_wme?(wme) ? wme : nil
     end
 
-    private def has_own_wme?(wme) = wmes.include?(wme)
+    private def has_own_wme?(wme)
+      wmes.include?(wme)
+    end
 
     private def find_parents_wme(wme)
       return unless parent
@@ -218,28 +216,29 @@ module Wongi::Engine
         end
     end
 
-    private def select_by_template(template)
-      select_parents_template(template) + select_own_template(template)
+    def each_by_template(template)
+      Enumerator.new do |y|
+        each_own_wme_by_template(template, y)
+        each_parent_wme_by_template(template, y)
+      end
     end
 
-    private def select_own_template(template)
+    private def each_own_wme_by_template(template, y)
       if template.concrete?
         wme = find_own_wme(WME.from_concrete_template(template))
-        wme ? [wme] : []
+        y << wme if wme
       elsif template.root?
-        wmes
+        wmes.each { y << _1 }
       else
         indexes.map { |index|
           index.collections_for_template(template)
-        }.compact.first
+        }.compact.first.each { y << _1 }
       end
     end
 
-    private def select_parents_template(template)
+    private def each_parent_wme_by_template(template, y)
       if parent
-        parent.select(template).reject { hidden_wme?(_1) }.to_set
-      else
-        Set.new
+        parent.each_by_template(template).reject { hidden_wme?(_1) }.each { y << _1 }
       end
     end
 
@@ -309,7 +308,8 @@ module Wongi::Engine
     def remove_token(token)
       # p remove_token: {token:}
 
-      wmes = generated_wmes(token)
+      # capture the entire enumerated state
+      wmes = generated_wmes(token).to_a
 
       if own_node_tokens(token.node).find { _1.equal?(token) }.nil?
         if parents_node_tokens(token.node).find { _1.equal?(token) }

data/lib/wongi-engine/token.rb

@@ -27,12 +27,18 @@ module Wongi::Engine
       @assignments[variable] = value
     end
 
+    def own_assignments
+      @assignments
+    end
+
     def assignments
-      all_assignments
+      parents.each_with_object({}) do |parent, acc|
+        acc.merge!(parent.assignments)
+      end.merge(own_assignments)
     end
 
     def [](var)
-      a = assignments[var]
+      a = assignment(var)
       a.respond_to?(:call) ? a.call(self) : a
     end
 
@@ -40,8 +46,23 @@ module Wongi::Engine
       vars.map { self[_1] }
     end
 
+    def assignment(x)
+      return @assignments[x] if has_own_var?(x)
+
+      parents.each do |parent|
+        a = parent.assignment(x)
+        return a if a
+      end
+
+      nil
+    end
+
     def has_var?(x)
-      assignments.key? x
+      has_own_var?(x) || parents.any? { _1.has_var?(x) }
+    end
+
+    def has_own_var?(x)
+      @assignments.key?(x)
     end
 
     # TODO: ignore assignments?
@@ -49,12 +70,12 @@ module Wongi::Engine
       instance_of?(other.class) &&
         parents == other.parents &&
         wme == other.wme &&
-        assignments == other.assignments
+        own_assignments == other.own_assignments
     end
 
     def to_s
       str = "TOKEN [ #{object_id} ancestors=#{ancestors.map(&:object_id).map(&:to_s).join('.')} "
-      all_assignments.each_pair { |key, value| str << "#{key}=#{value.is_a?(TokenAssignment) ? "#{value.call} (#{value})" : value} " }
+      assignments.each_pair { |key, value| str << "#{key}=#{value.is_a?(TokenAssignment) ? "#{value.call} (#{value})" : value} " }
       str << "]"
       str
     end
@@ -62,13 +83,5 @@ module Wongi::Engine
     def inspect
       to_s
     end
-
-    protected
-
-    def all_assignments
-      parents.each_with_object({}) do |parent, acc|
-        acc.merge!(parent.assignments)
-      end.merge(@assignments)
-    end
   end
 end

data/lib/wongi-engine/version.rb

@@ -1,5 +1,5 @@
 module Wongi
   module Engine
-    VERSION = "0.4.0-alpha10".freeze
+    VERSION = "0.4.0-alpha11".freeze
   end
 end

data/spec/bug_specs/issue_4_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "issue 4" do
-  it "correctlies retract pre-added items from within a rule" do
+  it "correctly retracts pre-added items from within a rule" do
     engine = Wongi::Engine.create
 
     10.times { |i| engine << [i, :is_number, true] }
@@ -22,11 +22,11 @@ describe "issue 4" do
     numbers = engine.select :_, :is_number, true
     evens = engine.select :_, :is_even, true
 
-    expect(numbers.size).to eq(0)
-    expect(evens.size).to eq(10)
+    expect(numbers.count).to eq(0)
+    expect(evens.count).to eq(10)
   end
 
-  it "correctlies retract post-added items from within a rule" do
+  it "correctly retracts post-added items from within a rule" do
     engine = Wongi::Engine.create
 
     engine.rule 'segregate' do
@@ -47,8 +47,8 @@ describe "issue 4" do
     numbers = engine.select :_, :is_number, true
     evens = engine.select :_, :is_even, true
 
-    expect(numbers.size).to eq(0)
-    expect(evens.size).to eq(5)
+    expect(numbers.count).to eq(0)
+    expect(evens.count).to eq(5)
   end
 
   # cascaded processing affects this
@@ -80,9 +80,9 @@ describe "issue 4" do
     evens = engine.select :_, :is_even, true
     odds = engine.select :_, :is_odd, true
 
-    expect(numbers.size).to eq(0)
-    expect(evens.size).to eq(5)
-    expect(odds.size).to eq(5)
+    expect(numbers.count).to eq(0)
+    expect(evens.count).to eq(5)
+    expect(odds.count).to eq(5)
   end
 
   it "does not lose track when another rule affects a set" do
@@ -126,8 +126,8 @@ describe "issue 4" do
     evens = engine.select :_, :is_even, true
     odds = engine.select :_, :is_odd, true
 
-    expect(numbers.size).to eq(5)
-    expect(evens.size).to eq(5)
-    expect(odds.size).to eq(5)
+    expect(numbers.count).to eq(5)
+    expect(evens.count).to eq(5)
+    expect(odds.count).to eq(5)
   end
 end

data/spec/high_level_spec.rb

@@ -115,10 +115,10 @@ describe Wongi::Engine::Network do
     engine << ["Bob", :age, 43]
 
     items = engine.select "Alice", :younger, "Bob"
-    expect(items.size).to eq(1)
+    expect(items.count).to eq(1)
 
     items = engine.select "Bob", :older, "Alice"
-    expect(items.size).to eq(1)
+    expect(items.count).to eq(1)
   end
 
   it 'uses collectors' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wongi-engine
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre.alpha10
+  version: 0.4.0.pre.alpha11
 platform: ruby
 authors:
 - Valeri Sokolov