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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b8990e295e71589c0de4e5ab8ab947e4a88d6de25df75d15ea219532cd923e7
-  data.tar.gz: ba314dbc0885f56c74b876d00f3b903836931a0b959b23708375c778692801c9
+  metadata.gz: 0dc2418ab6ffabbb410e83db899bed0479fc5912ec24bc6bf5c01f40ca306aa1
+  data.tar.gz: 4f22e6752c8dfe568eaae071cc7d10b062dee6ddaf8c8ddb2dc201773b7378a1
 SHA512:
-  metadata.gz: 34593896193fc9eb110f04794c2f33ae43f53e6061bf557e16320f980646999573002e186f4ef591388b16692419eb478aaab80e03250f500a64c407fc227333
-  data.tar.gz: 97a14c3519ca53e3cbc665ff9d682ff41cc8b20a3d3e4f6de238c67c4a9ad6ac4d31dc90c605b83c205f5e469f8394a8d501377ea476c484291542fa6bd1c371
+  metadata.gz: 6f0d335b747ae2495a2cb259d4d538cb4b66f7f97fabb41ffd8c7dc78750df54c04990e60eea1913155388488d867e7090c71aee1ae647d0fdcf20447c455e00
+  data.tar.gz: d1db63d17198447da1f6761897cda0e5db7af1dc880203146e0deae4c30de89fe0486049ece689e1394d773a9bac79c67cc85ecf45a2655eee84ec25eab7855a

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

@@ -57,9 +57,8 @@ module Wongi::Engine
           [tokens]
         end
 
-
       groups.each do |tokens|
-        aggregated = self.aggregate.call(tokens.map(&self.map))
+        aggregated = aggregate.call(tokens.map(&map))
         assignment = { var => aggregated }
         children = child ? [child] : self.children
         tokens.each do |token|

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

@@ -3,8 +3,6 @@ require "set"
 module Wongi::Engine
   module DSL::Action
     class StatementGenerator < BaseAction
-      GeneratorOrigin = Struct.new(:token, :action)
-
       attr_reader :template
       private :template
 
@@ -23,9 +21,7 @@ module Wongi::Engine
         production.tracer.trace(action: self, wme: wme) if production.tracer
 
         if should_assert?(wme, token)
-          origin = GeneratorOrigin.new(token, self)
-          token.generated_wmes << wme
-          overlay.assert(wme, generator: origin)
+          overlay.assert(wme, generator: token)
         end
       end
 
@@ -47,24 +43,14 @@ module Wongi::Engine
 
           next unless token.wme
 
-          overlay.generators(token.wme).each do |generator|
-            tokens_to_consider.push(generator.token) unless considered_tokens.include?(generator.token)
+          overlay.generators(token.wme).each do |generating_token|
+            tokens_to_consider.push(generating_token) unless considered_tokens.include?(generating_token)
           end
         end
 
         # we could not prove that the new WME should not be asserted
         true
       end
-
-      def deexecute(token)
-        # p deexecute: {token:}
-        origin = GeneratorOrigin.new(token, self)
-
-        generated = token.generated_wmes.dup # select { overlay.generators(_1).include?(origin) }
-        generated.each do |wme|
-          overlay.retract wme, generator: origin
-        end
-      end
     end
   end
 end

data/lib/wongi-engine/generator_tracker.rb

@@ -0,0 +1,32 @@
+module Wongi::Engine
+  class GeneratorTracker
+    def initialize
+      @by_wme = Hash.new { |h, k| h[k] = Set.new }
+      @by_token = Hash.new { |h, k| h[k] = Set.new }
+    end
+
+    def add(wme, token)
+      @by_wme[wme].add(token)
+      @by_token[token.object_id].add(wme)
+    end
+
+    def for_wme(wme)
+      @by_wme.has_key?(wme) ? @by_wme[wme] : Set.new
+    end
+
+    def for_token(token)
+      @by_token.has_key?(token.object_id) ? @by_token[token.object_id] : Set.new
+    end
+
+    def remove_token(token)
+      wmes = for_token(token)
+      @by_token.delete(token.object_id)
+      wmes.each do |wme|
+        next unless @by_wme.key?(wme)
+
+        @by_wme[wme].delete(token)
+        @by_wme.delete(wme) if @by_wme[wme].empty?
+      end
+    end
+  end
+end

data/lib/wongi-engine/join_results.rb

