wongi-engine 0.1.4 → 0.2.0

data/lib/wongi-engine/token.rb

@@ -7,6 +7,7 @@ module Wongi::Engine
     attr_reader :children
     attr_reader :wme
     attr_reader :node
+    attr_reader :overlay
     attr_accessor :owner, :parent
     attr_reader :neg_join_results
     attr_reader :opt_join_results
@@ -17,6 +18,7 @@ module Wongi::Engine
 
     def initialize node, token, wme, assignments
       @node, @parent, @wme, @assignments = node, token, wme, assignments
+      @overlay = wme ? wme.overlay.highest(token.overlay) : node.rete.default_overlay
       @children = []
       @deleted = false
       @neg_join_results = []
@@ -24,7 +26,6 @@ module Wongi::Engine
       @ncc_results = []
       @generated_wmes = []
       token.children << self if token
-      wme.tokens << self if wme
     end
 
     def ancestors
@@ -58,32 +59,16 @@ module Wongi::Engine
     end
 
     def to_s
-      str = "TOKEN [ parent=#{parent ? parent.object_id : 'nil'} "
+      str = "TOKEN [ #{object_id} parent=#{parent ? parent.object_id : 'nil'} "
       all_assignments.each_pair { |key, value| str << "#{key} => #{value} " }
       str << "]"
       str
     end
 
     def destroy
-      # 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!
-      # @node.delete_token self
     end
 
-    # def delete_children
-    #   children = @children
-    #   @children = []
-    #   children.each do |token|
-    #     token.parent = nil
-    #     token.destroy
-    #   end
-    # end
-
     # for neg feedback loop protection
     def generated? wme
       return true if generated_wmes.any? { |w| w == wme }
@@ -92,22 +77,6 @@ module Wongi::Engine
 
     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

data/lib/wongi-engine/version.rb

@@ -1,5 +1,5 @@
 module Wongi
   module Engine
-    VERSION = "0.1.4"
+    VERSION = "0.2.0"
   end
 end

data/lib/wongi-engine/wme.rb

@@ -1,13 +1,14 @@
 module Wongi::Engine
 
-  class WME < Struct.new( :subject, :predicate, :object )
+  WME = Struct.new( :subject, :predicate, :object ) do
 
     include CoreExt
 
     attr_reader :rete
 
-    attr_reader :alphas, :tokens, :generating_tokens
+    attr_reader :generating_tokens
     attr_reader :neg_join_results, :opt_join_results
+    attr_accessor :overlay
     attr_predicate :deleted
     attr_predicate :manual
 
@@ -17,29 +18,27 @@ module Wongi::Engine
 
       @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
+    # TODO: reintroduce Network#import when bringing back RDF support
+      super( s, p, o )
 
     end
 
     def import_into r
       self.class.new( subject, predicate, object, r ).tap do |wme|
+        wme.overlay = overlay
         wme.manual = self.manual?
       end
     end
 
     def dup
       self.class.new( subject, predicate, object, rete ).tap do |wme|
+        wme.overlay = overlay
         wme.manual = self.manual?
       end
     end
@@ -49,7 +48,7 @@ module Wongi::Engine
     end
 
     def =~ template
-      raise "Cannot match a WME against a #{template.class}" unless Template === template
+      raise Wongi::Engine::Error, "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
@@ -60,19 +59,6 @@ module Wongi::Engine
       !generating_tokens.empty?
     end
 
-    # def destroy
-    #   return if deleted?
-    #   @deleted = true
-    #   alphas.each { |alpha| alpha.remove self }.clear
-    #   tokens = @tokens
-    #   @tokens = []
-    #   tokens.each &:destroy
-
-    #   destroy_neg_join_results
-    #   destroy_opt_join_results
-
-    # end
-
     def inspect
       "{#{subject.inspect} #{predicate.inspect} #{object.inspect}}"
     end
@@ -82,48 +68,11 @@ module Wongi::Engine
     end
 
     def hash
-      @hash ||= array_form.map( &:hash ).hash
+      @hash ||= [subject.hash, predicate.hash, object.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

data/lib/wongi-engine.rb

@@ -29,5 +29,8 @@ require 'wongi-engine/alpha_memory'
 require 'wongi-engine/beta'
 require 'wongi-engine/dsl'
 require 'wongi-engine/ruleset'
+require 'wongi-engine/compiler'
+require 'wongi-engine/data_overlay'
+require 'wongi-engine/enumerators'
 require 'wongi-engine/network'
 require 'wongi-engine/graph'

data/spec/beta_node_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 
 describe Wongi::Engine::BetaNode do
 
+  include Wongi::Engine::DSL
+
   let( :engine ) { Wongi::Engine.create }
 
   describe '#tokens' do

data/spec/generation_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Wongi::Engine::StatementGenerator do
+describe Wongi::Engine::DSL::Action::StatementGenerator do
 
   let( :engine ) { Wongi::Engine.create }
 

data/spec/high_level_spec.rb

@@ -1,10 +1,12 @@
 require 'spec_helper'
 
+include Wongi::Engine::DSL
+
 dsl {
 
   section :make
   clause :test_collector
-  action Wongi::Engine::SimpleCollector.collector
+  action Wongi::Engine::DSL::Action::SimpleCollector.collector
 
 }
 
@@ -220,20 +222,36 @@ describe 'the engine' do
 
   end
 
-  it 'should support prepared queries' do
+  context 'queries' do
 
-    rete << query("test-query") {
-      search_on :X
-      forall {
-        has :X, "is", :Y
+    before :each do
+      rete << query("test-query") {
+        search_on :X
+        forall {
+          has :X, "is", :Y
+        }
       }
-    }
+    end
 
-    rete << ["answer", "is", 42]
+    it 'should run' do
+      rete << ["answer", "is", 42]
+      rete.execute "test-query", {X: "answer"}
+      expect(rete.results["test-query"].size).to eq(1)
+      expect(rete.results["test-query"].tokens.first[:Y]).to eq(42)
+    end
+
+    it 'should run several times' do
+      rete << ["answer", "is", 42]
+      rete << ['question', 'is', '6x9']
+      rete.execute "test-query", {X: "answer"}
+      rete.execute "test-query", {X: "question"}
+      expect(rete.results["test-query"].tokens.to_a.last[:Y]).to eq('6x9')
+      expect(rete.results["test-query"].size).to eq(1)
+    end
+
+  end
 
-    rete.execute "test-query", {X: "answer"}
-    expect(rete.results["test-query"].size).to eq(1)
-    expect(rete.results["test-query"].tokens.first[:Y]).to eq(42)
+  it 'should correctly execute a query several times' do
 
   end
   

data/spec/overlay_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Wongi::Engine::DataOverlay do
+  include Wongi::Engine::DSL
+
+  let(:engine) { Wongi::Engine.create }
+
+  it 'should be disposable' do
+    production = engine << rule {
+      forall {
+        has 1, 2, :X
+      }
+    }
+    engine.with_overlay { |overlay|
+      overlay << [1,2,3]
+      expect(production).to have(1).token
+    }
+    expect(production).to have(0).tokens
+
+  end
+
+end

data/spec/simple_action_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Wongi::Engine::SimpleAction do
+describe Wongi::Engine::DSL::Action::SimpleAction do
 
   before :each do
     @rete = Wongi::Engine::Network.new

data/spec/spec_helper.rb

@@ -1,2 +1,3 @@
+require 'pry'
 require 'wongi-engine'
 require 'rspec/collection_matchers'

data/spec/wme_spec.rb

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 describe Wongi::Engine::WME do
 
-  def capitalizing_rete
-    rete = double 'rete'
-    expect( rete ).to receive(:import).with("b").and_return("B")
-    expect( rete ).to receive(:import).with("a").and_return("A")
-    expect( rete ).to receive(:import).with("c").and_return("C")
-    rete
-  end
+  # def capitalizing_rete
+  #   rete = double 'rete'
+  #   expect( rete ).to receive(:import).with("b").and_return("B")
+  #   expect( rete ).to receive(:import).with("a").and_return("A")
+  #   expect( rete ).to receive(:import).with("c").and_return("C")
+  #   rete
+  # end
 
   subject {
     Wongi::Engine::WME.new "a", "b", "c"
@@ -22,17 +22,17 @@ describe Wongi::Engine::WME do
       expect( subject.object ).to be == "c"
     end
 
-    it 'should use the rete to import members' do
+    # it 'should use the rete to import members' do
 
-      rete = capitalizing_rete
+    #   rete = capitalizing_rete
 
-      wme = Wongi::Engine::WME.new "a", "b", "c", rete
+    #   wme = Wongi::Engine::WME.new "a", "b", "c", rete
 
-      expect( wme.subject ).to be == "A"
-      expect( wme.predicate ).to be == "B"
-      expect( wme.object ).to be == "C"
+    #   expect( wme.subject ).to be == "A"
+    #   expect( wme.predicate ).to be == "B"
+    #   expect( wme.object ).to be == "C"
 
-    end
+    # end
 
 
   it {
@@ -45,17 +45,17 @@ describe Wongi::Engine::WME do
 
   end
 
-  it 'should be able to import into rete' do
+  # it 'should be able to import into rete' do
 
-    rete = capitalizing_rete
+  #   rete = capitalizing_rete
 
-    imported = subject.import_into rete
+  #   imported = subject.import_into rete
 
-    expect( imported.subject ).to be == "A"
-    expect( imported.predicate ).to be == "B"
-    expect( imported.object ).to be == "C"
+  #   expect( imported.subject ).to be == "A"
+  #   expect( imported.predicate ).to be == "B"
+  #   expect( imported.object ).to be == "C"
 
-  end
+  # end
 
   it 'should compare instances' do
 
@@ -69,7 +69,7 @@ describe Wongi::Engine::WME do
   end
 
   it 'should not match against non-templates' do
-    expect { subject =~ [1, 2, 3] }.to raise_error
+    expect { subject =~ [1, 2, 3] }.to raise_error( Wongi::Engine::Error )
   end
 
   it 'should match against templates' do

data/wongi-engine.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |gem|
   gem.version       = Wongi::Engine::VERSION
 
   gem.add_development_dependency 'rake', '~> 10.0'
-  # gem.add_development_dependency 'pry', '~> 0.10'
+  gem.add_development_dependency 'pry', '~> 0.10'
   # gem.add_development_dependency 'pry-byebug', '~> 2.0'
   gem.add_development_dependency 'rspec', '~> 3.1'
   gem.add_development_dependency 'rspec-collection_matchers', '~> 1.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wongi-engine
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Valeri Sokolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-12 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -60,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".hgignore"
 - ".hgtags"
 - ".ruby-gemset"
 - ".travis.yml"
@@ -87,24 +102,28 @@ files:
 - lib/wongi-engine/beta/optional_node.rb
 - lib/wongi-engine/beta/or_node.rb
 - lib/wongi-engine/beta/production_node.rb
+- lib/wongi-engine/compiler.rb
 - lib/wongi-engine/core_ext.rb
+- lib/wongi-engine/data_overlay.rb
 - lib/wongi-engine/dsl.rb
-- lib/wongi-engine/dsl/action.rb
-- lib/wongi-engine/dsl/actions/error_generator.rb
-- lib/wongi-engine/dsl/actions/simple_action.rb
-- lib/wongi-engine/dsl/actions/simple_collector.rb
-- lib/wongi-engine/dsl/actions/statement_generator.rb
-- lib/wongi-engine/dsl/actions/trace_action.rb
+- lib/wongi-engine/dsl/action/base.rb
+- lib/wongi-engine/dsl/action/error_generator.rb
+- lib/wongi-engine/dsl/action/simple_action.rb
+- lib/wongi-engine/dsl/action/simple_collector.rb
+- lib/wongi-engine/dsl/action/statement_generator.rb
+- lib/wongi-engine/dsl/action/trace_action.rb
 - lib/wongi-engine/dsl/any_rule.rb
 - lib/wongi-engine/dsl/assuming.rb
-- lib/wongi-engine/dsl/dsl_builder.rb
-- lib/wongi-engine/dsl/dsl_extensions.rb
-- lib/wongi-engine/dsl/extension_clause.rb
-- lib/wongi-engine/dsl/generation_clause.rb
-- lib/wongi-engine/dsl/generic_production_rule.rb
-- lib/wongi-engine/dsl/ncc_production_rule.rb
-- lib/wongi-engine/dsl/production_rule.rb
+- lib/wongi-engine/dsl/builder.rb
+- lib/wongi-engine/dsl/clause/assign.rb
+- lib/wongi-engine/dsl/clause/fact.rb
+- lib/wongi-engine/dsl/clause/gen.rb
+- lib/wongi-engine/dsl/clause/generic.rb
+- lib/wongi-engine/dsl/generated.rb
+- lib/wongi-engine/dsl/ncc_subrule.rb
 - lib/wongi-engine/dsl/query.rb
+- lib/wongi-engine/dsl/rule.rb
+- lib/wongi-engine/enumerators.rb
 - lib/wongi-engine/error.rb
 - lib/wongi-engine/filter.rb
 - lib/wongi-engine/filter/asserting_test.rb
@@ -114,7 +133,6 @@ files:
 - lib/wongi-engine/filter/inequality_test.rb
 - lib/wongi-engine/filter/less_than_test.rb
 - lib/wongi-engine/graph.rb
-- lib/wongi-engine/model_context.rb
 - lib/wongi-engine/network.rb
 - lib/wongi-engine/network/collectable.rb
 - lib/wongi-engine/network/debug.rb
@@ -133,6 +151,7 @@ files:
 - spec/generation_spec.rb
 - spec/high_level_spec.rb
 - spec/network_spec.rb
+- spec/overlay_spec.rb
 - spec/rule_specs/any_rule_spec.rb
 - spec/rule_specs/assign_spec.rb
 - spec/rule_specs/assuming_spec.rb
@@ -164,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A forward-chaining rule engine in pure Ruby.
@@ -178,6 +197,7 @@ test_files:
 - spec/generation_spec.rb
 - spec/high_level_spec.rb
 - spec/network_spec.rb
+- spec/overlay_spec.rb
 - spec/rule_specs/any_rule_spec.rb
 - spec/rule_specs/assign_spec.rb
 - spec/rule_specs/assuming_spec.rb

data/lib/wongi-engine/dsl/action.rb

@@ -1,12 +0,0 @@
-module Wongi::Engine
-  class Action
-
-    include CoreExt
-
-    attr_accessor :production
-    attr_accessor :rule
-    attr_accessor :name
-    attr_accessor :rete
-
-  end
-end

data/lib/wongi-engine/dsl/actions/simple_action.rb

@@ -1,62 +0,0 @@
-module Wongi::Engine
-
-  class SimpleAction < Action
-
-    def initialize action = nil, *args, &block
-      @args = args
-      case action
-      when Class
-        @action = @deaction = @reaction = action.new *args, &block
-      when Hash
-        @action   = instance_or_proc action[:activate]
-        @deaction = instance_or_proc action[:deactivate]
-        @reaction = instance_or_proc action[:reactivate]
-      end
-      @action ||= block
-    end
-
-    def execute token
-      return unless @action
-      if @action.is_a?( Proc ) || @action.respond_to?( :to_proc )
-        rete.instance_exec token, &@action
-      elsif @action.respond_to? :call
-        @action.call token
-      elsif @action.respond_to? :execute
-        @action.execute token
-      end
-    end
-
-    def deexecute token
-      return unless @deaction
-      if @deaction.is_a?( Proc ) || @deaction.respond_to?( :to_proc )
-        rete.instance_exec token, &@deaction
-      elsif @deaction.respond_to? :call
-        @deaction.call token
-      elsif @deaction.respond_to? :deexecute
-        @deaction.execute token
-      end
-    end
-
-    def reexecute token, newtoken
-      return unless @reaction
-      if @reaction.is_a?( Proc ) || @reaction.respond_to?( :to_proc )
-        rete.instance_exec token, newtoken, &@reaction
-      elsif @reaction.respond_to? :call
-        @reaction.call token, newtoken
-      elsif @reaction.respond_to? :reexecute
-        @reaction.execute token, newtoken
-      end
-    end
-
-    def instance_or_proc thing
-      case thing
-      when Class
-        thing.new
-      when Proc
-        thing
-      end
-    end
-
-  end
-
-end

data/lib/wongi-engine/dsl/actions/simple_collector.rb

@@ -1,51 +0,0 @@
-module Wongi::Engine
-
-  class SimpleCollector < Action
-
-    def self.collector
-      Class.new self
-    end
-
-    def initialize variable, name = nil
-      @variable = variable
-      @name = name if name
-    #(class << self; self; end).instance_eval do
-        #        define_method method do
-        #          collect variable
-        #        end
-    #    alias_method method, :default_collect
-    #  end
-    end
-
-    def default_collect
-      collect @variable
-    end
-
-    def name= n
-      @name = n unless @name
-    end
-
-    def rete= rete
-      rete.add_collector self, name
-    end
-
-    def collect var
-      production.tokens.map { |token| token[var] }
-    end
-
-  end
-
-  class GenericCollectClause
-
-    def initialize name, variable
-
-    end
-
-    def import_into rete
-      collector = SimpleCollector.new @variable
-
-    end
-
-  end
-
-end