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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9461adc4b75933300d9be090ac8825c90ddc2b5ba167ec7e47128e4622aa853
-  data.tar.gz: ed1f2760dae84df0faee9d8ccc80849713b849299f2b4bc5520d8004f332879f
+  metadata.gz: 8b8990e295e71589c0de4e5ab8ab947e4a88d6de25df75d15ea219532cd923e7
+  data.tar.gz: ba314dbc0885f56c74b876d00f3b903836931a0b959b23708375c778692801c9
 SHA512:
-  metadata.gz: c3f6c9b2f491c96758c319268b61e7654dcdeab9d0acfd41c582428245fcd5b52edd2f8fa34674882600b9ce6668df6ab48de11123fcf72819d7a9d53aa4e9a4
-  data.tar.gz: fd2e4ac006478621202f2013d43e022186e48e3411c035e9d7f2a9c6557001b17125519a2280092507ca749ef065aa43f6f69b194e37393ce365f7ae7d5e1ee2
+  metadata.gz: 34593896193fc9eb110f04794c2f33ae43f53e6061bf557e16320f980646999573002e186f4ef591388b16692419eb478aaab80e03250f500a64c407fc227333
+  data.tar.gz: 97a14c3519ca53e3cbc665ff9d682ff41cc8b20a3d3e4f6de238c67c4a9ad6ac4d31dc90c605b83c205f5e469f8394a8d501377ea476c484291542fa6bd1c371

data/lib/wongi-engine/alpha_index.rb

@@ -6,11 +6,11 @@ module Wongi::Engine
 
     def initialize(pattern)
       @pattern = pattern
-      @index = Hash.new { |h, k| h[k] = [] }
+      @index = Hash.new { |h, k| h[k] = Set.new }
     end
 
     def add(wme)
-      collection_for_wme(wme).push(wme)
+      collection_for_wme(wme).add(wme)
     end
 
     def remove(wme)

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

@@ -43,7 +43,7 @@ module Wongi::Engine
           # 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?
 
-          (token.parents - considered_tokens).each { |parent| tokens_to_consider.push(parent) }
+          token.parents.each { |parent| tokens_to_consider.push(parent) unless considered_tokens.include?(parent) }
 
           next unless token.wme
 
@@ -57,9 +57,10 @@ module Wongi::Engine
       end
 
       def deexecute(token)
+        # p deexecute: {token:}
         origin = GeneratorOrigin.new(token, self)
 
-        generated = token.generated_wmes.select { overlay.generators(_1).include?(origin) }
+        generated = token.generated_wmes.dup # select { overlay.generators(_1).include?(origin) }
         generated.each do |wme|
           overlay.retract wme, generator: origin
         end

data/lib/wongi-engine/network.rb

@@ -43,7 +43,7 @@ module Wongi::Engine
       @overlays = [base_overlay]
 
       self.alpha_top = AlphaMemory.new(Template.new(:_, :_, :_), self)
-      self.alpha_hash = { alpha_top.template.hash => alpha_top }
+      self.alpha_hash = { alpha_top.template => alpha_top }
       self.beta_top = RootNode.new(nil)
       beta_top.rete = self
       beta_top.seed
@@ -188,13 +188,12 @@ module Wongi::Engine
       template.predicate = condition.predicate unless Template.variable?(condition.predicate)
       template.object = condition.object unless Template.variable?(condition.object)
 
-      hash = template.hash
       # puts "COMPILED CONDITION #{condition} WITH KEY #{key}"
-      return alpha_hash[hash] if alpha_hash.key?(hash)
+      return alpha_hash[template] if alpha_hash.key?(template)
 
       alpha = AlphaMemory.new(template, self)
 
-      alpha_hash[hash] = alpha
+      alpha_hash[template] = alpha
       initial_fill alpha
 
       alpha
@@ -290,7 +289,7 @@ module Wongi::Engine
     end
 
     def lookup(s, p, o)
-      key = Template.hash_for(s, p, o)
+      key = Template.new(s, p, o)
       # puts "Lookup for #{key}"
       alpha_hash[key]
     end

data/lib/wongi-engine/overlay.rb

@@ -12,7 +12,7 @@ module Wongi::Engine
 
       def for(wme: nil, token: nil)
         if wme
-          by_wme.key?(wme.object_id) ? by_wme[wme.object_id].keys : []
+          by_wme.key?(wme) ? by_wme[wme].keys : []
         elsif token
           by_token.key?(token.object_id) ? by_token[token.object_id].keys : []
         else
@@ -21,7 +21,7 @@ module Wongi::Engine
       end
 
       def has?(jr)
-        by_wme.key?(jr.wme.object_id) && by_wme[jr.wme.object_id].key?(jr)
+        by_wme.key?(jr.wme) && by_wme[jr.wme].key?(jr)
       end
 
       def hidden?(jr)
