wongi-engine 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9121794caa930fa1efd4e9cd0e099bab35f73b2d
-  data.tar.gz: e6c628f83a408993367941977f1b6452db903b76
+  metadata.gz: 4ae5e5e3f2683835f9cc181b8c5edcf06245a61e
+  data.tar.gz: c6fe8127c68c416904044459132476b06fef46f3
 SHA512:
-  metadata.gz: e6a18165e16edfdb48b7d74d7e90f82ce58a571d351ed95ee2983cf07767c1bbb02b9873b376f8759af9fd06f79c7498b20a307a943653e50d750ba6594e22cc
-  data.tar.gz: 22f63a10e4ab649182bbbd9311c3466fc4e7af3405c571f6f8c25997d415f1bd816ee3e381aaff1040894405e4ae66b175bbf19557801e3bc832f8c9680ce141
+  metadata.gz: 8fc1bc5e6e5e85ee8a4282e4a56be5f2bd2c59e3d1c0dc23e60a85b5b97fe3d552798778f4cae4211a01fea1a400e4a0bac629cb11b34a3c0c586a7f37b34e8d
+  data.tar.gz: 01ab14f7f0e0616b26afd687ba060938154f5408c87b1944ed9e888ebf646839a2536854d579219b9254d8c48946b548e98a52e77908058cdd94ad26229c3c62

data/.ruby-gemset

@@ -0,0 +1 @@
+wongi-engine

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0

data/README.md

@@ -448,6 +448,10 @@ The Rete implementation in this library largely follows the outline presented in
 
 ## Changelog
 
+### 0.0.11
+
+* fixed cleanup of invalidated NCC branches
+
 ### 0.0.10
 
 * fixed interaction of filters and optional nodes

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

@@ -16,9 +16,11 @@ module Wongi
       def beta_activate token
         t = Token.new token, nil, {}
         t.node = self
-        owner = ncc.tokens.find do |ncc_token|
-          ncc_token.parent.node == divergent
-        end
+        # owner = ncc.tokens.find do |ncc_token|
+        #   ncc_token.parent.node == divergent
+        # end
+        divergent_token = t.ancestors.find { |a| a.node == divergent }
+        owner = ncc.tokens.find { |o| o.parent == divergent_token }
         if owner
           owner.ncc_results << t
           t.owner = owner

data/lib/wongi-engine/token.rb

@@ -24,6 +24,14 @@ module Wongi::Engine
       wme.tokens << self if wme
     end
 
+    def ancestors
+      if parent
+        parent.ancestors.unshift parent
+      else
+        []
+      end
+    end
+
     def subst variable, value
       @cached_assignments = nil
       if @assignments.has_key? variable

data/lib/wongi-engine/version.rb

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

data/spec/rule_specs/ncc_spec.rb

@@ -60,5 +60,66 @@ describe "NCC rule" do
 
   end
 
+  it 'should clean up correctly' 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, 1]
+    engine << [:rule1, :priority, 2]
+    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
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wongi-engine
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Valeri Sokolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies: []
 description: A rule engine.
 email:
@@ -17,7 +17,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
+- .ruby-gemset
+- .ruby-version
 - Gemfile
 - LICENSE
 - README.md
@@ -103,12 +105,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []