wongi-engine 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 461346062a679921c61fc0b35bc2e89ef0d06920745d650b48fedbbc452b780a
-  data.tar.gz: df2bf13a3551dc049e08398b11ac42440a34e4cb651f5092b74d3efdd5a3aecf
+  metadata.gz: 435d4ced6ab1fc3b576d5bb226d7a676ab67121377454da93d5f627077e21fcd
+  data.tar.gz: 788b07e8814de7e398d65a5c90ce8c0acbc9c12c5b20a3497f980b4544e1d2b4
 SHA512:
-  metadata.gz: 0a3495df610621e35c8cef1a0cbf39aa0b26a8cee6d699df2bf4cdb451f4c06db534d7943bb4f30778d21289406d54ba0264f54ecfe3b839e3b1d50ccd6b63b3
-  data.tar.gz: 8f85d69a8f476eec9a6ee8cf97ade3a4b8e9959616114511ca65007cd225feb0963613750628a450d5ea5f905fcaed65082662db828491a7caa9c533dc70db37
+  metadata.gz: fae43ecc031d91650b11a9a6195149280a3bb37197edd553e168417af0d9a7973c0234a165fc2e825ce250e4a26e679e29e28ce142889e24e19c0427ffa27190
+  data.tar.gz: 2344d2a636e05b2210861846b0e842cef7160aaca647bf09431b89deeb27af96994ebed72f9768ed4632b68c826196085f0ff1b3c1e93a33767ff25b3beed3ce

data/examples/ex01.rb

@@ -1,23 +1,21 @@
-include Wongi::Engine
+engine = Wongi::Engine.create
 
-ds = Network.new
-
-ds << WME.new("Alice", "friend", "Bob")
+engine << ["Alice", "friend", "Bob"]
 
 puts "Enumerate all:"
 
-ds.each do |wme|
+engine.each do |wme|
   puts wme
 end
 
 puts "Enumerate by pattern:"
 
-ds.each :_, "friend", :_ do |wme|
+engine.each :_, "friend", :_ do |wme|
   puts wme
 end
 
 puts "Mismatching pattern:"
 
-ds.each :_, "foe", :_ do |wme|
+engine.each :_, "foe", :_ do |wme|
   puts wme
 end

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

@@ -1,5 +1,7 @@
 module Wongi::Engine
   class AssignmentNode < BetaNode
+    attr_reader :variable, :body
+
     def initialize(parent, variable, body)
       super(parent)
       @variable = variable
@@ -11,8 +13,8 @@ module Wongi::Engine
 
       overlay.add_token(token)
       children.each do |child|
-        value = @body.respond_to?(:call) ? @body.call(token) : @body
-        child.beta_activate Token.new(child, token, nil, { @variable => value })
+        value = body.respond_to?(:call) ? body.call(token) : body
+        child.beta_activate Token.new(child, token, nil, { variable => value })
       end
     end
 
@@ -30,7 +32,7 @@ module Wongi::Engine
 
     def refresh_child(child)
       tokens.each do |token|
-        child.beta_activate Token.new(child, token, nil, { @variable => @body.respond_to?(:call) ? @body.call(token) : @body })
+        child.beta_activate Token.new(child, token, nil, { variable => body.respond_to?(:call) ? body.call(token) : body })
       end
     end
   end

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

@@ -1,11 +1,12 @@
 module Wongi
   module Engine
     class ProductionNode < BetaNode
-      attr_accessor :tracer, :compilation_context
+      attr_accessor :tracer, :compilation_context, :name
 
-      def initialize(parent, actions)
+      def initialize(name, parent, actions)
         super(parent)
         @actions = actions.each { |action| action.production = self }
+        @name = name
       end
 
       def beta_activate(token)

data/lib/wongi-engine/compiler.rb

@@ -100,7 +100,8 @@ module Wongi::Engine
     end
 
     def filter_node(filter)
-      self.node = FilterNode.new(node, filter).tap(&:refresh)
+      existing = node.children.find { |n| n.is_a?(FilterNode) && n.test == filter }
+      self.node = existing || FilterNode.new(node, filter).tap(&:refresh)
     end
   end
 end

