wongi-engine 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ef395363d21e3d9fadcc8e6ce974c293b31c189
-  data.tar.gz: 65eb91be6334df92643463f6dee220a3467d3e8a
+  metadata.gz: ae02e0d5aacdbab891830af73becded445cda3c2
+  data.tar.gz: 7410f6c1af9a8899d2b67f9e07815348e20b0248
 SHA512:
-  metadata.gz: 9b88eb68e39323b45e3b3e6c5ed291f78dc31512096a557f750c5ffa3f840025b31b844b10d4abc2de7b8667809c2f68fff995a366074032c20e7c51833256a8
-  data.tar.gz: eaa26f530def7d9cd1cce40f0169b5e3ecec43d9e097cc02f911ac25ec03d35c3534a49ea631ab411e8ce909917e85d90429879eeda8c0410bcb9bb58ae5594e
+  metadata.gz: d30014e3145febf0ed88ff363dfc019392572917413d398015e66a7290ec37ac2906f1fe1a9ea8b1c441f89afc4cfa8fc49f4db6e7ac365a70dbdf9b71dc23c6
+  data.tar.gz: 86b5e6adfe13f547001413ff898207f64f3e94eadaae80dc11744141dbd9dd916a34d55f23abd435114378f324f4af8a281650b678cb13a6c0baafa1d1e33bdd

data/.travis.yml

@@ -1,12 +1,11 @@
 language: ruby
 rvm:
 - 1.9.3
-- 2.0.0
-- 2.1.7
-- 2.2.3
-- rbx-2.4.1
+- 2.0
+- 2.1
+- 2.2
 - rbx-2.5.8
-- jruby-19mode
+- jruby-9.0
 sudo: false
 notifications:
   hipchat:

data/README.md

@@ -24,6 +24,10 @@ The Rete implementation in this library largely follows the outline presented in
 
 ## Changelog
 
+### 0.2.1
+
+* data overlay fixes
+
 ### 0.2.0
 
 * refactored compilation code

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

@@ -12,6 +12,7 @@ module Wongi::Engine
         # link to rete here to ensure proper linking with token
         wme = WME.new subject, predicate, object, rete
         wme.manual = false
+        wme.overlay = token.overlay
 
         production.tracer.trace( action: self, wme: wme ) if production.tracer
         if existing = rete.exists?( wme )
@@ -25,7 +26,7 @@ module Wongi::Engine
           wme.generating_tokens << token
           # this MUST be done after we link the wme and the token
           # in order for neg rule invalidation to work
-          rete << wme
+          wme.overlay.assert wme
         end
 
       end
@@ -37,7 +38,7 @@ module Wongi::Engine
             l << wme if wme.generating_tokens.empty?
           end
         end.each do |wme|
-          rete.retract wme, automatic: true
+          wme.overlay.retract wme, automatic: true
         end
       end
     end

data/lib/wongi-engine/network.rb

@@ -100,6 +100,11 @@ module Wongi::Engine
       overlays.delete(o) unless o == default_overlay
     end
 
+    # @private
+    def current_overlay
+      overlays.last
+    end
+
     # @private
     def overlays
       @overlays ||= []
@@ -312,14 +317,16 @@ module Wongi::Engine
       end
       no_check = s == :_ && p == :_ && o == :_
       template = Template.new(s, p, o).import_into self
-      alpha_top.wmes.each do |wme|
+      source = best_alpha(template)
+      current_overlay.wmes(source).each do |wme|
         yield wme if (no_check || wme =~ template)
       end
     end
 
     def select s, p, o
       template = Template.new(s, p, o)
-      matching = alpha_top.wmes.select { |wme| wme =~ template }
+      source = best_alpha(template)
+      matching = current_overlay.wmes(source).select { |wme| wme =~ template }
       if block_given?
         matching.each { |st| yield st.subject, st.predicate, st.object }
       end
@@ -330,7 +337,7 @@ module Wongi::Engine
       template = Template.new(s, p, o)
       source = best_alpha(template)
       # puts "looking for #{template} among #{source.wmes.size} triples of #{source.template}"
-      source.wmes.detect { |wme| wme =~ template }
+      current_overlay.wmes(source).find { |wme| wme =~ template }
     end
 
     protected

data/lib/wongi-engine/token.rb

@@ -18,7 +18,7 @@ module Wongi::Engine
 
     def initialize node, token, wme, assignments
       @node, @parent, @wme, @assignments = node, token, wme, assignments
-      @overlay = wme ? wme.overlay.highest(token.overlay) : node.rete.default_overlay
+      @overlay = wme ? wme.overlay.highest(token.overlay) : (token ? token.overlay : node.rete.default_overlay)
       @children = []
       @deleted = false
       @neg_join_results = []

data/lib/wongi-engine/version.rb

@@ -1,5 +1,5 @@
 module Wongi
   module Engine
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/spec/overlay_spec.rb

@@ -16,7 +16,46 @@ describe Wongi::Engine::DataOverlay do
       expect(production).to have(1).token
     }
     expect(production).to have(0).tokens
+  end
+
+  it 'should generate into correct overlays' do
+    production = engine << rule {
+      forall {
+        has 1, 2, :X
+      }
+      make {
+        gen :X, 4, 5
+      }
+    }
+    engine.with_overlay { |overlay|
+      overlay << [1,2,3]
+      expect(production).to have(1).token
+      expect(engine.find(3, 4, 5)).not_to be_nil
+    }
+    expect(production).to have(0).tokens
+    expect(engine.find(3, 4, 5)).to be_nil
+  end
 
+  it 'works with assignments' do
+    production = engine << rule {
+      forall {
+        has 1, 2, :X
+        assign(:Something) { 6 }
+      }
+      make {
+        collect :Something, :stuff
+        gen :person, 'stuff', :Something
+      }
+    }
+
+    engine.with_overlay { |overlay|
+      overlay << [1,2,3]
+      expect(production).to have(1).token
+      expect(engine.find(:_, :_, :_)).not_to be_nil
+    }
+
+    expect(production).to have(0).tokens
+    expect(engine.find(:_, :_, :_)).to be_nil
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wongi-engine
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Valeri Sokolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake