wongi-engine 0.4.0.pre.alpha1 → 0.4.0.pre.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf15effd33cba1faca7c6b2a6ce8b8a4730981a9b778fb5d41e11b4dce7803f8
-  data.tar.gz: 8d3cc0c99061e7097747b4339c55a83c11e79bb0edfbba4a0c95e4c850301595
+  metadata.gz: 49eb7efc3f4049b38a7035208884d2078e0e31e68d396fb647deb81add7a030c
+  data.tar.gz: 6916568d628dbfce536001472c224f0fcee9ab580d4d9f2df30f04edb77bb45d
 SHA512:
-  metadata.gz: 7140c583e23389df8f5c959b7ed31220782d72afcbd10f0883ba7314f24534656f1ca3fed33ed9d49a7962da8cbe7535f48bf160be88eef86d3798efe7ccece5
-  data.tar.gz: 3f0e9957b8497666a25c3ac933bcfe93495ed2c4cdac2f4eb27468c95401a107139f6a23840816241f94c0811edf69ab373818dd33def938d3ae9450505c68b5
+  metadata.gz: 437466d4256f5ff96bf741e879054f2e5a7499f3876ed73cbd00b155caf6b5f06cfb60378941e36cba6dd912b8d61cbe8b4cdfec58a0b60f121841cdd63c3bd9
+  data.tar.gz: 5e8ca5469c6b20cb63928a0c4c128f3391ae74c29e09608b0a7045d6d979bc03d9d8b95f49f4282898531ee8f69e7bd9abcd8ebb8164aa4d612292e01b509be3

data/README.md

@@ -11,7 +11,7 @@ Ruby >= 2.7 and JRuby are supported. Rubinius should work but isn't actively sup
 
 There is no API documentation, as most of the library's interfaces are for internal use only and would not be safe to use directly.
 
-Instead, follow the [tutorial](http://ulfurinn.github.io/wongi-engine/) and stick to the constructs described in it.
+Instead, follow the [tutorial](https://ulfurinn.github.io/wongi-engine/) and stick to the constructs described in it.
 
 ## Upgrading
 

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

@@ -62,7 +62,8 @@ module Wongi::Engine
       # # TODO: optimise: only clean up if the value changed
       beta_deactivate_children(token: token)
 
-      candidates = select_wmes(alpha.template) { |asserted_wme| matches?(token, asserted_wme) }
+      template = specialize(alpha.template, tests, token)
+      candidates = select_wmes(template) { |asserted_wme| matches?(token, asserted_wme) }
 
       return if candidates.empty?
 

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

@@ -61,6 +61,15 @@ module Wongi::Engine
       rete.current_overlay.select(template)
     end
 
+    private def specialize(template, tests, token)
+      tests.each_with_object(template.dup) do |test, template|
+        var = test.variable
+        if token.has_var?(var)
+          template.public_send("#{test.field}=", token[var])
+        end
+      end
+    end
+
     def tokens
       overlay.node_tokens(self)
     end

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

@@ -65,7 +65,8 @@ module Wongi
 
         overlay.add_token(token)
 
-        select_wmes(alpha.template).each do |wme|
+        template = specialize(alpha.template, tests, token)
+        select_wmes(template).each do |wme|
           next unless matches?(token, wme)
 
           assignments = collect_assignments(wme)
@@ -93,7 +94,7 @@ module Wongi
       protected
 
       def matches?(token, wme)
-        @tests.each do |test|
+        tests.each do |test|
           return false unless test.matches?(token, wme)
         end
         true

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

@@ -44,7 +44,9 @@ module Wongi
         return if tokens.find { |t| t.duplicate? token }
 
         overlay.add_token(token)
-        select_wmes(alpha.template).each do |wme|
+
+        template = specialize(alpha.template, tests, token)
+        select_wmes(template).each do |wme|
           overlay.add_neg_join_result(NegJoinResult.new(token, wme)) if matches?(token, wme)
         end
         return if overlay.neg_join_results_for(token: token).any?

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

@@ -55,8 +55,10 @@ module Wongi
         return if tokens.find { |t| t.duplicate? token }
 
         overlay.add_token(token)
+
         match = false
-        select_wmes(alpha.template).each do |wme|
+        template = specialize(alpha.template, tests, token)
+        select_wmes(template).each do |wme|
           assignments = collect_assignments(wme)
           next unless matches? token, wme
 

data/lib/wongi-engine/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wongi-engine
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre.alpha1
+  version: 0.4.0.pre.alpha2
 platform: ruby
 authors:
 - Valeri Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-14 00:00:00.000000000 Z
+date: 2022-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry