wongi-engine 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae02e0d5aacdbab891830af73becded445cda3c2
-  data.tar.gz: 7410f6c1af9a8899d2b67f9e07815348e20b0248
+  metadata.gz: 21764b2d065e6147a4f93f900cf325ea51e0d402
+  data.tar.gz: 644d41b0bb6fc5a02dce1fc270a256dce3bae1a1
 SHA512:
-  metadata.gz: d30014e3145febf0ed88ff363dfc019392572917413d398015e66a7290ec37ac2906f1fe1a9ea8b1c441f89afc4cfa8fc49f4db6e7ac365a70dbdf9b71dc23c6
-  data.tar.gz: 86b5e6adfe13f547001413ff898207f64f3e94eadaae80dc11744141dbd9dd916a34d55f23abd435114378f324f4af8a281650b678cb13a6c0baafa1d1e33bdd
+  metadata.gz: c9bfb86fd99d92188f33bf1ccb5e70b58fdbe5a275239676831ece2fb48bfc3d209adf73415e2bc78adfdf198ebb2d3c614585257adc8be0839e7f306d78d454
+  data.tar.gz: adcde36cadeb3552fa0446e1e3c389f3bc35395ba5593fa3e95cced44bbe97a1ea4444ed98e4b8309e3c0da3b3495af4da94029b841a08f4a73042beb545ba78

data/.hgtags

@@ -2,3 +2,4 @@ b1dfd471a2a9e4a57f0e4932ac184faa5d6fa5b5 v0.1.0.alpha1
 cf7d0e690fb65541b19074e132813c79a36d12c5 v0.1.0
 accab6252d5746dafe847935ad55f8500594d0cc v0.1.1
 0000000000000000000000000000000000000000 v0.1.1
+80964eb067a8445980b27e871731ff1274bd7be2 v0.2.1

data/README.md

@@ -24,6 +24,10 @@ The Rete implementation in this library largely follows the outline presented in
 
 ## Changelog
 
+### 0.2.2
+
+* fixed retention of WMEs added to an overlay
+
 ### 0.2.1
 
 * data overlay fixes

data/lib/wongi-engine/data_overlay.rb

@@ -40,7 +40,7 @@ module Wongi::Engine
     def <<(thing)
       case thing
       when Array
-        assert WME.new(*thing)
+        assert WME.new(*thing).tap { |wme| wme.overlay = self }
       when WME
         assert(thing)
       else

data/lib/wongi-engine/network.rb

@@ -53,7 +53,6 @@ module Wongi::Engine
       self.beta_top.seed
       self.queries = {}
       self.results = {}
-      @cache = {}
       @revns = {}
 
       @productions = { }
@@ -124,14 +123,12 @@ module Wongi::Engine
         wme = wme.import_into self
       end
 
-      if existing = @cache[wme]
+      source = best_alpha(wme)
+      if existing = find(wme.subject, wme.predicate, wme.object)
         existing.manual! if wme.manual?
         return
       end
 
-      # puts "ASSERTING #{wme}"
-      @cache[wme] = wme
-
       alphas_for( wme ).each { |a| a.activate wme }
 
       wme
@@ -139,8 +136,7 @@ module Wongi::Engine
 
     # @private
     def real_retract wme, options
-      real = @cache[wme]
-
+      real = find(wme.subject, wme.predicate, wme.object)
       return if real.nil?
       if real.generated? # still some generator tokens left
         if real.manual?
@@ -154,8 +150,6 @@ module Wongi::Engine
         end
       end
 
-      @cache.delete(real)
-
       alphas_for( real ).each { |a| a.deactivate real }
     end
 
@@ -206,7 +200,7 @@ module Wongi::Engine
       else
         case something
         when Array
-          assert WME.new( *something )
+          assert WME.new( *something ).tap { |wme| wme.overlay = default_overlay }
         when WME
           assert something
         # when Wongi::RDF::Statement
@@ -302,7 +296,7 @@ module Wongi::Engine
     end
 
     def exists? wme
-      @cache[ wme ]
+      find(wme.subject, wme.predicate, wme.object)
     end
 
     def each *args

data/lib/wongi-engine/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wongi-engine
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Valeri Sokolov