wongi-engine 0.4.0.pre.alpha6 → 0.4.0.pre.alpha7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fab0e9a6fff37b3dc1a6cb4e7aa2c10ea08c82dbe78c874a7d475a18dfef170
-  data.tar.gz: e23cedb3481395ff240868b45eeedc5854331f521c3c00e96ff6e537d2e7c7e5
+  metadata.gz: 600fe3fc20d2cbecf1f59d7ad771eb387f97c9f00144089961dacb247c817475
+  data.tar.gz: 94d3cd24972fd5b6b67a1940804dc30d91c960e05ffe143889b5e0bb99e1fb84
 SHA512:
-  metadata.gz: 9344af4983e233a95b157b4877f432f17fc7068a6ae77de4ca4edb5678e3555fb079dc13c8dee1866b21a09afcb4c003077ff8e70d7ad1222605ceab828d7726
-  data.tar.gz: cda25e408f9ba4706002d476f1c03cc367d10dddaf6381736b27f17be9b9e6b43e2993c9d84947d8eee3e04d08e631ba79a31332948f08b7ee44ecf95fd17ffc
+  metadata.gz: f233a3b5cd1a10ffab78742c5f14f319c24ff64e2d2683cf4e41e304287c832e818802e4224316e460909975b93658c0e13ecef5888101841002c054ea10689a
+  data.tar.gz: 11b1c635fa38aa4427dac9eba6807ad8294613a814ac98f588c0eee0eb7febec0542192e7113ea6b02bccffb25063e698e609a6fd1687a48cefbb5fb3a1b4d2f

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

@@ -12,15 +12,9 @@ module Wongi::Engine
     end
 
     def make_partition_fn(partition)
-      return nil if partition.nil?
+      return nil if partition.empty?
 
-      if Template.variable?(partition)
-        ->(token) { token[partition] }
-      elsif partition.is_a?(Array) && partition.all? { Template.variable?(_1) }
-        ->(token) { token.values_at(*partition) }
-      else
-        partition
-      end
+      ->(token) { token.values_at(*partition) }
     end
 
     def make_aggregate_fn(agg)
@@ -53,12 +47,16 @@ module Wongi::Engine
     end
 
     def evaluate(child: nil)
-      groups = if partition
-        tokens.group_by(&partition).values
-      else
-        # just a single group of everything
-        [tokens]
-      end
+      return if tokens.empty?
+
+      groups =
+        if partition
+          tokens.group_by(&partition).values
+        else
+          # just a single group of everything
+          [tokens]
+        end
+
 
       groups.each do |tokens|
         aggregated = self.aggregate.call(tokens.map(&self.map))
@@ -67,9 +65,9 @@ module Wongi::Engine
         tokens.each do |token|
           # TODO: optimize this to work with a diff of actual changes
           beta_deactivate_children(token: token, children: children)
-          children.each do |beta|
-            beta.beta_activate(Token.new(beta, token, nil, assignment))
-          end
+        end
+        children.each do |beta|
+          beta.beta_activate(Token.new(beta, tokens, nil, assignment))
         end
       end
     end

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

@@ -20,7 +20,7 @@ module Wongi::Engine
       overlay.remove_token(token)
       children.each do |child|
         child.tokens.each do |t|
-          if t.parent == token
+          if t.child_of?(token)
             child.beta_deactivate t
             # token.destroy
           end

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

@@ -51,7 +51,7 @@ module Wongi::Engine
 
     def beta_deactivate_children(token: nil, wme: nil, children: self.children)
       children.each do |child|
-        child.tokens.select { (token.nil? || _1.parent == token) && (wme.nil? || _1.wme == wme) }.each do |child_token|
+        child.tokens.select { (token.nil? || _1.child_of?(token)) && (wme.nil? || _1.wme == wme) }.each do |child_token|
           child.beta_deactivate(child_token)
         end
       end

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

@@ -36,7 +36,7 @@ module Wongi
       def ncc_deactivate(token)
         # p ncc_deactivate: {class: self.class, object_id:, token:}
         children.each do |beta|