data/lib/wongi-engine/filter/equality_test.rb

@@ -29,5 +29,9 @@ module Wongi::Engine
     def ==(other)
       self.class == other.class && x == other.x && y == other.y
     end
+
+    def to_s
+      "#{x} == #{y}"
+    end
   end
 end

data/lib/wongi-engine/filter/greater_than_or_equal_test.rb

@@ -31,5 +31,9 @@ module Wongi::Engine
     def ==(other)
       self.class == other.class && x == other.x && y == other.y
     end
+
+    def to_s
+      "#{x} >= #{y}"
+    end
   end
 end

data/lib/wongi-engine/filter/greater_than_test.rb

@@ -29,5 +29,9 @@ module Wongi::Engine
     def ==(other)
       self.class == other.class && x == other.x && y == other.y
     end
+
+    def to_s
+      "#{x} > #{y}"
+    end
   end
 end

data/lib/wongi-engine/filter/in_list_test.rb

@@ -29,5 +29,9 @@ module Wongi::Engine
     def ==(other)
       self.class == other.class && x == other.x && y == other.y
     end
+
+    def to_s
+      "#{x} in #{y}"
+    end
   end
 end

data/lib/wongi-engine/filter/inequality_test.rb

@@ -29,5 +29,9 @@ module Wongi::Engine
     def ==(other)
       self.class == other.class && x == other.x && y == other.y
     end
+
+    def to_s
+      "#{x} != #{y}"
+    end
   end
 end

data/lib/wongi-engine/filter/less_than_or_equal_test.rb

@@ -31,5 +31,9 @@ module Wongi::Engine
     def ==(other)
       self.class == other.class && x == other.x && y == other.y
     end
+
+    def to_s
+      "#{x} <= #{y}"
+    end
   end
 end

data/lib/wongi-engine/filter/less_than_test.rb

@@ -29,5 +29,9 @@ module Wongi::Engine
     def ==(other)
       self.class == other.class && x == other.x && y == other.y
     end
+
+    def to_s
+      "#{x} < #{y}"
+    end
   end
 end

data/lib/wongi-engine/filter/not_in_list_test.rb

@@ -29,5 +29,9 @@ module Wongi::Engine
     def ==(other)
       self.class == other.class && x == other.x && y == other.y
     end
+
+    def to_s
+      "#{x} not in #{y}"
+    end
   end
 end

data/lib/wongi-engine/graph.rb

@@ -29,22 +29,22 @@ module Wongi::Engine
     end
 
     def dump_alphas(io)
-      io.puts "subgraph cluster_alphas {"
       @rete.alphas.reject { |alpha| alpha.betas.empty? }.each do |alpha|
-        io.puts "node#{print_hash alpha.object_id} [shape=box label=\"#{alpha.template.to_s.gsub(/"/, '"')}\"];"
+        io.puts "node#{print_hash alpha.object_id} [shape=box style=filled fillcolor=olivedrab1 label=#{alpha_label(alpha).dump}];"
       end
-      io.puts "};"
     end
 
     def dump_betas(io, opts)
-      dump_beta(io, @rete.beta_top, opts)
+      @rete.beta_top.children.each do |child|
+        dump_beta(io, child, opts)
+      end
     end
 
     def dump_beta(io, beta, opts)
       return if @seen_betas.include? beta
 
       @seen_betas << beta
-      io.puts "node#{print_hash beta.object_id} [label=\"#{beta.class.name.split('::').last}\\nid=#{beta.object_id}\"];"
+      io.puts "node#{print_hash beta.object_id} [style=filled fillcolor=#{beta_fillcolor(beta)} label=#{beta_label(beta).dump}];"
       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} }"
@@ -58,5 +58,47 @@ module Wongi::Engine
         dump_beta(io, child, opts)
       end
     end
