wongi-engine 0.0.14 → 0.0.16

data/lib/wongi-engine/token.rb

@@ -1,133 +1,138 @@
-module Wongi::Engine
-
-  class Token
-
-    include CoreExt
-
-    attr_reader :parent, :wme, :children
-    attr_accessor :node, :owner
-    attr_reader :neg_join_results
-    attr_reader :opt_join_results
-    attr_reader :ncc_results
-    attr_reader :generated_wmes
-    attr_predicate :has_optional
-
-    def initialize token, wme, assignments
-      @parent, @wme, @assignments = token, wme, assignments
-      @children = []
-      @deleted = false
-      @neg_join_results = []
-      @opt_join_results = []
-      @ncc_results = []
-      @generated_wmes = []
-      token.children << self if token
-      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
-        @assignments[ variable ] = value
-      end
-    end
-
-    def assignments
-      @cached_assignments ||= all_assignments
-    end
-
-    def [] var
-      assignments[ var ]
-    end
-
-    def duplicate? other
-      other.node.equal?(self.node) && other.parent.equal?(self.parent) && other.wme.equal?(self.wme) && other.assignments == self.assignments
-    end
-
-    def to_s
-      str = "TOKEN [ parent=#{parent ? parent.object_id : 'nil'} "
-      all_assignments.each_pair { |key, value| str << "#{key} => #{value} " }
-      str << "]"
-      str
-    end
-
-    def wmes
-      if parent
-        parent.wmes + (wme ? [wme] : [])
-      else
-        wme ? [wme] : []
-      end
-    end
-
-    def delete
-      delete_children
-      #@node.tokens.delete self unless @node.kind_of?( NccPartner )
-      @wme.tokens.delete self if @wme
-      @parent.children.delete self if @parent
-
-      retract_generated
-      @deleted = true
-      @node.delete_token self
-    end
-
-    def deleted?
-      @deleted
-    end
-
-    def delete_children
-      while @children.first
-        @children.first.delete
-      end
-    end
-
-    def generated? wme
-      return true if generated_wmes.any? { |w| w == wme }
-      return children.any? { |t| t.generated? wme }
-    end
-
-    protected
-
-    def retract_generated
-
-      @generated_wmes.each do |wme|
-        unless wme.manual?  # => TODO: does this ever fail at all?
-          wme.generating_tokens.delete self
-          if wme.generating_tokens.empty?
-            wme.rete.retract wme, true
-          end
-        end
-      end
-      @generated_wmes = []
-
-    end
-
-    def all_assignments
-      raise "Assignments is not a hash" unless @assignments.kind_of?( Hash )
-      if @parent
-        @parent.assignments.merge @assignments
-      else
-        @assignments
-      end
-    end
-
-  end
-
-  class FakeToken < Token
-    def initialize token, wme, assignments
-      @parent, @wme, @assignments = token, wme, assignments
-      @children = []
-      @neg_join_results = []
-      @opt_join_results = []
-      @ncc_results = []
-      @generated_wmes = []
-    end
-  end
-
-end
+module Wongi::Engine
+
+  class Token
+
+    include CoreExt
+
+    attr_reader :wme, :children
+    attr_accessor :node, :owner, :parent
+    attr_reader :neg_join_results
+    attr_reader :opt_join_results
+    attr_reader :ncc_results
+    attr_reader :generated_wmes
+    attr_predicate :has_optional
+
+    def initialize token, wme, assignments
+      @parent, @wme, @assignments = token, wme, assignments
+      @children = []
+      @deleted = false
+      @neg_join_results = []
+      @opt_join_results = []
+      @ncc_results = []
+      @generated_wmes = []
+      token.children << self if token
+      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
+        @assignments[ variable ] = value
+      end
+    end
+
+    def assignments
+      @cached_assignments ||= all_assignments
+    end
+
+    def [] var
+      assignments[ var ]
+    end
+
+    def duplicate? node, parent, wme, assignments
+      self.node.equal?(node) && self.parent.equal?(parent) && self.wme.equal?(wme) && self.assignments == assignments
+    end
+
+    def to_s
+      str = "TOKEN [ parent=#{parent ? parent.object_id : 'nil'} "
+      all_assignments.each_pair { |key, value| str << "#{key} => #{value} " }
+      str << "]"
+      str
+    end
+
+    def wmes
+      if parent
+        parent.wmes + (wme ? [wme] : [])
+      else
+        wme ? [wme] : []
+      end
+    end
+
+    def delete
+      delete_children
+      #@node.tokens.delete self unless @node.kind_of?( NccPartner )
+      @wme.tokens.delete self if @wme
+      @parent.children.delete self if @parent
+
+      retract_generated
+      @deleted = true
+      @node.delete_token self
+    end
+
+    def deleted?
+      @deleted
+    end
+
+    def delete_children
+      children = @children
+      @children = []
+      children.each do |token|
+        token.parent = nil
+        token.delete
+      end
+    end
+
+    def generated? wme
+      return true if generated_wmes.any? { |w| w == wme }
+      return children.any? { |t| t.generated? wme }
+    end
+
+    protected
+
+    def retract_generated
+      for_retraction = []
+
+      @generated_wmes.dup.each do |wme|
+        unless wme.manual?  # => TODO: does this ever fail at all?
+          wme.generating_tokens.delete self
+          if wme.generating_tokens.empty?
+            for_retraction << wme
+          end
+        end
+      end
+      @generated_wmes = []
+      for_retraction.each { |wme| wme.rete.retract wme, true }
+
+    end
+
+    def all_assignments
+      raise "Assignments is not a hash" unless @assignments.kind_of?( Hash )
+      if @parent
+        @parent.assignments.merge @assignments
+      else
+        @assignments
+      end
+    end
+
+  end
+
+  class FakeToken < Token
+    def initialize token, wme, assignments
+      @parent, @wme, @assignments = token, wme, assignments
+      @children = []
+      @neg_join_results = []
+      @opt_join_results = []
+      @ncc_results = []
+      @generated_wmes = []
+    end
+  end
+
+end

