wongi-engine 0.3.5 → 0.3.7

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

@@ -1,29 +1,27 @@
 module Wongi
   module Engine
     class OrNode < BetaMemory
+      attr_reader :parents, :rete
 
-      attr_reader :parents
-      attr_reader :rete
-
-      def initialize parents
+      def initialize(parents)
         super nil
         @parents = parents
         parents.each do |parent|
           parent.children << self
         end
-        retes = parents.map( &:rete ).uniq
+        retes = parents.map(&:rete).uniq
         raise "Cannot combine variants from several Retes" if retes.size > 1
+
         @rete = retes.first
       end
 
       def ident
-        ids = parents.map( &:id ).join ", "
+        ids = parents.map(&:id).join ", "
         "<R> #{self.class} #{id}, parents #{ids}"
       end
 
-
       def depth
-        parents.map( &:depth ).max + 1
+        parents.map(&:depth).max + 1
       end
 
       def refresh
@@ -31,7 +29,6 @@ module Wongi
           parent.refresh_child self
         end
       end
-
     end
   end
 end

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

@@ -1,31 +1,28 @@
 module Wongi
   module Engine
-
     class ProductionNode < BetaMemory
+      attr_accessor :tracer, :compilation_context
 
-      attr_accessor :tracer
-      attr_accessor :compilation_context
-
-      def initialize parent, actions
+      def initialize(parent, actions)
         super(parent)
         @actions = actions.each { |action| action.production = self }
       end
 
-      def beta_activate token
+      def beta_activate(token)
         return unless super
+
         @actions.each do |action|
           action.execute token if action.respond_to? :execute
         end
       end
 
-      def beta_deactivate token
+      def beta_deactivate(token)
         return unless super
+
         @actions.each do |action|
           action.deexecute token if action.respond_to? :deexecute
         end
       end
-
     end
-
   end
 end

data/lib/wongi-engine/beta.rb

@@ -3,6 +3,7 @@ require 'wongi-engine/beta/beta_memory'
 require 'wongi-engine/beta/filter_node'
 require 'wongi-engine/beta/assignment_node'
 require 'wongi-engine/beta/join_node'
+require 'wongi-engine/beta/aggregate_node'
 require 'wongi-engine/beta/ncc_partner'
 require 'wongi-engine/beta/ncc_node'
 require 'wongi-engine/beta/neg_node'

data/lib/wongi-engine/compiler.rb

@@ -1,6 +1,5 @@
 module Wongi::Engine
   Compiler = Struct.new(:rete, :node, :conditions, :parameters, :alpha_deaf) do
-
     def compile
       conditions.inject(self) do |context, condition|
         condition.compile context
@@ -12,9 +11,7 @@ module Wongi::Engine
     end
 
     def declare(v)
-      unless declared_variables.include?(v)
-        declared_variables << v
-      end
+      declared_variables << v unless declared_variables.include?(v)
     end
 
     def declared_variables
@@ -31,32 +28,41 @@ module Wongi::Engine
 
     def beta_memory
       return if node.is_a?(BetaMemory)
-      self.node = if existing = node.children.find { |n| n.is_a?(BetaMemory) }
-        existing
-      else
-        BetaMemory.new(node).tap do |memory|
-          memory.refresh
-        end
-      end
+
+      self.node = if (existing = node.children.find { |n| n.is_a?(BetaMemory) })
+                    existing
+                  else
+                    BetaMemory.new(node).tap(&:refresh)
+                  end
+    end
+
+    def singleton_beta_memory
+      return if node.is_a?(SingletonBetaMemory)
+
+      self.node = if (existing = node.children.find { |n| n.is_a?(SingletonBetaMemory) })
+                    existing
+                  else
+                    SingletonBetaMemory.new(node).tap(&:refresh)
+                  end
     end
 
     def assignment_node(variable, body)
       beta_memory
-      self.node = AssignmentNode.new(self.node, variable, body).tap &:refresh
+      self.node = AssignmentNode.new(node, variable, body).tap(&:refresh)
       declare(variable)
     end
 
     def join_node(condition, tests, assignment)
       alpha = rete.compile_alpha(condition)
       beta_memory