+
+    def alpha_label(node)
+      node.template.to_s
+    end
+
+    def beta_label(node)
+      label = node.class.name.split('::').last
+      label += "\n" +
+        case node
+        when JoinNode, NegNode, OptionalNode
+          node.alpha.template.to_s
+        when FilterNode
+          node.test.to_s
+        when AssignmentNode
+          "#{node.variable} := #{node.body.respond_to?(:call) ? '<dynamic>' : node.body}"
+        when ProductionNode
+          node.name
+        else
+          ""
+        end
+
+      label
+    end
+
+    def beta_fillcolor(node)
+      case node
+      when JoinNode
+        "lightgreen"
+      when NegNode
+        "lightpink"
+      when OptionalNode
+        "palegreen"
+      when FilterNode
+        "lightblue"
+      when AssignmentNode
+        "lightyellow"
+      when ProductionNode
+        "lightcoral"
+      else
+        "white"
+      end
+    end
   end
 end

data/lib/wongi-engine/network.rb

@@ -178,7 +178,7 @@ module Wongi::Engine
 
     def install_rule(rule)
       derived = rule.import_into self
-      production = build_production beta_top, derived.conditions, [], derived.actions, false
+      production = build_production(rule.name, beta_top, derived.conditions, [], derived.actions, false)
       productions[rule.name] = production if rule.name
       production
     end
@@ -224,7 +224,7 @@ module Wongi::Engine
       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
+      results[name] = build_production(name, query, conditions, parameters, actions, true)
     end
 
     def execute(name, valuations)
@@ -296,9 +296,9 @@ module Wongi::Engine
       end
     end
 
-    def build_production(root, conditions, parameters, actions, alpha_deaf)
+    def build_production(name, root, conditions, parameters, actions, alpha_deaf)
       compiler = Compiler.new(self, root, conditions, parameters, alpha_deaf)
-      ProductionNode.new(compiler.compile, actions).tap do |production|
+      ProductionNode.new(name, compiler.compile, actions).tap do |production|
         production.compilation_context = compiler
         production.refresh
       end

data/lib/wongi-engine/overlay.rb

@@ -155,7 +155,7 @@ module Wongi::Engine
         raise ArgumentError
       end
 
-      each_by_template(template, &block)
+      each_by_template(template).each(&block)
     end
 
     def entity(subject)

data/lib/wongi-engine/version.rb

@@ -1,5 +1,5 @@
 module Wongi
   module Engine
-    VERSION = "0.4.2".freeze
+    VERSION = "0.4.4".freeze
   end
 end

data/spec/overlay_spec.rb

@@ -68,6 +68,29 @@ describe Wongi::Engine::Overlay do
       expect(overlay.each(1, 11, 111)).to have(1).items
       expect(overlay.each(1, 11, 111).first).to eq(wmes.first)
     end
+
+    it 'iterates with a block' do
+      wmes = [
+        Wongi::Engine::WME.new(1, 11, 111),
+        Wongi::Engine::WME.new(1, 11, 112),
+        Wongi::Engine::WME.new(1, 11, 113),
+        Wongi::Engine::WME.new(1, 12, 121),
+        Wongi::Engine::WME.new(1, 12, 122),
+        Wongi::Engine::WME.new(2, 11, 111),
+        Wongi::Engine::WME.new(2, 11, 222),
+        Wongi::Engine::WME.new(2, 22, 222),
+        Wongi::Engine::WME.new(2, 22, 223),
+        Wongi::Engine::WME.new(3, 33, 113),
+        Wongi::Engine::WME.new(3, 33, 333),
+        Wongi::Engine::WME.new(3, 34, 333),
+      ]
+      wmes.each { overlay.assert(_1) }
+
+      returned = []
+      overlay.each { |wme| returned << wme }
+
+      expect(returned).to eq wmes
+    end
   end
 
   context "retracting facts" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wongi-engine
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.4
 platform: ruby
 authors:
 - Valeri Sokolov
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-15 00:00:00.000000000 Z
+date: 2023-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -189,7 +189,7 @@ licenses:
 metadata:
   documentation_uri: https://ulfurinn.github.io/wongi-engine/
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -204,8 +204,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.4.3
+signing_key: 
 specification_version: 4
 summary: A forward-chaining rule engine in pure Ruby.
 test_files: []