wongi-engine 0.3.9 → 0.4.0.pre.alpha1

data/lib/wongi-engine/graph.rb

@@ -44,7 +44,7 @@ module Wongi::Engine
       return if @seen_betas.include? beta
 
       @seen_betas << beta
-      io.puts "node#{print_hash beta.object_id} [label=\"#{beta.class.name.split('::').last}\"];"
+      io.puts "node#{print_hash beta.object_id} [label=\"#{beta.class.name.split('::').last}\\nid=#{beta.object_id}\"];"
       if beta.is_a? NccNode
         io.puts "node#{print_hash beta.partner.object_id} -> node#{print_hash beta.object_id};"
         io.puts "{ rank=same; node#{print_hash beta.partner.object_id} node#{print_hash beta.object_id} }"

data/lib/wongi-engine/network/debug.rb

@@ -2,14 +2,6 @@ module Wongi::Engine
   module NetworkParts
     module Debug
       def full_wme_dump
-        @timeline.each_with_index do |slice, index|
-          puts "time #{index - @timeline.length}"
-          slice.each do |_key, alpha|
-            puts "\t#{alpha.template} -> [#{alpha.wmes.map(&:to_s).join ', '}]"
-          end
-          puts ""
-        end
-        puts "time 0"
         alpha_hash.each do |_key, alpha|
           puts "\t#{alpha.template} -> [#{alpha.wmes.map(&:to_s).join ', '}]"
         end
@@ -39,8 +31,8 @@ module Wongi::Engine
       def dump_wme(wme, io)
         io.puts "\tWME: #{wme.object_id} #{wme}"
         wme.tokens.each { |token| io.puts "\t\tTOKEN #{token.object_id}" }
-        io.puts "\tGENERATING:" unless wme.generating_tokens.empty?
-        wme.generating_tokens.each { |token| io.puts "\t\tTOKEN #{token.object_id}" }
+        io.puts "\tGENERATING:" unless wme.generators.empty?
+        wme.generators.each { |token| io.puts "\t\tTOKEN #{token.object_id}" }
       end
 
       def dump_beta(beta, io)

data/lib/wongi-engine/network.rb

@@ -3,16 +3,14 @@ require 'wongi-engine/network/debug'
 
 module Wongi::Engine
   class Network
-    attr_reader :alpha_top, :beta_top, :queries, :results, :productions
+    attr_accessor :alpha_top, :beta_top, :queries, :results, :alpha_hash
+    attr_reader :productions, :overlays
 
     include NetworkParts::Collectable
+    private :overlays
+    private :alpha_hash, :alpha_hash=
 
-    protected
-
-    attr_accessor :alpha_hash
-    attr_writer :alpha_top, :beta_top, :queries, :results
-
-    public
+    private :alpha_top=, :beta_top=, :queries=, :results=
 
     def debug!
       extend NetworkParts::Debug
@@ -42,10 +40,11 @@ module Wongi::Engine
     end
 
     def initialize
-      @timeline = []
+      @overlays = [base_overlay]
+
       self.alpha_top = AlphaMemory.new(Template.new(:_, :_, :_), self)
       self.alpha_hash = { alpha_top.template.hash => alpha_top }
-      self.beta_top = BetaMemory.new(nil)
+      self.beta_top = RootNode.new(nil)
       beta_top.rete = self
       beta_top.seed
       self.queries = {}
@@ -63,7 +62,12 @@ module Wongi::Engine
     end
 
     def with_overlay(&block)
-      default_overlay.with_child(&block)
+      child = current_overlay.new_child
+      add_overlay(child)
+      block.call(child)
+    ensure
+      remove_overlay(child)
+      child.dispose!
     end
 
     def alphas
@@ -81,17 +85,20 @@ module Wongi::Engine
     #   end
     # end
 
-    def default_overlay
-      @default_overlay ||= DataOverlay.new(self)
+    def base_overlay
+      @base_overlay ||= Overlay.new(self)
     end
 
+    # TODO: deprecate this
+    alias default_overlay base_overlay
+
     # @private
-    def add_overlay(o)
+    private def add_overlay(o)
       overlays << o
     end
 
     # @private
-    def remove_overlay(o)
+    private def remove_overlay(o)
       overlays.delete(o) unless o == default_overlay
     end
 
@@ -100,11 +107,6 @@ module Wongi::Engine
       overlays.last
     end
 
-    # @private
-    def overlays
-      @overlays ||= []
-    end
-
     def assert(wme)
       default_overlay.assert(wme)
     end
@@ -115,65 +117,23 @@ module Wongi::Engine
 
     # @private
     def real_assert(wme)
-      wme = wme.import_into self unless wme.rete == self
-
-      # source = best_alpha(wme)
-      if (existing = find(wme.subject, wme.predicate, wme.object))
-        existing.manual! if wme.manual?
-        return
-      end
-
       alphas_for(wme).each { |a| a.activate wme }
-
       wme
     end
 
     # @private
-    def real_retract(wme, options)
-      real = find(wme.subject, wme.predicate, wme.object)
-      return if real.nil?
-
-      if real.generated? # still some generator tokens left
-        raise Error, "cannot retract automatic facts" unless real.manual?
-
-        real.manual = false
-      elsif options[:automatic] && real.manual?
-        return
-      end
-
-      alphas_for(real).each { |a| a.deactivate real }
+    def real_retract(wme)
+      # p real_retract: {wme:}
+      alphas_for(wme).each { |a| a.deactivate wme }
     end
 
     def wmes
-      alpha_top.wmes
+      current_overlay.select(:_, :_, :_)
     end
 
     alias statements wmes
     alias facts wmes
 
-    def in_snapshot?
-      @in_snapshot
-    end
-
-    def snapshot!
-      @timeline.each_with_index do |slice, index|
-        source = if index == @timeline.size - 1
-                   alpha_hash
-                 else
-                   @timeline[index + 1]
-                 end
-        # puts "source = #{source}"
-        wmes = {}
-        slice.each do |key, alpha|
-          wmes[key] = alpha.wmes
-          in_snapshot {
-            wmes[key].dup.each(&:destroy)
-          }
-          alpha.snapshot! source[key]
-        end
-      end
-    end
-
     def rule(name = nil, &block)
       r = DSL::Rule.new(name || generate_rule_name)
       r.instance_eval(&block)
@@ -192,7 +152,7 @@ module Wongi::Engine
       else
         case something
         when Array
-          assert(WME.new(*something).tap { |wme| wme.overlay = default_overlay })
+          assert(WME.new(*something))
         when WME
           assert something
           # when Wongi::RDF::Statement
@@ -223,7 +183,6 @@ module Wongi::Engine
 
     def compile_alpha(condition)
       template = Template.new :_, :_, :_
-      time = condition.time
 
       template.subject = condition.subject unless Template.variable?(condition.subject)
       template.predicate = condition.predicate unless Template.variable?(condition.predicate)
@@ -231,25 +190,13 @@ module Wongi::Engine
 
       hash = template.hash
       # puts "COMPILED CONDITION #{condition} WITH KEY #{key}"
-      if time.zero?
-        return alpha_hash[hash] if alpha_hash.key?(hash)
-      elsif @timeline[time + 1] && @timeline[time + 1].key?(hash)
-        return @timeline[time + 1][hash]
-      end
+      return alpha_hash[hash] if alpha_hash.key?(hash)
 
       alpha = AlphaMemory.new(template, self)
 
-      if time.zero?
-        alpha_hash[hash] = alpha
-        initial_fill alpha
-      else
-        if @timeline[time + 1].nil?
-          # => ensure lineage from 0 to time
-          compile_alpha condition.class.new(condition.subject, condition.predicate, condition.object, time: time + 1)
-          @timeline.unshift({})
-        end
-        @timeline[time + 1][hash] = alpha
-      end
+      alpha_hash[hash] = alpha
+      initial_fill alpha
+
       alpha
     end
 
@@ -259,7 +206,7 @@ module Wongi::Engine
 
     # TODO: pick an alpha with fewer candidates to go through
     def initial_fill(alpha)
-      alpha_top.wmes.each do |wme|
+      default_overlay.select(:_, :_, :_).each do |wme|
         alpha.activate wme if wme =~ alpha.template
       end
     end
@@ -269,7 +216,7 @@ module Wongi::Engine
     end
 
     def prepare_query(name, conditions, parameters, actions = [])
-      query = queries[name] = BetaMemory.new(nil)
+      query = queries[name] = RootNode.new(nil)
       query.rete = self
       query.seed(parameters.to_h { |param| [param, nil] })
       results[name] = build_production query, conditions, parameters, actions, true
@@ -299,8 +246,7 @@ module Wongi::Engine
                  else
                    raise Error, "Network#each expect a template or nothing at all"
                  end
-      source = best_alpha(template)
-      matching = current_overlay.wmes(source).select { |wme| wme =~ template }
+      matching = current_overlay.select(template)
       if block_given?
         matching.each(&block)
       else
@@ -309,29 +255,20 @@ module Wongi::Engine
     end
 
     def select(s, p, o)
-      template = Template.new(s, p, o)
-      source = best_alpha(template)
-      matching = current_overlay.wmes(source).select { |wme| wme =~ template }
-      matching.each { |st| yield st.subject, st.predicate, st.object } if block_given?
-      matching
+      matching = current_overlay.select(s, p, o)
+      if block_given?
+        matching.each(&block)
+      else
+        matching.each
+      end
     end
 
     def find(s, p, o)
-      template = Template.new(s, p, o)
-      source = best_alpha(template)
-      # puts "looking for #{template} among #{source.wmes.size} triples of #{source.template}"
-      current_overlay.wmes(source).find { |wme| wme =~ template }
+      current_overlay.select(s, p, o).first
     end
 
     protected
 
-    def in_snapshot
-      @in_snapshot = true
-      yield
-    ensure
-      @in_snapshot = false
-    end
-
     def generate_rule_name
       "rule_#{productions.length}"
     end
@@ -386,8 +323,10 @@ module Wongi::Engine
       # the root node should not be deleted
       return unless node.parent
 
-      if [BetaMemory, NegNode, NccNode, NccPartner].any? { |klass| node.is_a? klass }
-        node.tokens.first.destroy while node.tokens.first
+      node.tokens.dup.each do |token|
+        overlays.each do |overlay|
+          overlay.remove_own_token(token)
+        end
       end
 
       node.parent.children.delete node