wongi-engine 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af6f8430d35f36788bb67f833fe4770977a58d74
-  data.tar.gz: 422a1b976bc9305efbabbc6c2b6fd948c365e525
+  metadata.gz: ba0f7c9c09df2f3f379bc1983b32807770014d54
+  data.tar.gz: 12b8b964c0b03c205ac0e44cdcfe8f10f14c7f34
 SHA512:
-  metadata.gz: f3e5c7893e0da05c41dca1de9c670d45ca164cfc8588477e9af76a26e21e264f30e9e28918f2fa633af2cf4a7d114898c191f04ecad7067bc385b74fd4077740
-  data.tar.gz: a3cf8390e7c706612e1862c4b73633dac0d11f78f469929ad09d0d89c9d39a200f2ff2f1644e3ad325d05ad99d7a7a0aaf5d7904790dff07800e4f43992c2390
+  metadata.gz: 3e5ea34e087ef89954e1f5543d394883c2c2173c02d4764e816d97c9b764b6f73eed2b247f08033edab3127f752e7417686d0b61853250c533145274304126f7
+  data.tar.gz: 59c4f2e6af5b95a8d607f5c0bee99885fff6d302fef96f3d45320bada13ae2f5548788196b82cc83f6e3ada93a02c0c966eceaeaf29d8f75f1561c2f3459422e

data/lib/wongi-engine/alpha_memory.rb

@@ -13,11 +13,12 @@ module Wongi::Engine
     end
 
     def activate wme
+      @wmes << wme
+      wme.alphas << self
+      # TODO: it used to activate before adding to the list. mandated by the original thesis. investigate. it appears to create duplicate tokens - needs a remedy in collecting nodes
       betas.each do |beta|
         beta.alpha_activate wme
       end
-      @wmes << wme
-      wme.alphas << self
     end
 
     def remove wme
@@ -43,9 +44,12 @@ module Wongi::Engine
 
     def wmes
       Enumerator.new do |y|
-        @wmes.dup.each do |wme|
+        copy = @wmes.dup
+        @wmes.reject! &:deleted?
+        copy.each do |wme|
           y << wme unless wme.deleted?
         end
+        @wmes.reject! &:deleted?
       end
     end
 

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

@@ -1,7 +1,6 @@
 module Wongi::Engine
 
   class BetaMemory < BetaNode
-    attr_reader :tokens
 
     def initialize parent
       super
@@ -29,10 +28,17 @@ module Wongi::Engine
     end
 
     def beta_activate token, wme, assignments
-      # puts "MEMORY #{@id} left-activated with #{wme}"
+      dp "MEMORY beta-activated with #{wme} #{wme.object_id}"
       t = Token.new( token, wme, assignments)
       t.node = self
-      @tokens << t
+      existing = @tokens.find { |et| et.duplicate? t }
+      if existing
+        t = existing
+      else
+        dp "generated token #{t}"
+        t.node = self
+        @tokens << t
+      end
       self.children.each do |child|
         if child.kind_of? BetaMemory
           child.beta_activate t, nil, {}
@@ -54,7 +60,7 @@ module Wongi::Engine
     end
 
     def delete_token token
-      tokens.delete token
+      @tokens.delete token
     end
 
     # => TODO: investigate if we really need this

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

@@ -38,6 +38,7 @@ module Wongi::Engine
       beta = children.find { |node| BetaMemory === node }
       if beta.nil?
         beta = BetaMemory.new self
+        beta.debug = debug?
         beta.refresh
       end
       beta
@@ -121,6 +122,19 @@ module Wongi::Engine
       # => noop
     end
 
+    def tokens
+      Enumerator.new do |y|
+        @tokens.dup.each do |token|
+          y << token unless token.deleted?
+        end
+        @tokens.reject! &:deleted?
+      end
+    end
+
+    def empty?
+      @tokens.empty?
+    end
+
     private
 
     def propagate_activation token, wme, assignments
@@ -129,6 +143,16 @@ module Wongi::Engine
       end
     end
 
+    def dp message
+      if debug?
+        puts "#{indent}#{message}"
+      end
+    end
+
+    def indent
+      '  ' * depth
+    end
+
   end
 
 end

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

@@ -57,25 +57,27 @@ module Wongi
       end
 
       def alpha_activate wme
-        ws = '  ' * depth
-        # puts "#{ws}JOIN #{@id} right-activated with #{wme}"
+        dp "JOIN alpha-activated with #{wme}"
         collected = collect_assignments( wme )
-        # puts "PARENT HAS #{parent.tokens.length} TOKENS"
         self.parent.tokens.each do |token|
-          # puts "#{ws}matching with token"
+          dp "-MATCHING #{token}"
           if matches?( token, wme ) && passes_filters?( token, wme, collected )
-            # puts "#{ws}JOIN RIGHT-MATCHED, PROPAGATING"
+            dp "-JOIN MATCHED, PROPAGATING"
             propagate_activation token, wme, collected
           end
         end
       end
 
       def beta_activate token
-        ws = '  ' * depth
+        dp "JOIN beta-activated"
         self.alpha.wmes.each do |wme|
+          dp "-TESTING WME #{wme}"
           collected = collect_assignments( wme )
           if matches?( token, wme ) && passes_filters?( token, wme, collected )
+            dp "-WME MATCHED, PROPAGATING"
             propagate_activation token, wme, collected
+          else
+            dp "-NO MATCH"
           end
         end
       end
@@ -98,7 +100,11 @@ module Wongi
 
             contains = parameters.include? member
             if earlier.any? do |ec|
-                ! ec.kind_of?( NegTemplate ) and ec.contains?( member )
+                if ec.kind_of?( VariantSet )
+                  ec.introduces_variable?( member )
+                else
+                  ! ec.kind_of?( NegTemplate ) and ec.contains?( member )
+                end
               end
               contains = true
             end

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

@@ -55,7 +55,7 @@ module Wongi
       def delete_token token
         tokens.delete token
         token.ncc_results.each do |nccr|
-          nccr.wme.tokens.delete nccr
+          nccr.wme.tokens.delete( nccr ) if nccr.wme
           nccr.parent.children.delete nccr
         end
         token.ncc_results.clear

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

@@ -24,9 +24,16 @@ module Wongi
       end
 
       def beta_activate token, newwme, assignments
-        t = Token.new token, newwme, assignments
+        t = Token.new( token, newwme, assignments)
         t.node = self
-        self.tokens << t
+        existing = @tokens.find { |et| et.duplicate? t }
+        if existing
+          t = existing
+        else
+          dp "generated token #{t}"
+          t.node = self
+          @tokens << t
+        end
         @alpha.wmes.each do |wme|
           if matches?( t, wme )
             make_join_result(t, wme)

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

@@ -37,6 +37,16 @@ module Wongi
         context
       end
 
+      def introduces_variable? var
+        children.any? { |c|
+          if c.kind_of?( VariantSet )
+            c.introduces_variable?( var )
+          else
+            ! c.kind_of?( NegTemplate ) and c.contains?( var )
+          end
+        }
+      end
+
     end
 
     class OrNode < BetaMemory

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

@@ -13,7 +13,7 @@ module Wongi
 
       def beta_activate token, wme, assignments
         super
-        generated = tokens.last
+        generated = @tokens.last
         @actions.each do |action|
           # @tokens.each do |t|
           #  action.execute t

data/lib/wongi-engine/template.rb

@@ -14,6 +14,7 @@ module Wongi::Engine
     def initialize s, p, o, options = { }
       time = options[:time] || 0
       unsafe = options[:unsafe] || false
+      debug! if options[:debug]
       raise "Cannot work with continuous time" unless time.integer?
       raise "Cannot look into the future" if time > 0
       super( s, p, o, time )
@@ -22,7 +23,7 @@ module Wongi::Engine
     end
 
     def import_into r
-      copy = self.class.new r.import( subject ), r.import( predicate ), r.import( object ), time: time, unsafe: unsafe
+      copy = self.class.new r.import( subject ), r.import( predicate ), r.import( object ), time: time, unsafe: unsafe, debug: debug?
       @filters.each { |f| copy.filters << f }
       copy
     end
@@ -72,6 +73,7 @@ module Wongi::Engine
       tests, assignment = *JoinNode.compile( self, context.earlier, context.parameters )
       alpha = context.rete.compile_alpha( self )
       context.node = context.node.beta_memory.join_node( alpha, tests, assignment, @filters, context.alpha_deaf )
+      context.node.debug = debug?
       context.earlier << self
       context
     end

data/lib/wongi-engine/token.rb

@@ -47,8 +47,12 @@ module Wongi::Engine
       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 [ "
+      str = "TOKEN [ parent=#{parent ? parent.object_id : 'nil'} "
       all_assignments.each_pair { |key, value| str << "#{key} => #{value} " }
       str << "]"
       str

data/lib/wongi-engine/version.rb

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

data/lib/wongi-engine/wme.rb

@@ -59,7 +59,7 @@ module Wongi::Engine
     end
 
     def destroy
-
+      return if deleted?
       @deleted = true
       alphas.each { |alpha| alpha.remove self }.clear
       while tokens.first

data/spec/dataset_spec.rb

@@ -15,7 +15,7 @@ describe Wongi::Engine::Network do
     production = ds.productions['test-rule']
     production.should_not be_nil
 
-    production.tokens.should be_empty
+    production.should be_empty
 
     ds << [1, 2, 3]
 

data/spec/rule_specs/negative_rule_spec.rb

@@ -31,35 +31,39 @@ describe "negative rule" do
 
   end
 
-  it "should not create infinite feedback loops by default" do
+  # it "should not create infinite feedback loops by default" do
 
-    engine << rule('feedback') {
-      forall {
-        neg :a, :b, :_
-      }
-      make {
-        gen :a, :b, :c
-      }
-    }
+  #   engine << rule('feedback') {
+  #     forall {
+  #       neg :a, :b, :_
+  #     }
+  #     make {
+  #       gen :a, :b, :c
+  #     }
+  #   }
 
-    engine.should have(1).facts
+  #   engine.should have(1).facts
 
-  end
+  # end
 
   it "should create infinite feedback loops with unsafe option" do
 
+    counter = 0
+    exception = Class.new( StandardError )
+
     proc = lambda {
       engine << rule('feedback') {
         forall {
           neg :a, :b, :_, unsafe: true
         }
         make {
+          action { counter += 1 ; if counter > 5 then raise exception.new end }
           gen :a, :b, :c
         }
       }
     }
 
-    proc.should raise_error( SystemStackError )
+    proc.should raise_error( exception )
 
   end
 

data/wongi-engine.gemspec

@@ -15,5 +15,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Wongi::Engine::VERSION
 
-  #gem.add_dependency "wongi-rdf"
+  gem.add_development_dependency 'rspec', '~> 2.14.1', '< 3.0.0'
 end

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: wongi-engine
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Valeri Sokolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
-dependencies: []
+date: 2014-05-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: A rule engine.
 email:
 - ulfurinn@ulfurinn.net
@@ -19,7 +39,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".ruby-gemset"
-- ".ruby-version"
 - Gemfile
 - LICENSE
 - README.md
@@ -115,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0.rc.1
 signing_key: 
 specification_version: 4
 summary: A rule engine.

data/.ruby-version

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