-          beta.tokens.select { |t| t.parent == token }.each do |t|
+          beta.tokens.select { |t| t.child_of?(token) }.each do |t|
             beta.beta_deactivate t
           end
         end

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

@@ -23,7 +23,7 @@ module Wongi
             if optional
               # we're going to change the optional state so the old ones need to be removed
               child.tokens.each do |ct|
-                child.beta_deactivate(ct) if ct.parent == token
+                child.beta_deactivate(ct) if ct.child_of?(token)
               end
             end
             child.beta_activate Token.new(child, token, wme, assignments)
@@ -43,7 +43,7 @@ module Wongi
 
             children.each do |child|
               child.tokens.each do |ct|
-                child.beta_deactivate(ct) if ct.parent == token
+                child.beta_deactivate(ct) if ct.child_of?(token)
               end
               child.beta_activate Token.new(child, token, nil, {})
             end

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

@@ -32,7 +32,7 @@ module Wongi::Engine
       overlay.remove_token(token)
 
       children.each do |child|
-        child.tokens.select { _1.parent == token }.each { child.beta_deactivate(_1) }
+        child.tokens.select { _1.child_of?(token) }.each { child.beta_deactivate(_1) }
       end
 
       nil

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

@@ -42,14 +42,12 @@ module Wongi::Engine
           # asserting this WME would invalidate the match
           return false if token.node.is_a?(NegNode) && token.node.matches?(token, wme)
 
-          if token.parent && !considered_tokens.include?(token.parent)
-            tokens_to_consider.push(token.parent)
-          end
+          (token.parents - considered_tokens).each { |parent| tokens_to_consider.push(parent) }
+
+          next unless token.wme
 
-          if token.wme
-            overlay.generators(token.wme).each do |generator|
-              tokens_to_consider.push(generator.token) unless considered_tokens.include?(generator.token)
-            end
+          overlay.generators(token.wme).each do |generator|
+            tokens_to_consider.push(generator.token) unless considered_tokens.include?(generator.token)
           end
         end
 

data/lib/wongi-engine/dsl/clause/aggregate.rb

@@ -6,9 +6,10 @@ module Wongi::Engine
       def initialize(var, options = {})
         @var = var
         @over = options[:over]
-        @partition = options[:partition]
+        @partition = Array(options[:partition])
         @aggregate = options[:using]
         @map = options[:map]
+        raise "can only partition by variables" unless partition.all? { |p| Template.variable?(p) }
       end
 
       def compile(context)

data/lib/wongi-engine/network.rb

@@ -254,7 +254,7 @@ module Wongi::Engine
       end
     end
 
-    def select(s, p, o)
+    def select(s, p, o, &block)
       matching = current_overlay.select(s, p, o)
       if block_given?
         matching.each(&block)

data/lib/wongi-engine/token.rb

@@ -1,26 +1,25 @@
+require 'set'
+
 module Wongi::Engine
   class Token
-    attr_reader :children, :wme, :node, :generated_wmes
-    attr_accessor :parent
+    attr_reader :wme, :node, :generated_wmes, :parents
 
-    def initialize(node, token, wme, assignments = {})
+    def initialize(node, parents, wme, assignments = {})
       @node = node
-      @parent = token
+      @parents = Set.new(Array(parents))
       @wme = wme
       @assignments = assignments
-      @children = []
       @deleted = false
       @ncc_results = []
       @generated_wmes = []
-      token.children << self if token
     end
 
     def ancestors
-      if parent
-        parent.ancestors.unshift parent
-      else
-        []
-      end
+      parents.flat_map(&:ancestors).uniq + parents.to_a
+    end
+
+    def child_of?(token)
+      parents.include?(token)
     end
 
     def subst(variable, value)
@@ -50,7 +49,10 @@ module Wongi::Engine
 
     # TODO: ignore assignments?
     def duplicate?(other)
-      parent.equal?(other.parent) && @wme.equal?(other.wme) && assignments == other.assignments
+      instance_of?(other.class) &&
+        parents == other.parents &&
+        wme == other.wme &&
+        assignments == other.assignments
     end
 
     def to_s
@@ -75,22 +77,18 @@ module Wongi::Engine
     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
+    # def generated?(wme)
+    #   return true if generated_wmes.any? { |w| w == wme }
+    #
+    #   children.any? { |t| t.generated? wme }
+    # end
 
     protected
 
     def all_assignments
-      raise "Assignments is not a hash" unless @assignments.is_a?(Hash)
-
-      if @parent
-        @parent.assignments.merge @assignments
-      else
-        @assignments
-      end
+      parents.each_with_object({}) do |parent, acc|
+        acc.merge!(parent.assignments)
+      end.merge(@assignments)
     end
   end
 
@@ -99,7 +97,7 @@ module Wongi::Engine
       @parent = token
       @wme = wme
       @assignments = assignments
-      @children = []
+      # @children = []
       @neg_join_results = []
       @opt_join_results = []
       @ncc_results = []

data/lib/wongi-engine/version.rb

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

data/lib/wongi-engine/wme.rb

@@ -10,10 +10,6 @@ module Wongi::Engine
       self.class.new(subject, predicate, object)
     end
 
-    def ==(other)
-      other && subject == other.subject && predicate == other.predicate && object == other.object
-    end
-
     # @param template Wongi::Engine::Template
     def =~(template)
       raise Wongi::Engine::Error, "Cannot match a WME against a #{template.class}" unless template.is_a?(Template)
@@ -30,14 +26,6 @@ module Wongi::Engine
       inspect
     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
-
     protected
 
     def match_member(mine, theirs)

data/spec/aggregate_spec.rb

@@ -20,24 +20,21 @@ describe 'aggregate' do
 
       engine << [:apple, :weight, 5]
       expect(production.size).to be == 1
-      production.tokens.each do |token|
-        expect(token[:X]).to be == 5
-        expect(token[:Fruit]).to be == :apple
-      end
+      token = production.tokens.first
+      expect(token[:X]).to be == 5
+      expect(token[:Fruit]).to be == :apple
 
       engine << [:pea, :weight, 2]
-      expect(production.size).to be == 2
-      production.tokens.each do |token|
-        expect(token[:X]).to be == 2
-        expect(token[:Fruit]).to be == :pea
-      end
+      expect(production.size).to be == 1
+      token = production.tokens.first
+      expect(token[:X]).to be == 2
+      expect(token[:Fruit]).to be == :pea
 
       engine.retract [:pea, :weight, 2]
       expect(production.size).to be == 1
-      production.tokens.each do |token|
-        expect(token[:X]).to be == 5
-        expect(token[:Fruit]).to be == :apple
-      end
+      token = production.tokens.first
+      expect(token[:X]).to be == 5
+      expect(token[:Fruit]).to be == :apple
     end
   end
 
@@ -53,24 +50,21 @@ describe 'aggregate' do
 
       engine << [:pea, :weight, 2]
       expect(production.size).to be == 1
-      production.tokens.each do |token|
-        expect(token[:X]).to be == 2
-        expect(token[:Fruit]).to be == :pea
-      end
+      token = production.tokens.first
+      expect(token[:X]).to be == 2
+      expect(token[:Fruit]).to be == :pea
 
       engine << [:apple, :weight, 5]
-      expect(production.size).to be == 2
-      production.tokens.each do |token|
-        expect(token[:X]).to be == 5
-        expect(token[:Fruit]).to be == :apple
-      end
+      expect(production.size).to be == 1
+      token = production.tokens.first
+      expect(token[:X]).to be == 5
+      expect(token[:Fruit]).to be == :apple
 
       engine.retract [:apple, :weight, 5]
       expect(production.size).to be == 1
-      production.tokens.each do |token|
-        expect(token[:X]).to be == 2
-        expect(token[:Fruit]).to be == :pea
-      end
+      token = production.tokens.first
+      expect(token[:X]).to be == 2
+      expect(token[:Fruit]).to be == :pea
     end
   end
 
@@ -85,27 +79,23 @@ describe 'aggregate' do
 
       engine << [:pea, :weight, 1]
       expect(production.size).to be == 1
-      production.tokens.each do |token|
-        expect(token[:Count]).to be == 1
-      end
+      token = production.tokens.first
+      expect(token[:Count]).to be == 1
 
       engine << [:apple, :weight, 5]
-      expect(production.size).to be == 2
-      production.tokens.each do |token|
-        expect(token[:Count]).to be == 2
-      end
+      expect(production.size).to be == 1
+      token = production.tokens.first
+      expect(token[:Count]).to be == 2
 
       engine << [:watermelon, :weight, 15]
-      expect(production.size).to be == 3
-      production.tokens.each do |token|
-        expect(token[:Count]).to be == 3
-      end
+      expect(production.size).to be == 1
+      token = production.tokens.first
+      expect(token[:Count]).to be == 3
 
       engine.retract [:apple, :weight, 5]
-      expect(production.size).to be == 2
-      production.tokens.each do |token|
-        expect(token[:Count]).to be == 2
-      end
+      expect(production.size).to be == 1
+      token = production.tokens.first
+      expect(token[:Count]).to be == 2
     end
 
     it 'works with a post-filter' do
@@ -124,10 +114,9 @@ describe 'aggregate' do
       expect(production.size).to be == 0
 
       engine << [:watermelon, :weight, 15]
-      expect(production.size).to be == 3
-      production.tokens.each do |token|
-        expect(token[:Count]).to be == 3
-      end
+      expect(production.size).to be == 1
+      token = production.tokens.first
+      expect(token[:Count]).to be == 3
 
       engine.retract [:apple, :weight, 5]
       expect(production.size).to be == 0
@@ -148,7 +137,7 @@ describe 'aggregate' do
       engine << [:factor, 12, 3]
       engine << [:factor, 12, 4]
 
-      expect(production).to have(4).tokens
+      expect(production).to have(2).tokens
       production.tokens.each do |token|
         expect(token[:Product]).to be_a(Integer)
         expect(token[:Product]).to eq(token[:Number])
@@ -170,11 +159,55 @@ describe 'aggregate' do
       engine << [:factor, 12, 3]
       engine << [:factor, 12, 4]
 
-      expect(production).to have(4).tokens
+      expect(production).to have(2).tokens
       production.tokens.each do |token|
         expect(token[:Product]).to be_a(Integer)
         expect(token[:Product]).to eq(token[:Number])
       end
     end
   end
+
+  it 'propagates a single token' do
+    engine << rule {
+      forall {
+        has :Item, :price_group, :Group
+        has :Group, :name, :Name
+        has :Group, :base_price, :Price
+        max :MaxPrice, over: :Price, partition: %i[Item Name]
+        # equal :Price, :MaxPrice # -- this is necessary for this to work without token converging
+      }
+      make {
+        gen :Group, :price, :MaxPrice
+      }
+    }
+
+    engine << rule("sum") {
+      forall {
+        has :Item, :price_group, :Group
+        has :Group, :price, :Price
+        sum :TotalPrice, over: :Price, partition: :Item
+      }
+      make {
+        gen :Item, :price, :TotalPrice
+      }
+    }
+
+    material1 = Object.new
+    engine << [:toy, :price_group, material1]
+    engine << [material1, :name, :material]
+    engine << [material1, :base_price, 100]
+
+    material2 = Object.new
+    engine << [:toy, :price_group, material2]
+    engine << [material2, :name, :material]
+    engine << [material2, :base_price, 200]
+
+    packaging = Object.new
+    engine << [:toy, :price_group, packaging]
+    engine << [packaging, :name, :packaging]
+    engine << [packaging, :base_price, 20]
+
+    total_price = engine.select(:toy, :price, :_).first
+    expect(total_price.object).to eq(220)
+  end
 end

data/wongi-engine.gemspec

@@ -20,11 +20,10 @@ Gem::Specification.new do |gem|
 
   gem.homepage = 'https://github.com/ulfurinn/wongi-engine'
   gem.metadata = {
-    "documentation_uri"     => 'https://ulfurinn.github.io/wongi-engine/',
+    "documentation_uri" => 'https://ulfurinn.github.io/wongi-engine/',
     "rubygems_mfa_required" => 'true',
   }
 
-
   gem.files = if GemHelper.git?
                 `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
               else

metadata

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