@@ -32,7 +32,7 @@ module Wongi::Engine
         if hidden.key?(jr)
           hidden.delete(jr)
         else
-          by_wme[jr.wme.object_id][jr] = true
+          by_wme[jr.wme][jr] = true
           by_token[jr.token.object_id][jr] = true
         end
       end
@@ -43,10 +43,10 @@ module Wongi::Engine
           return
         end
 
-        if by_wme.key?(jr.wme.object_id)
-          by_wme[jr.wme.object_id].delete(jr)
-          if by_wme[jr.wme.object_id].empty?
-            by_wme.delete(jr.wme.object_id)
+        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
 
@@ -71,9 +71,9 @@ module Wongi::Engine
       end
 
       def remove_wme(wme)
-        return unless by_wme.key?(wme.object_id)
+        return unless by_wme.key?(wme)
 
-        by_wme[wme.object_id].keys do |jr|
+        by_wme[wme].keys do |jr|
           remove(jr)
         end
       end
@@ -99,7 +99,7 @@ module Wongi::Engine
       @rete = rete
       @parent = parent
 
-      @wmes = []
+      @wmes = Set.new
       @indexes = [
         AlphaIndex.new(%i[subject]),
         AlphaIndex.new(%i[predicate]),
@@ -238,9 +238,9 @@ module Wongi::Engine
     end
 
     def manual?(wme)
-      wme_manual.key?(wme.object_id) ||
+      wme_manual.key?(wme) ||
         if parent
-          parent.manual?(wme) && !hidden_parent_wme_manual.key?(wme.object_id)
+          parent.manual?(wme) && !hidden_parent_wme_manual.key?(wme)
         end
     end
 
@@ -258,11 +258,11 @@ module Wongi::Engine
     end
 
     private def own_generated_by?(wme, gen)
-      wme_generators.key?(wme.object_id) && wme_generators[wme.object_id].include?(gen)
+      wme_generators.key?(wme) && wme_generators[wme].include?(gen)
     end
 
     def generators(wme)
-      own_generators = wme_generators.key?(wme.object_id) ? wme_generators[wme.object_id] : []
+      own_generators = wme_generators.key?(wme) ? wme_generators[wme] : []
       parent_generators =
         if parent
           parent.generators(wme).reject { |g| hidden_parent_wme_generators.key?(g) }
@@ -273,11 +273,11 @@ module Wongi::Engine
     end
 
     private def own_manual?(wme)
-      wme_manual.key?(wme.object_id)
+      wme_manual.key?(wme)
     end
 
     private def own_generated?(wme)
-      wme_generators.key?(wme.object_id) && wme_generators[wme.object_id].any?
+      wme_generators.key?(wme) && wme_generators[wme].any?
     end
 
     private def find_wme(wme)
@@ -285,11 +285,7 @@ module Wongi::Engine
     end
 
     private def find_own_wme(wme)
-      collections = indexes.map { |index|
-        index.collection_for_wme(wme)
-      }
-      smallest = collections.min_by(&:size)
-      smallest.find { _1 == wme }
+      wmes.include?(wme) ? wme : nil
     end
 
     private def find_parents_wme(wme)
@@ -325,9 +321,9 @@ module Wongi::Engine
 
     private def select_parents_template(template)
       if parent
-        parent.select(template).reject { hidden_wme?(_1) }
+        parent.select(template).reject { hidden_wme?(_1) }.to_set
       else
-        []
+        Set.new
       end
     end
 
@@ -335,32 +331,32 @@ module Wongi::Engine
       # p add_wme: { wme:, generator: !!generator }
 
       # if we previously hid this locally, unhide it
-      hidden_parent_wmes.delete(wme.object_id)
+      hidden_parent_wmes.delete(wme)
       if generator
         hidden_parent_wme_generators.delete(generator)
       else
-        hidden_parent_wme_manual.delete(wme.object_id)
+        hidden_parent_wme_manual.delete(wme)
       end
 
       if find_own_wme(wme)
         if generator
-          wme_generators[wme.object_id] << generator unless own_generated_by?(wme, generator)
+          wme_generators[wme] << generator unless own_generated_by?(wme, generator)
         else
-          wme_manual[wme.object_id] = true
+          wme_manual[wme] = true
         end
       elsif find_parents_wme(wme)
         if generator
-          wme_generators[wme.object_id] << generator unless generated_by?(wme, generator)
+          wme_generators[wme] << generator unless generated_by?(wme, generator)
         else
-          wme_manual[wme.object_id] = true unless manual?(wme)
+          wme_manual[wme] = true unless manual?(wme)
         end
       else
-        wmes << wme
+        wmes.add(wme)
         indexes.each { _1.add(wme) }
         if generator
-          wme_generators[wme.object_id] << generator
+          wme_generators[wme] << generator
         else
-          wme_manual[wme.object_id] = true
+          wme_manual[wme] = true
         end
       end
     end
@@ -371,11 +367,11 @@ module Wongi::Engine
       if find_own_wme(wme)
         if generator
           if own_generated_by?(wme, generator)
-            wme_generators[wme.object_id].delete(generator)
-            wme_generators.delete(wme.object_id) if wme_generators[wme.object_id].empty?
+            wme_generators[wme].delete(generator)
+            wme_generators.delete(wme) if wme_generators[wme].empty?
           end
         elsif own_manual?(wme)
-          wme_manual.delete(wme.object_id)
+          wme_manual.delete(wme)
         end
 
         if !own_generated?(wme) && !own_manual?(wme)
@@ -395,8 +391,8 @@ module Wongi::Engine
       if generator
         # first, delete local
         if own_generated_by?(wme, generator)
-          wme_generators[wme.object_id].delete(generator)
-          wme_generators.delete(wme.object_id) if wme_generators[wme.object_id].empty?
+          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)
@@ -404,15 +400,15 @@ module Wongi::Engine
         end
       else
         if own_manual?(wme)