data/lib/wongi-engine/version.rb

@@ -1,5 +1,5 @@
 module Wongi
   module Engine
-    VERSION = "0.0.14"
+    VERSION = "0.0.16"
   end
 end

data/lib/wongi-engine/wme.rb

@@ -1,140 +1,138 @@
-module Wongi::Engine
-
-  class WME < Struct.new( :subject, :predicate, :object )
-
-    attr_reader :rete
-
-    attr_reader :alphas, :tokens, :generating_tokens
-    attr_reader :neg_join_results, :opt_join_results
-
-    def initialize s, p, o, r = nil
-
-      @deleted = false
-      @alphas = []
-      @tokens = []
-      @generating_tokens = []
-      @neg_join_results = []
-      @opt_join_results = []
-
-      @rete = r
-
-      if r
-        super( r.import(s), r.import(p), r.import(o) )
-      else
-        super( s, p, o )
-      end
-
-    end
-
-    def import_into r
-      self.class.new subject, predicate, object, r
-    end
-
-    def dup
-      self.class.new subject, predicate, object, rete
-    end
-
-    def == other
-      subject == other.subject && predicate == other.predicate && object == other.object
-    end
-
-    def =~ template
-      raise "Cannot match a WME against a #{template.class}" unless Template === template
-      result = match_member( template, :subject ) & match_member( template, :predicate ) & match_member( template, :object )
-      if result.match?
-        result
-      end
-    end
-
-    def manual?
-      generating_tokens.empty?
-    end
-
-    def generated?
-      !manual?
-    end
-
-    def deleted?
-      @deleted
-    end
-
-    def destroy
-      return if deleted?
-      @deleted = true
-      alphas.each { |alpha| alpha.remove self }.clear
-      while tokens.first
-        tokens.first.delete    # => will remove itself from the array
-      end
-
-      destroy_neg_join_results
-      destroy_opt_join_results
-
-    end
-
-    def inspect
-      "<WME #{subject.inspect} #{predicate.inspect} #{object.inspect}>"
-    end
-
-    def to_s
-      inspect
-    end
-
-    def hash
-      @hash ||= array_form.map( &:hash ).hash
-    end
-
-    protected
-
-    def array_form
-      @array_form ||= [ subject, predicate, object ]
-    end
-
-    def destroy_neg_join_results
-      neg_join_results.each do |njr|
-
-        token = njr.owner
-        results = token.neg_join_results
-        results.delete njr
-
-        if results.empty? #&& !rete.in_snapshot?
-          token.node.children.each { |beta|
-            beta.beta_activate token, nil, { }
-          }
-        end
-
-      end.clear
-    end
-
-    def destroy_opt_join_results
-      opt_join_results.each do |ojr|
-
-        token = ojr.owner
-        results = token.opt_join_results
-        results.delete ojr
-
-        if results.empty?
-          token.delete_children
-          token.node.children.each { |beta|
-            beta.beta_activate token
-          }
-        end
-
-      end.clear
-    end
-
-    def match_member template, member
-      result = WMEMatchData.new
-      mine = self.send member
-      theirs = template.send member
-      if theirs == :_ || mine == theirs
-        result.match!
-      elsif Template.variable? theirs
-        result.match!
-        result[theirs] = mine
-      end
-      result
-    end
-
-  end
-
-end
+module Wongi::Engine
+
+  class WME < Struct.new( :subject, :predicate, :object )
+
+    attr_reader :rete
+
+    attr_reader :alphas, :tokens, :generating_tokens
+    attr_reader :neg_join_results, :opt_join_results
+
+    def initialize s, p, o, r = nil
+
+      @deleted = false
+      @alphas = []
+      @tokens = []
+      @generating_tokens = []
+      @neg_join_results = []
+      @opt_join_results = []
+
+      @rete = r
+
+      if r
+        super( r.import(s), r.import(p), r.import(o) )
+      else
+        super( s, p, o )
+      end
+
+    end
+
+    def import_into r
+      self.class.new subject, predicate, object, r
+    end
+
+    def dup
+      self.class.new subject, predicate, object, rete
+    end
+
+    def == other
+      subject == other.subject && predicate == other.predicate && object == other.object
+    end
+
+    def =~ template
+      raise "Cannot match a WME against a #{template.class}" unless Template === template
+      result = match_member( self.subject, template.subject ) & match_member( self.predicate, template.predicate ) & match_member( self.object, template.object )
+      if result.match?
+        result
+      end
+    end
+
+    def manual?
+      generating_tokens.empty?
+    end
+
+    def generated?
+      !manual?
+    end
+
+    def deleted?
+      @deleted
+    end
+
+    def destroy
+      return if deleted?
+      @deleted = true
+      alphas.each { |alpha| alpha.remove self }.clear
+      while tokens.first
+        tokens.first.delete    # => will remove itself from the array
+      end
+
+      destroy_neg_join_results
+      destroy_opt_join_results
+
+    end
+
+    def inspect
+      "<WME #{subject.inspect} #{predicate.inspect} #{object.inspect}>"
+    end
+
+    def to_s
+      inspect
+    end
+
+    def hash
+      @hash ||= array_form.map( &:hash ).hash
+    end
+
+    protected
+
+    def array_form
+      @array_form ||= [ subject, predicate, object ]
+    end
+
+    def destroy_neg_join_results
+      neg_join_results.each do |njr|
+
+        token = njr.owner
+        results = token.neg_join_results
+        results.delete njr
+
+        if results.empty? #&& !rete.in_snapshot?
+          token.node.children.each { |beta|
+            beta.beta_activate token, nil, { }
+          }
+        end
+
+      end.clear
+    end
+
+    def destroy_opt_join_results
+      opt_join_results.each do |ojr|
+
+        token = ojr.owner
+        results = token.opt_join_results
+        results.delete ojr
+
+        if results.empty?
+          token.delete_children
+          token.node.children.each { |beta|
+            beta.beta_activate token
+          }
+        end
+
+      end.clear
+    end
+
+    def match_member mine, theirs
+      result = WMEMatchData.new
+      if theirs == :_ || mine == theirs
+        result.match!
+      elsif Template.variable? theirs
+        result.match!
+        result[theirs] = mine
+      end
+      result
+    end
+
+  end
+
+end

data/spec/bug_specs/issue_4_spec.rb

@@ -24,8 +24,8 @@ describe "issue 4" do
     numbers = engine.select :_, :is_number, true
     evens = engine.select :_, :is_even, true
 
-    numbers.should be_empty
-    evens.should have(10).items
+    expect(numbers).to be_empty
+    expect(evens.length).to eq(10)
 
   end
 
@@ -51,8 +51,8 @@ describe "issue 4" do
     numbers = engine.select :_, :is_number, true
     evens = engine.select :_, :is_even, true
 
-    numbers.should be_empty
-    evens.should have(10).items
+    expect(numbers).to be_empty
+    expect(evens.length).to eq(10)
 
   end
 
@@ -85,9 +85,9 @@ describe "issue 4" do
     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
+    expect(numbers).to be_empty
+    expect(evens.length).to eq(5)
+    expect(odds).to be_empty
 
   end
 
@@ -134,7 +134,7 @@ describe "issue 4" do
     odds = engine.select :_, :is_odd, true
 
     # numbers.should be_empty
-    evens.should have(5).items
-    odds.should have(5).items
+    expect(evens.length).to eq(5)
+    expect(odds.length).to eq(5)
   end
 end

data/spec/dataset_spec.rb

@@ -13,13 +13,13 @@ describe Wongi::Engine::Network do
     }
 
     production = ds.productions['test-rule']
-    production.should_not be_nil
+    expect(production).not_to be_nil
 
-    production.should be_empty
+    expect(production).to be_empty
 
     ds << [1, 2, 3]
 
-    production.should have(1).tokens
+    expect(production.size).to eq(1)
 
   end
 

data/spec/filter_specs/assert_test_spec.rb

@@ -28,7 +28,7 @@ describe "ASSERT test" do
       }
     }
 
-    production.should have(1).tokens
+    expect(production.size).to eq(1)
     
   end
 
@@ -42,7 +42,7 @@ describe "ASSERT test" do
       }
     }
 
-    production.should have(0).tokens
+    expect(production.size).to eq(0)
 
   end
 
@@ -59,8 +59,8 @@ describe "ASSERT test" do
 
     engine << ["resistance", "is", "futile"]
 
-    production.should have(1).tokens
-    production.tokens.first[:X].should == "resistance"
+    expect(production.size).to eq(1)
+    expect(production.tokens.first[:X]).to eq("resistance")
 
   end
 
@@ -77,8 +77,8 @@ describe "ASSERT test" do
 
     engine << ["resistance", "is", "futile"]
 
-    production.should have(1).tokens
-    production.tokens.first[:X].should == "resistance"
+    expect(production.size).to eq(1)
+    expect(production.tokens.first[:X]).to eq("resistance")
 
   end
 

data/spec/filter_specs/less_test_spec.rb

@@ -34,8 +34,8 @@ describe "LESS test" do
     }
 
     engine << ["A", "B", "C"]
-    expect( production ).to have(0).tokens
 
+    expect(@production.size).to eq(0)
   end
 
 end