wongi-engine 0.0.5 → 0.0.6

data/README.md

@@ -411,6 +411,14 @@ The Rete implementation in this library largely follows the outline presented in
 
 ## Changelog
 
+### 0.0.6
+
+* fixed a bug caused by retracting facts from within a rule action (#4)
+
+### 0.0.5
+
+* fixed a bug with multiple `assert` tests following the same node (#2)
+
 ### 0.0.4
 
 * reintegrated RDF support

data/lib/wongi-engine/alpha_memory.rb

@@ -2,7 +2,7 @@ module Wongi::Engine
 
   class AlphaMemory
 
-    attr_reader :betas, :template, :rete, :wmes
+    attr_reader :betas, :template, :rete
 
     def initialize template, rete = nil
       @template = template
@@ -34,13 +34,21 @@ module Wongi::Engine
     end
 
     def inspect
-      "<Alpha #{__id__} template=#{template} wmes=#{wmes}>"
+      "<Alpha #{__id__} template=#{template} wmes=#{@wmes}>"
     end
 
     def to_s
       inspect
     end
 
+    def wmes
+      Enumerator.new do |y|
+        @wmes.dup.each do |wme|
+          y << wme unless wme.deleted?
+        end
+      end
+    end
+
   end
 
 end

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

@@ -72,7 +72,7 @@ module Wongi
 
       def beta_activate token
         ws = '  ' * depth
-        self.alpha.wmes.uniq.each do |wme|
+        self.alpha.wmes.each do |wme|
           collected = collect_assignments( wme )
           if matches?( token, wme ) && passes_filters?( token, wme, collected )
             propagate_activation token, wme, collected

data/lib/wongi-engine/network.rb

@@ -393,14 +393,13 @@ module Wongi::Engine
     end
 
     def best_alpha template
-      raise
       candidates = alpha_hash.values.select do |alpha|
         template =~ alpha.template
       end
       result = candidates.inject do |best, alpha|
         if best.nil?
           alpha
-        elsif alpha.wmes.length < best.wmes.length
+        elsif alpha.wmes.to_a.length < best.wmes.to_a.length
           alpha
         else
           best

data/lib/wongi-engine/version.rb

@@ -1,5 +1,5 @@
 module Wongi
   module Engine
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/lib/wongi-engine/wme.rb

@@ -9,6 +9,7 @@ module Wongi::Engine
 
     def initialize s, p, o, r = nil
 
+      @deleted = false
       @alphas = []
       @tokens = []
       @generating_tokens = []
@@ -53,8 +54,13 @@ module Wongi::Engine
       !manual?
     end
 
+    def deleted?
+      @deleted
+    end
+
     def destroy
 
+      @deleted = true
       alphas.each { |alpha| alpha.remove self }.clear
       while tokens.first
         tokens.first.delete    # => will remove itself from the array

data/spec/bug_specs/issue_4_spec.rb

@@ -0,0 +1,94 @@
+require 'spec_helper'
+
+describe "issue 4" do
+
+  it "should correctly retract pre-added items from within a rule" do
+
+    engine = Wongi::Engine.create
+
+    10.times{ |i| engine << [i, :is_number, true] }
+
+    engine.rule 'segregate' do
+      forall {
+        has :Number, :is_number, true
+      }
+      make {
+        action { |token|
+          number = token[:Number]
+          engine << [number, :is_even, true]
+          engine.retract [number, :is_number, true]
+        }
+      }
+    end
+
+    numbers = engine.select :_, :is_number, true
+    evens = engine.select :_, :is_even, true
+
+    numbers.should be_empty
+    evens.should have(10).items
+
+  end
+
+  it "should correctly retract post-added items from within a rule" do
+
+    engine = Wongi::Engine.create
+
+    engine.rule 'segregate' do
+      forall {
+        has :Number, :is_number, true
+      }
+      make {
+        action { |token|
+          number = token[:Number]
+          engine << [number, :is_even, true]
+          engine.retract [number, :is_number, true]
+        }
+      }
+    end
+
+    10.times{ |i| engine << [i, :is_number, true] }
+
+    numbers = engine.select :_, :is_number, true
+    evens = engine.select :_, :is_even, true
+
+    numbers.should be_empty
+    evens.should have(10).items
+
+  end
+
+  it "should correctly retract later items from within a rule" do
+
+    engine = Wongi::Engine.create
+
+    10.times{ |i| engine << [i, :is_number, true] }
+
+    engine.rule 'segregate' do
+      forall {
+        has :Number, :is_number, true
+      }
+      make {
+        action { |token|
+          number = token[:Number]
+          if number % 2 == 0
+            engine << [number, :is_even, true]
+            engine.retract [number, :is_number, true]
+            engine.retract [number + 1, :is_number, true]
+          else
+            # this should never be reached
+            engine << [number, :is_odd, true]
+          end
+        }
+      }
+    end
+
+    numbers = engine.select :_, :is_number, true
+    evens = engine.select :_, :is_even, true
+    odds = engine.select :_, :is_odd, true
+
+    numbers.should be_empty
+    evens.should have(5).items
+    odds.should be_empty
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wongi-engine
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies: []
 description: A rule engine.
 email:
@@ -76,6 +76,7 @@ files:
 - lib/wongi-engine/version.rb
 - lib/wongi-engine/wme.rb
 - lib/wongi-engine/wme_match_data.rb
+- spec/bug_specs/issue_4_spec.rb
 - spec/dataset_spec.rb
 - spec/dsl_spec.rb
 - spec/filter_specs/assert_test_spec.rb
@@ -114,6 +115,7 @@ signing_key:
 specification_version: 3
 summary: A rule engine.
 test_files:
+- spec/bug_specs/issue_4_spec.rb
 - spec/dataset_spec.rb
 - spec/dsl_spec.rb
 - spec/filter_specs/assert_test_spec.rb