-          wme_manual.delete(wme.object_id)
+          wme_manual.delete(wme)
         end
         if manual?(wme)
-          hidden_parent_wme_manual[wme.object_id] = true
+          hidden_parent_wme_manual[wme] = true
         end
       end
 
       if !manual?(wme) && !generated?(wme)
-        hidden_parent_wmes[wme.object_id] = true
+        hidden_parent_wmes[wme] = true
       end
     end
 
@@ -581,7 +577,7 @@ module Wongi::Engine
     end
 
     private def hidden_wme?(wme)
-      hidden_parent_wmes.key?(wme.object_id)
+      hidden_parent_wmes.key?(wme)
     end
 
     private def hidden_token?(token)

data/lib/wongi-engine/template.rb

@@ -36,18 +36,6 @@ module Wongi::Engine
       end
     end
 
-    def hash
-      @hash ||= [subject.hash, predicate.hash, object.hash].hash
-    end
-
-    def eql?(other)
-      subject.eql?(other.subject) && predicate.eql?(other.predicate) && object.eql?(other.object)
-    end
-
-    def self.hash_for(*args)
-      args.map(&:hash).hash
-    end
-
     def ==(other)
       other.is_a?(Template) && subject == other.subject && predicate == other.predicate && object == other.object
     end

data/lib/wongi-engine/version.rb

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

data/spec/alpha_index_spec.rb

@@ -18,7 +18,7 @@ describe Wongi::Engine::AlphaIndex do
 
     it 'indexes by pattern' do
       expect(collection.keys).to eq([key])
-      expect(collection[key]).to eq([wme])
+      expect(collection[key]).to eq(Set.new([wme]))
     end
   end
 
@@ -28,7 +28,7 @@ describe Wongi::Engine::AlphaIndex do
 
     it 'indexes by pattern' do
       expect(collection.keys).to eq([key])
-      expect(collection[key]).to eq([wme])
+      expect(collection[key]).to eq(Set.new([wme]))
     end
   end
 
@@ -38,7 +38,7 @@ describe Wongi::Engine::AlphaIndex do
 
     it 'indexes by pattern' do
       expect(collection.keys).to eq([key])
-      expect(collection[key]).to eq([wme])
+      expect(collection[key]).to eq(Set.new([wme]))
     end
   end
 
@@ -48,7 +48,7 @@ describe Wongi::Engine::AlphaIndex do
 
     it 'indexes by pattern' do
       expect(collection.keys).to eq([key])
-      expect(collection[key]).to eq([wme])
+      expect(collection[key]).to eq(Set.new([wme]))
     end
   end
 
@@ -58,7 +58,7 @@ describe Wongi::Engine::AlphaIndex do
 
     it 'indexes by pattern' do
       expect(collection.keys).to eq([key])
-      expect(collection[key]).to eq([wme])
+      expect(collection[key]).to eq(Set.new([wme]))
     end
   end
 
@@ -68,7 +68,7 @@ describe Wongi::Engine::AlphaIndex do
 
     it 'indexes by pattern' do
       expect(collection.keys).to eq([key])
-      expect(collection[key]).to eq([wme])
+      expect(collection[key]).to eq(Set.new([wme]))
     end
   end
 

data/spec/overlay_spec.rb

@@ -66,7 +66,7 @@ describe Wongi::Engine::Overlay do
       expect(overlay.select(:_, :_, :_)).to have(wmes.length).items
 
       expect(overlay.select(1, 11, 111)).to have(1).items
-      expect(overlay.select(1, 11, 111).first).to equal(wmes.first)
+      expect(overlay.select(1, 11, 111).first).to eq(wmes.first)
     end
   end
 

metadata

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