@@ -0,0 +1,80 @@
+module Wongi::Engine
+  class JoinResults
+    attr_reader :by_wme, :by_token, :hidden
+    private :by_wme, :by_token
+    private :hidden
+    def initialize
+      @by_wme = Hash.new { |h, k| h[k] = {} }
+      @by_token = Hash.new { |h, k| h[k] = {} }
+      @hidden = {}
+    end
+
+    def for(wme: nil, token: nil)
+      if wme
+        by_wme.key?(wme) ? by_wme[wme].keys : []
+      elsif token
+        by_token.key?(token.object_id) ? by_token[token.object_id].keys : []
+      else
+        []
+      end
+    end
+
+    def has?(jr)
+      by_wme.key?(jr.wme) && by_wme[jr.wme].key?(jr)
+    end
+
+    def hidden?(jr)
+      hidden.key?(jr)
+    end
+
+    def add(jr)
+      if hidden.key?(jr)
+        hidden.delete(jr)
+      else
+        by_wme[jr.wme][jr] = true
+        by_token[jr.token.object_id][jr] = true
+      end
+    end
+
+    def remove(jr)
+      unless has?(jr)
+        hide(jr)
+        return
+      end
+
+      if by_wme.key?(jr.wme)
+        by_wme[jr.wme].delete(jr)
+        if by_wme[jr.wme].empty?
+          by_wme.delete(jr.wme)
+        end
+      end
+
+      if by_token.key?(jr.token.object_id)
+        by_token[jr.token.object_id].delete(jr)
+        if by_token[jr.token.object_id].empty?
+          by_token.delete(jr.token.object_id)
+        end
+      end
+    end
+
+    def hide(jr)
+      hidden[jr] = true
+    end
+
+    def remove_token(token)
+      return unless by_token.key?(token.object_id)
+
+      by_token[token.object_id].keys.each do |jr|
+        remove(jr)
+      end
+    end
+
+    def remove_wme(wme)
+      return unless by_wme.key?(wme)
+
+      by_wme[wme].keys do |jr|
+        remove(jr)
+      end
+    end
+  end
+end

data/lib/wongi-engine/network.rb

@@ -67,7 +67,6 @@ module Wongi::Engine
       block.call(child)
     ensure
       remove_overlay(child)
-      child.dispose!
     end
 
     def alphas

data/lib/wongi-engine/overlay.rb

@@ -1,92 +1,13 @@
 module Wongi::Engine
   class Overlay
-    class JoinResults
-      attr_reader :by_wme, :by_token, :hidden
-      private :by_wme, :by_token
-      private :hidden
-      def initialize
-        @by_wme = Hash.new { |h, k| h[k] = {} }
-        @by_token = Hash.new { |h, k| h[k] = {} }
-        @hidden = {}
-      end
-
-      def for(wme: nil, token: nil)
-        if wme
-          by_wme.key?(wme) ? by_wme[wme].keys : []
-        elsif token
-          by_token.key?(token.object_id) ? by_token[token.object_id].keys : []
-        else
-          []
-        end
-      end
-
-      def has?(jr)
-        by_wme.key?(jr.wme) && by_wme[jr.wme].key?(jr)
-      end
-
-      def hidden?(jr)
-        hidden.key?(jr)
-      end
-
-      def add(jr)
-        if hidden.key?(jr)
-          hidden.delete(jr)
-        else
-          by_wme[jr.wme][jr] = true
-          by_token[jr.token.object_id][jr] = true
-        end
-      end
-
-      def remove(jr)
-        unless has?(jr)
-          hide(jr)
-          return
-        end
-
-        if by_wme.key?(jr.wme)
-          by_wme[jr.wme].delete(jr)
-          if by_wme[jr.wme].empty?
-            by_wme.delete(jr.wme)
-          end
-        end
-
-        if by_token.key?(jr.token.object_id)
-          by_token[jr.token.object_id].delete(jr)
-          if by_token[jr.token.object_id].empty?
-            by_token.delete(jr.token.object_id)
-          end
-        end
-      end
-
-      def hide(jr)
-        hidden[jr] = true
-      end
 
-      def remove_token(token)
-        return unless by_token.key?(token.object_id)
-
-        by_token[token.object_id].keys.each do |jr|
-          remove(jr)
-        end
-      end
-
-      def remove_wme(wme)
-        return unless by_wme.key?(wme)
-
-        by_wme[wme].keys do |jr|
-          remove(jr)
-        end
-      end
-    end
-
-    attr_reader :rete, :parent, :wmes, :tokens, :indexes, :queue, :hidden_parent_wmes, :hidden_parent_tokens, :wme_generators, :hidden_parent_wme_generators, :wme_manual, :hidden_parent_wme_manual, :neg_join_results, :opt_join_results, :ncc_tokens, :ncc_tokens_owner, :hidden_ncc_tokens
+    attr_reader :rete, :parent, :wmes, :tokens, :indexes, :queue, :hidden_parent_wmes, :hidden_parent_tokens, :generator_tracker, :wme_manual, :hidden_parent_wme_manual, :neg_join_results, :opt_join_results, :ncc_tokens, :ncc_tokens_owner, :hidden_ncc_tokens
     private :wmes, :tokens
     private :indexes
     private :queue
     private :hidden_parent_wmes
     private :hidden_parent_tokens
-    private :wme_generators
-    private :hidden_parent_wme_generators
+    private :generator_tracker
     private :wme_manual
     private :hidden_parent_wme_manual
     private :neg_join_results
@@ -111,10 +32,9 @@ module Wongi::Engine
       @hidden_parent_wmes = {}
 
       @tokens = Hash.new { |h, k| h[k] = [] }
-      @hidden_parent_tokens = {}
+      @hidden_parent_tokens = Set.new
 
-      @wme_generators = Hash.new { |h, k| h[k] = [] }
-      @hidden_parent_wme_generators = {}
+      @generator_tracker = GeneratorTracker.new
 
       @wme_manual = {}
       @hidden_parent_wme_manual = {}
@@ -140,14 +60,6 @@ module Wongi::Engine
       parent.ancestor?(other)
     end
 
-    def dispose!
-      return if default?
-
-      tokens.each do |_node, tokens|
-        tokens.each(&:dispose!)
-      end
-    end
-
     def <<(thing)
       case thing
       when Array
@@ -180,19 +92,23 @@ module Wongi::Engine
     def run_queue
       until queue.empty?
         operation, wme, options = queue.shift
+
         case operation
         when :assert
-          wme = find_ignoring_hidden(wme) || wme
+          existing_wme = find_ignoring_hidden(wme)
+          wme = existing_wme || wme
           visible = !find(wme).nil?
           add_wme(wme, **options)
           rete.real_assert(wme) unless visible
+
         when :retract
           wme = find_ignoring_hidden(wme)
-          return if wme.nil? # it's perhaps better to return quietly, because complicated cascades may delete a WME while we're going through the queue
+          if wme # it's perhaps better to return quietly, because complicated cascades may delete a WME while we're going through the queue
+            visible = !find(wme).nil?
+            remove_wme(wme, **options)
+            rete.real_retract(wme) if visible
+          end
 
-          visible = !find(wme).nil?
-          remove_wme(wme, **options)
-          rete.real_retract(wme) if visible
         end
       end
     end
@@ -248,28 +164,26 @@ module Wongi::Engine
       generators(wme).any?
     end
 
-    def generated_by?(wme, gen)
-      own_generated_by?(wme, gen) ||
+    def generators(wme)
+      own_generators = generator_tracker.for_wme(wme)
+      parent_generators =
         if parent
-          parent.generated_by?(wme, gen) && !hidden_parent_wme_generators.key?(gen)
+          parent.generators(wme).reject { |t| hidden_token?(t) }.to_set
         else
-          false
+          Set.new
         end
+      own_generators.union(parent_generators)
     end
 
-    private def own_generated_by?(wme, gen)
-      wme_generators.key?(wme) && wme_generators[wme].include?(gen)
-    end
-
-    def generators(wme)
-      own_generators = wme_generators.key?(wme) ? wme_generators[wme] : []
-      parent_generators =
-        if parent
-          parent.generators(wme).reject { |g| hidden_parent_wme_generators.key?(g) }
+    def generated_wmes(token)
+      own_wmes = generator_tracker.for_token(token)
+      parent_wmes =
+        if parent && !hidden_token?(token)
+          parent.generated_wmes(token).reject { hidden_wme?(_1) }.to_set
         else
-          []
+          Set.new
         end
-      own_generators + parent_generators
+      own_wmes.union(parent_wmes)
     end
 
     private def own_manual?(wme)
@@ -277,7 +191,7 @@ module Wongi::Engine
     end
 
     private def own_generated?(wme)
-      wme_generators.key?(wme) && wme_generators[wme].any?
+      generator_tracker.for_wme(wme).any?
     end
 
     private def find_wme(wme)
@@ -285,9 +199,11 @@ module Wongi::Engine
     end
 
     private def find_own_wme(wme)
-      wmes.include?(wme) ? wme : nil
+      has_own_wme?(wme) ? wme : nil
     end
 
+    private def has_own_wme?(wme) = wmes.include?(wme)
+
     private def find_parents_wme(wme)
       return unless parent
 
@@ -332,32 +248,17 @@ module Wongi::Engine
 
       # if we previously hid this locally, unhide it
       hidden_parent_wmes.delete(wme)
-      if generator
-        hidden_parent_wme_generators.delete(generator)
-      else
-        hidden_parent_wme_manual.delete(wme)
-      end
 
-      if find_own_wme(wme)
-        if generator
-          wme_generators[wme] << generator unless own_generated_by?(wme, generator)
-        else
-          wme_manual[wme] = true
-        end
-      elsif find_parents_wme(wme)
-        if generator
-          wme_generators[wme] << generator unless generated_by?(wme, generator)
-        else
-          wme_manual[wme] = true unless manual?(wme)
-        end
-      else
+      unless has_own_wme?(wme)
         wmes.add(wme)
         indexes.each { _1.add(wme) }
-        if generator
-          wme_generators[wme] << generator
-        else
-          wme_manual[wme] = true
-        end
+      end
+
+      if generator
+        generator_tracker.add(wme, generator)
+      else
+        hidden_parent_wme_manual.delete(wme)
+        wme_manual[wme] = true
       end
     end
 
@@ -365,15 +266,9 @@ module Wongi::Engine
       # p remove_wme: { wme:, generator: !!generator }
 
       if find_own_wme(wme)
-        if generator
-          if own_generated_by?(wme, generator)
-            wme_generators[wme].delete(generator)
-            wme_generators.delete(wme) if wme_generators[wme].empty?
-          end
-        elsif own_manual?(wme)
-          wme_manual.delete(wme)
-        end
+        wme_manual.delete(wme) if generator.nil?
 
+        # no remaining reasons to keep this WME around
         if !own_generated?(wme) && !own_manual?(wme)
           wmes.delete(wme)
           indexes.each { _1.remove(wme) }
@@ -388,23 +283,10 @@ module Wongi::Engine
 
       # must be parents' then
 
-      if generator
-        # first, delete local
-        if own_generated_by?(wme, generator)
-          wme_generators[wme].delete(generator)
-          wme_generators.delete(wme) if wme_generators[wme].empty?
-        end
-        # if we're still generated, hide parents'
-        if generated_by?(wme, generator)
-          hidden_parent_wme_generators[generator] = true
-        end
-      else
-        if own_manual?(wme)
-          wme_manual.delete(wme)
-        end
-        if manual?(wme)
-          hidden_parent_wme_manual[wme] = true
-        end
+      if generator.nil?
+        wme_manual.delete(wme)
+        # if still manual, it must be from the parent
+        hidden_parent_wme_manual[wme] = true if manual?(wme)
       end
 
       if !manual?(wme) && !generated?(wme)
@@ -416,7 +298,8 @@ module Wongi::Engine
       # p add_token: {token:}
       # TODO: is this really likely to happen? we don't normally restore deleted tokens but rather create new ones in the activation
       if hidden_token?(token)
-        hidden_parent_tokens.delete(token.object_id)
+        puts "odd case"
+        unhide_token(token)
         return
       end
 
@@ -425,9 +308,12 @@ module Wongi::Engine
 
     def remove_token(token)
       # p remove_token: {token:}
+
+      wmes = generated_wmes(token)
+
       if own_node_tokens(token.node).find { _1.equal?(token) }.nil?
         if parents_node_tokens(token.node).find { _1.equal?(token) }
-          hidden_parent_tokens[token.object_id] = true
+          hide_token(token)
 
           # do not hide JRs from the WME side: it will be done in the alpha deactivation and the JRs have to stay visible until then
           parent_neg_join_results_for(token: token).each { neg_join_results.hide(_1) }
@@ -437,10 +323,12 @@ module Wongi::Engine
             hidden_ncc_tokens[token][ncc] = true
           end
         end
-        return
+      else
+        remove_own_token(token)
       end
 
-      remove_own_token(token)
+      wmes.each { retract(_1, generator: token) }
+
     end
 
     def remove_own_token(token)
@@ -448,6 +336,7 @@ module Wongi::Engine
       tokens[token.node.object_id].delete(token)
       neg_join_results.remove_token(token)
       opt_join_results.remove_token(token)
+      generator_tracker.remove_token(token)
 
       # if this is an NCC partner token
       if (owner = ncc_tokens_owner[token])
@@ -465,9 +354,6 @@ module Wongi::Engine
       end
       ncc_tokens.delete(token)
       hidden_ncc_tokens.delete(token)
-
-      # we know we are the owner, and nobody wants it anymore, so this is the safe place to do it
-      token.dispose!
     end
 
     def node_tokens(beta)
@@ -482,7 +368,7 @@ module Wongi::Engine
 
     private def parents_node_tokens(beta)
       if parent
-        parent.node_tokens(beta).reject { hidden_parent_tokens.key?(_1.object_id) }
+        parent.node_tokens(beta).reject { hidden_token?(_1) }
       else
         []
       end
@@ -581,7 +467,15 @@ module Wongi::Engine
     end
 
     private def hidden_token?(token)
-      hidden_parent_tokens.key?(token.object_id)
+      hidden_parent_tokens.include?(token.object_id)
+    end
+
+    private def hide_token(token)
+      hidden_parent_tokens.add(token.object_id)
+    end
+
+    private def unhide_token(token)
+      hidden_parent_tokens.delete(token.object_id)
     end
   end
 end

data/lib/wongi-engine/token.rb

@@ -2,16 +2,13 @@ require 'set'
 
 module Wongi::Engine
   class Token
-    attr_reader :wme, :node, :generated_wmes, :parents
+    attr_reader :wme, :node, :parents
 
     def initialize(node, parents, wme, assignments = {})
       @node = node
       @parents = Set.new(Array(parents))
       @wme = wme
       @assignments = assignments
-      @deleted = false
-      @ncc_results = []
-      @generated_wmes = []
     end
 
     def ancestors
@@ -66,23 +63,6 @@ module Wongi::Engine
       to_s
     end
 
-    # def destroy
-    #   deleted!
-    # end
-
-    def dispose!
-      # parent.children.delete(self) if parent
-      # @parent = nil
-      @wme = nil
-    end
-
-    # for neg feedback loop protection
-    # def generated?(wme)
-    #   return true if generated_wmes.any? { |w| w == wme }
-    #
-    #   children.any? { |t| t.generated? wme }
-    # end
-
     protected
 
     def all_assignments
@@ -91,17 +71,4 @@ module Wongi::Engine
       end.merge(@assignments)
     end
   end
-
-  class FakeToken < Token
-    def initialize(token, wme, assignments) # rubocop:disable Lint/MissingSuper
-      @parent = token
-      @wme = wme
-      @assignments = 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.4.0-alpha9".freeze
+    VERSION = "0.4.0-alpha10".freeze
   end
 end

data/lib/wongi-engine.rb

@@ -28,6 +28,8 @@ require 'wongi-engine/beta'
 require 'wongi-engine/dsl'
 require 'wongi-engine/ruleset'
 require 'wongi-engine/compiler'
+require 'wongi-engine/join_results'
+require 'wongi-engine/generator_tracker'
 require 'wongi-engine/overlay'
 require 'wongi-engine/enumerators'
 require 'wongi-engine/network'

data/spec/overlay_spec.rb

@@ -136,11 +136,6 @@ describe Wongi::Engine::Overlay do
 
       overlay.retract(wme)
       expect(overlay.find(wme)).to be_nil
-      expect(child1.find(wme)).to be_nil
-      expect(child2.find(wme)).to be_nil
-
-      child1.assert(wme)
-      expect(overlay.find(wme)).to be_nil
       expect(child1.find(wme)).to eq(wme)
       expect(child2.find(wme)).to eq(wme)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wongi-engine
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre.alpha9
+  version: 0.4.0.pre.alpha10
 platform: ruby
 authors:
 - Valeri Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-03 00:00:00.000000000 Z
+date: 2022-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -139,7 +139,9 @@ files:
 - lib/wongi-engine/filter/inequality_test.rb
 - lib/wongi-engine/filter/less_than_or_equal_test.rb
 - lib/wongi-engine/filter/less_than_test.rb
+- lib/wongi-engine/generator_tracker.rb
 - lib/wongi-engine/graph.rb
+- lib/wongi-engine/join_results.rb
 - lib/wongi-engine/network.rb
 - lib/wongi-engine/network/collectable.rb
 - lib/wongi-engine/network/debug.rb