-      self.node = if existing = node.children.find { |n| n.is_a?(JoinNode) && n.equivalent?(alpha, tests, assignment) }
-        existing
-      else
-        JoinNode.new(node, tests, assignment).tap do |join|
-          join.alpha = alpha
-          alpha.betas << join unless alpha_deaf
-        end
-      end
+      self.node = if (existing = node.children.find { |n| n.is_a?(JoinNode) && n.equivalent?(alpha, tests, assignment) && !n.children.map(&:class).include?(Wongi::Engine::OrNode) })
+                    existing
+                  else
+                    JoinNode.new(node, tests, assignment).tap do |join|
+                      join.alpha = alpha
+                      alpha.betas << join unless alpha_deaf
+                    end
+                  end
     end
 
     def neg_node(condition, tests, unsafe)
@@ -75,6 +81,16 @@ module Wongi::Engine
       end
     end
 
+    def aggregate_node(condition, tests, assignment, map, function, assign)
+      declare(assign)
+      alpha = rete.compile_alpha(condition)
+      beta_memory
+      self.node = AggregateNode.new(node, alpha, tests, assignment, map, function, assign).tap do |node|
+        alpha.betas << node unless alpha_deaf
+      end
+      beta_memory
+    end
+
     def or_node(variants)
       beta_memory
       subvariables = []
@@ -90,7 +106,7 @@ module Wongi::Engine
           declare(v)
         end
       end
-      self.node = OrNode.new(branches).tap &:refresh
+      self.node = OrNode.new(branches).tap(&:refresh)
     end
 
     def ncc_node(subrule, alpha_deaf)
@@ -98,7 +114,7 @@ module Wongi::Engine
       subcompiler = Compiler.new(rete, node, subrule.conditions, parameters, alpha_deaf)
       declared_variables.each { |v| subcompiler.declare(v) }
       bottom = subcompiler.compile
-      if existing = node.children.find { |n| n.kind_of?( NccNode ) and n.partner.parent == bottom }
+      if (existing = node.children.find { |n| n.is_a?(NccNode) && n.partner.parent == bottom })
         self.node = existing
         return
       end

data/lib/wongi-engine/core_ext.rb

@@ -1,13 +1,9 @@
 module Wongi::Engine
-
   module CoreExt
-
     module ClassMethods
-
-      def attr_predicate *names
-
-        names_hash = names.inject( {} ) do |hash, element|
-          if Hash === element
+      def attr_predicate(*names)
+        names_hash = names.inject({}) do |hash, element|
+          if element.is_a?(Hash)
             hash.merge element
           else
             hash[element] = false
@@ -16,7 +12,6 @@ module Wongi::Engine
         end
 
         names_hash.each do |name, def_value|
-
           varname = "@#{name}".to_sym
           predname = "#{name}?".to_sym
           setname = "#{name}=".to_sym
@@ -24,40 +19,36 @@ module Wongi::Engine
           noexclname = "no_#{name}!".to_sym
 
           define_method predname do
-            if instance_variable_defined?( varname )
-              instance_variable_get( varname )
+            if instance_variable_defined?(varname)
+              instance_variable_get(varname)
             else
               def_value
             end
           end
 
           define_method setname do |newvalue|
-            instance_variable_set( varname, newvalue == true )
+            instance_variable_set(varname, newvalue == true)
           end
 
           define_method exclname do
-            instance_variable_set( varname, true )
+            instance_variable_set(varname, true)
           end
 
           define_method noexclname do
-            instance_variable_set( varname, false )
+            instance_variable_set(varname, false)
           end
-
         end
       end
 
-      def abstract name
-        define_method name do |*args|
+      def abstract(name)
+        define_method name do |*_args|
           raise NoMethodError.new "#{name} is not implemented for #{self.class.name}", name
         end
       end
-
     end
 
-    def self.included mod
+    def self.included(mod)
       mod.extend ClassMethods
     end
-
   end
-
 end

data/lib/wongi-engine/data_overlay.rb

@@ -1,8 +1,6 @@
 module Wongi::Engine
   class DataOverlay
-
-    attr_reader :rete
-    attr_reader :parent
+    attr_reader :rete, :parent
 
     def initialize(rete, parent = nil)
       @rete = rete
@@ -18,26 +16,26 @@ module Wongi::Engine
 
     def with_child
       return unless block_given?
+
       new_child.tap do |overlay|
-        begin
-          result = yield overlay
-        ensure
-          overlay.dispose
-        end
-        result
+        yield overlay
+      ensure
+        overlay.dispose
       end
     end
 
     def ancestor?(other)
       return false if parent.nil?
       return true if parent == other
+
       parent.ancestor?(other)
     end
 
     def dispose
       return if self == rete.default_overlay
+
       rete.remove_overlay(self)
-      @raw_tokens.values.each do |tokens|
+      @raw_tokens.each_value do |tokens|
         tokens.each(&:dispose!)
       end
       @raw_tokens.clear
@@ -46,7 +44,7 @@ module Wongi::Engine
     def <<(thing)
       case thing
       when Array
-        assert WME.new(*thing).tap { |wme| wme.overlay = self }
+        assert(WME.new(*thing).tap { |wme| wme.overlay = self })
       when WME
         assert(thing)
       else
@@ -54,27 +52,25 @@ module Wongi::Engine
       end
     end
 
-    def assert wme
+    def assert(wme)
       @next_cascade ||= []
       @next_cascade << [:assert, wme]
-      if @current_cascade.nil?
-        @current_cascade = @next_cascade
-        @next_cascade = nil
-        process_cascade
-      end
+      return if @current_cascade
+
+      @current_cascade = @next_cascade
+      @next_cascade = nil
+      process_cascade
     end
 
-    def retract wme, options = { }
-      if wme.is_a? Array
-        wme = WME.new(*wme)
-      end
+    def retract(wme, options = {})
+      wme = WME.new(*wme) if wme.is_a? Array
       @next_cascade ||= []
       @next_cascade << [:retract, wme, options]
-      if @current_cascade.nil?
-        @current_cascade = @next_cascade
-        @next_cascade = nil
-        process_cascade
-      end
+      return if @current_cascade
+
+      @current_cascade = @next_cascade
+      @next_cascade = nil
+      process_cascade
     end
 
     def process_cascade
@@ -99,6 +95,7 @@ module Wongi::Engine
       return self if other.nil?
       return self if ancestor?(other)
       return other if other.ancestor?(self)
+
       nil # unrelated lineages
     end
 

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

@@ -2,8 +2,8 @@ module Wongi::Engine
   module DSL::Action
     class AssignAction < SimpleAction
       def initialize(var, &action)
+        super(action)
         @var = var
-        @action = action
       end
 
       def execute(token)

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

@@ -2,10 +2,7 @@ module Wongi::Engine
   module DSL::Action
     class Base
       include CoreExt
-      attr_accessor :production
-      attr_accessor :rule
-      attr_accessor :name
-      attr_accessor :rete
+      attr_accessor :production, :rule, :name, :rete
     end
   end
 end

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

@@ -1,9 +1,10 @@
 module Wongi::Engine
   module DSL::Action
     class ErrorGenerator < Base
-
-      def initialize message = nil, &messenger
-        @message, @messenger = message, messenger
+      def initialize(message = nil, &messenger)
+        super()
+        @message = message
+        @messenger = messenger
       end
 
       def rete=(*)
@@ -14,18 +15,17 @@ module Wongi::Engine
       def errors
         production.tokens.map do |token|
           message = if @messenger
-            @messenger.call token.assignments
-          else
-            @message
-          end
+                      @messenger.call token.assignments
+                    else
+                      @message
+                    end
           ReteError.new token, message, literate?
         end
       end
 
       def literate?
-        not @messenger.nil?
+        !@messenger.nil?
       end
-
     end
   end
 end

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

@@ -1,22 +1,24 @@
 module Wongi::Engine
   module DSL::Action
     class SimpleAction < Base
-      def initialize action = nil, *args, &block
+      def initialize(action = nil, *args, &block)
+        super()
         @args = args
         case action
         when Class
-          @action = @deaction = @reaction = action.new *args, &block
+          @action = @deaction = @reaction = action.new(*args, &block)
         when Hash
-          @action   = instance_or_proc action[:activate]
+          @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
+      def execute(token)
         return unless @action
-        if @action.is_a?( Proc ) || @action.respond_to?( :to_proc )
+
+        if @action.is_a?(Proc) || @action.respond_to?(:to_proc)
           rete.instance_exec token, &@action
         elsif @action.respond_to? :call
           @action.call token
@@ -25,9 +27,10 @@ module Wongi::Engine
         end
       end
 
-      def deexecute token
+      def deexecute(token)
         return unless @deaction
-        if @deaction.is_a?( Proc ) || @deaction.respond_to?( :to_proc )
+
+        if @deaction.is_a?(Proc) || @deaction.respond_to?(:to_proc)
           rete.instance_exec token, &@deaction
         elsif @deaction.respond_to? :call
           @deaction.call token
@@ -36,9 +39,10 @@ module Wongi::Engine
         end
       end
 
-      def reexecute token, newtoken
+      def reexecute(token, newtoken)
         return unless @reaction
-        if @reaction.is_a?( Proc ) || @reaction.respond_to?( :to_proc )
+
+        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
@@ -47,7 +51,7 @@ module Wongi::Engine
         end
       end
 
-      def instance_or_proc thing
+      def instance_or_proc(thing)
         case thing
         when Class
           thing.new

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

@@ -1,18 +1,18 @@
 module Wongi::Engine
   module DSL::Action
     class SimpleCollector < Base
-
       def self.collector
         Class.new self
       end
 
-      def initialize variable, name = nil
+      def initialize(variable, name = nil)
+        super()
         @variable = variable
         @name = name if name
-        #(class << self; self; end).instance_eval do
-            #        define_method method do
-            #          collect variable
-            #        end
+        # (class << self; self; end).instance_eval do
+        #        define_method method do
+        #          collect variable
+        #        end
         #    alias_method method, :default_collect
         #  end
       end
@@ -21,32 +21,17 @@ module Wongi::Engine
         collect @variable
       end
 
-      def name= n
-        @name = n unless @name
+      def name=(n)
+        @name ||= n
       end
 
-      def rete= rete
+      def rete=(rete)
         rete.add_collector self, name
       end
 
-      def collect var
+      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
 end

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

@@ -1,12 +1,12 @@
 module Wongi::Engine
   module DSL::Action
     class StatementGenerator < Base
-
-      def initialize template
+      def initialize(template)
+        super()
         @template = template
       end
 
-      def execute token
+      def execute(token)
         subject, predicate, object = @template.resolve!(token)
 
         # link to rete here to ensure proper linking with token
@@ -14,10 +14,10 @@ module Wongi::Engine
         wme.manual = false
         wme.overlay = token.overlay
 
-        production.tracer.trace( action: self, wme: wme ) if production.tracer
-        if existing = rete.exists?( wme )
+        production.tracer.trace(action: self, wme: wme) if production.tracer
+        if (existing = rete.exists?(wme))
           generated = existing.generating_tokens.size
-          if generated > 0 && ! token.generated_wmes.include?( existing )
+          if generated.positive? && !token.generated_wmes.include?(existing)
             token.generated_wmes << existing
             existing.generating_tokens << token
           end
@@ -28,16 +28,17 @@ module Wongi::Engine
           # in order for neg rule invalidation to work
           wme.overlay.assert wme
         end
-
       end
 
-      def deexecute token
-        token.generated_wmes.reject( &:manual? ).inject( [] ) do |list, wme|
-          list.tap do |l|
-            wme.generating_tokens.delete token
-            l << wme if wme.generating_tokens.empty?
-          end
-        end.each do |wme|
+      def deexecute(token)
+        generated = token.generated_wmes.reject(&:manual?)
+
+        wmes_for_deletion = generated.each_with_object([]) do |wme, acc|
+          wme.generating_tokens.delete token
+          acc << wme if wme.generating_tokens.empty?
+        end
+
+        wmes_for_deletion.each do |wme|
           wme.overlay.retract wme, automatic: true
         end
       end

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

@@ -1,10 +1,10 @@
 module Wongi::Engine
   module DSL::Action
     class TraceAction < Base
-
       class DefaultTracer
         attr_accessor :action
-        def trace args
+
+        def trace(args)
           case args[:action]
           when TraceAction
             if args[:token]
@@ -19,24 +19,24 @@ module Wongi::Engine
       end
 
       attr_reader :io
+
       attr_predicate :generation, :values
 
-      def initialize opts = { }
-        [:generation, :values, :tracer, :tracer_class, :io].each do |option|
-          if opts.has_key? option
-            instance_variable_set "@#{option}", opts[option]
-          end
+      def initialize(opts = {})
+        super()
+        %i[generation values tracer tracer_class io].each do |option|
+          instance_variable_set "@#{option}", opts[option] if opts.key? option
         end
         @io ||= $stdout
         @tracer ||= (@tracer_class || DefaultTracer).new
         @tracer.action = self
       end
 
-      def trace args
+      def trace(args)
         @tracer.trace args
       end
 
-      def execute token
+      def execute(token)
         production.tracer = self
         if values?
           trace action: self, token: token