wongi-engine 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ae5e5e3f2683835f9cc181b8c5edcf06245a61e
-  data.tar.gz: c6fe8127c68c416904044459132476b06fef46f3
+  metadata.gz: f64f3af9dd931ad41bf4e2ec9b9da00d8a39b5d6
+  data.tar.gz: 3f447b1c151f3d353370c9437dcfdd578a15f4c7
 SHA512:
-  metadata.gz: 8fc1bc5e6e5e85ee8a4282e4a56be5f2bd2c59e3d1c0dc23e60a85b5b97fe3d552798778f4cae4211a01fea1a400e4a0bac629cb11b34a3c0c586a7f37b34e8d
-  data.tar.gz: 01ab14f7f0e0616b26afd687ba060938154f5408c87b1944ed9e888ebf646839a2536854d579219b9254d8c48946b548e98a52e77908058cdd94ad26229c3c62
+  metadata.gz: 59a07a77cefe0df4bc7785dcbd3da631f8560709c5ab4780198e8577c59f39ba95bc006c9c66dd21fdfd853d8e47ef4ed70101602462fc817a03ab08f3cbe0b9
+  data.tar.gz: dcc37f6dd8324b719bb79cf17a44f3e025bf287dfbc0e70decfb31c9815bd72a5bb82c523c1a9963be1d1706107af3d1f50b495d9659fec88fb8b6f0e958ec4c

data/README.md

@@ -448,6 +448,10 @@ The Rete implementation in this library largely follows the outline presented in
 
 ## Changelog
 
+### 0.0.12
+
+* fixed another NCC bug
+
 ### 0.0.11
 
 * fixed cleanup of invalidated NCC branches

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

@@ -33,6 +33,7 @@ module Wongi
         t.node = self
         tokens << t
         partner.tokens.each do |ncc_token|
+          next unless ncc_token.ancestors.find { |a| a.equal? token }
           t.ncc_results << ncc_token
           ncc_token.owner = t
         end

data/lib/wongi-engine/version.rb

@@ -1,5 +1,5 @@
 module Wongi
   module Engine
-    VERSION = "0.0.11"
+    VERSION = "0.0.12"
   end
 end

data/spec/rule_specs/ncc_spec.rb

@@ -97,24 +97,78 @@ describe "NCC rule" do
     engine << [:poweruser, :priority, 3]
     engine << [:god, :priority, 4]
 
-    puts "<- MANUAL"
     engine << [:user, :want_action_for, :light_bathroom]
     engine << [:user, :light_bathroom, :off]
     expect( engine.select(:light_bathroom, :value, :_) ).to be == [ Wongi::Engine::WME.new(:light_bathroom, :value, :off) ]
     expect( engine.select(:light_bathroom, :last_user, :_) ).to be == [ Wongi::Engine::WME.new(:light_bathroom, :last_user, :user) ]
 
-    puts "\n<- AUTOMATIC"
     engine << [:light_kitchen, :value, :on]
     expect( engine.select(:light_bathroom, :value, :_) ).to be == [ Wongi::Engine::WME.new(:light_bathroom, :value, :on) ]
     expect( engine.select(:light_bathroom, :last_user, :_) ).to be == [ Wongi::Engine::WME.new(:light_bathroom, :last_user, :rule1) ]
 
-    puts "\n<- POWER USER"
     engine << [:poweruser, :want_action_for, :light_bathroom]
     engine << [:poweruser, :light_bathroom, :super_on]
     expect( engine.select(:light_bathroom, :value, :_) ).to be == [ Wongi::Engine::WME.new(:light_bathroom, :value, :super_on) ]
     expect( engine.select(:light_bathroom, :last_user, :_) ).to be == [ Wongi::Engine::WME.new(:light_bathroom, :last_user, :poweruser) ]
 
-    puts "\n<- GOD"
+    engine << [:god, :want_action_for, :light_bathroom]
+    engine << [:god, :light_bathroom, :let_there_be_light]
+    expect( engine.select(:light_bathroom, :value, :_) ).to be == [ Wongi::Engine::WME.new(:light_bathroom, :value, :let_there_be_light) ]
+    expect( engine.select(:light_bathroom, :last_user, :_) ).to be == [ Wongi::Engine::WME.new(:light_bathroom, :last_user, :god) ]
+
+  end
+
+  it 'should clean up correctly with a different activation order' do
+
+    engine.rule :rule1 do
+      forall {
+        has :light_kitchen, :value, :on
+      }
+      make {
+        #trace values: true, generation: true
+        gen self.name, :light_bathroom, :on
+        gen self.name, :want_action_for, :light_bathroom
+      }
+    end
+
+    prod = engine.rule "action" do
+      forall {
+        has :Requestor, :want_action_for, :Actor
+        has :Requestor, :Actor, :Value
+        has :Requestor, :priority, :Priority
+        ncc {
+          has :OtherRequestor, :want_action_for, :Actor
+          diff :OtherRequestor, :Requestor
+          has :OtherRequestor, :priority, :OtherPriority
+          greater :OtherPriority, :Priority
+        }
+      }
+      make {
+        #trace values: true, generation: true
+        gen :Actor, :value, :Value
+        gen :Actor, :last_user, :Requestor
+      }
+    end
+
+    engine << [:user, :priority, 2]
+    engine << [:rule1, :priority, 1]
+    engine << [:poweruser, :priority, 3]
+    engine << [:god, :priority, 4]
+
+    engine << [:user, :want_action_for, :light_bathroom]
+    engine << [:user, :light_bathroom, :off]
+    expect( engine.select(:light_bathroom, :value, :_) ).to be == [ Wongi::Engine::WME.new(:light_bathroom, :value, :off) ]
+    expect( engine.select(:light_bathroom, :last_user, :_) ).to be == [ Wongi::Engine::WME.new(:light_bathroom, :last_user, :user) ]
+
+    engine << [:light_kitchen, :value, :on]
+    expect( engine.select(:light_bathroom, :value, :_) ).to be == [ Wongi::Engine::WME.new(:light_bathroom, :value, :off) ]
+    expect( engine.select(:light_bathroom, :last_user, :_) ).to be == [ Wongi::Engine::WME.new(:light_bathroom, :last_user, :user) ]
+
+    engine << [:poweruser, :want_action_for, :light_bathroom]
+    engine << [:poweruser, :light_bathroom, :super_on]
+    expect( engine.select(:light_bathroom, :value, :_) ).to be == [ Wongi::Engine::WME.new(:light_bathroom, :value, :super_on) ]
+    expect( engine.select(:light_bathroom, :last_user, :_) ).to be == [ Wongi::Engine::WME.new(:light_bathroom, :last_user, :poweruser) ]
+
     engine << [:god, :want_action_for, :light_bathroom]
     engine << [:god, :light_bathroom, :let_there_be_light]
     expect( engine.select(:light_bathroom, :value, :_) ).to be == [ Wongi::Engine::WME.new(:light_bathroom, :value, :let_there_be_light) ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wongi-engine
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Valeri Sokolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies: []
 description: A rule engine.
 email: