cirrocumulus 0.9.9 → 0.9.11

data/lib/cirrocumulus/channels.rb

@@ -154,7 +154,7 @@ class ChannelFactory
       jabber_client = JabberChannel.query_client(instance.to_s)
 
       if jabber_client
-        return NetworkChannel.new(jabber_client, agent.to_s)
+        return NetworkChannel.new(jabber_client, agent.is_a?(WholeOntologyIdentifier) ? nil : agent.to_s)
       else
         Logger['channels::factory'].warn "No active Jabber clients."
       end

data/lib/cirrocumulus/channels/jabber.rb

@@ -142,7 +142,7 @@ class JabberChannel
       Log4r::Logger['channels::jabber'].debug('Received Jabber::ClientAuthenticationFailure, registering new account')
       client = Jabber::Client.new(@full_jid)
       client.connect()
-      client.register(password)
+      client.register(@@password)
       client.close()
       @jabber = Jabber::Simple.new(@full_jid, @@password)
     rescue Exception => ex

data/lib/cirrocumulus/identifier.rb

@@ -10,12 +10,8 @@ class Agent
     JabberIdentifier.new(ontology_name)
   end
   
-	def self.all(ontology_name = nil)
-		if ontology_name == nil
-			Broadcast.new
-		else
-			Autodiscover.new(ontology_name)
-		end
+	def self.all
+    WholeOntologyIdentifier.new
 	end
 
 	def self.remote(agent_identifier)
@@ -56,6 +52,16 @@ class RemoteIdentifier
   end
 end
 
+class WholeOntologyIdentifier < RemoteIdentifier
+  def initialize(ontology_name = nil)
+    @ontology_name = ontology_name
+  end
+
+  def to_s
+    @ontology_name || "(broadcast)"
+  end
+end
+
 #
 # Agent identifier for local agents.
 #

data/lib/cirrocumulus/ontology.rb

@@ -20,10 +20,26 @@ class RuleDescription
   end
 end
 
+class TriggerDescription
+  attr_reader :name, :fact, :action, :code
+
+  def initialize(name, fact, action, code)
+    @name = name
+    @fact = fact
+    @action = action
+    @code = code
+  end
+
+  def ==(other)
+    name == other.name
+  end
+end
+
 class Ontology
 	class << self
 		@@inproc_agents = {}
 		@@loaded_rules = {}
+    @@loaded_triggers = {}
 		@@ontology_names = {}
 
 		def register_ontology_instance(instance)
@@ -64,7 +80,11 @@ class Ontology
 
 		def current_ruleset()
 			return @@loaded_rules[name] ||= []
-		end
+    end
+
+    def triggers
+      return @@loaded_triggers[name] ||= []
+    end
 
 		def enable_console
 			proxy = RemoteConsole.new
@@ -81,7 +101,20 @@ class Ontology
 
       distilled_predicate = predicate.map {|cond| cond.is_a?(KnowledgeClass) ? cond.to_params : cond}
 			current_ruleset << RuleDescription.new(name, distilled_predicate, options, block)
-		end
+    end
+
+    def trigger(name, options, &block)
+      return unless options.has_key?(:for)
+      return if triggers.find {|t| t.name == name}
+
+      trigger_for = options[:for]
+      trigger_action = options[:on] || :assert
+
+      t = TriggerDescription.new(name, trigger_for, trigger_action, block)
+      triggers << t
+
+      p t
+    end
 	end
 
 	attr_reader :identifier
@@ -206,7 +239,7 @@ class Ontology
 
   def create_saga(saga_class)
     @last_saga_id += 1
-    saga = saga_class.new(saga_class.saga + '-' + @last_saga_id.to_s, self)
+    saga = saga_class.new(saga_class.name + '-' + @last_saga_id.to_s, self)
     @sagas << saga
 
     saga
@@ -294,6 +327,10 @@ class Ontology
   # Send 'query-if' to another agent. Normally, it will reply if the expression is true or false.
   #
 	def query_if(agent, fact, options = {})
+    info "%25s | query %s if %s %s" % [identifier, agent, Sexpistol.new.to_sexp(fact), print_message_options(options)]
+
+    channel = ChannelFactory.retrieve(identifier, agent)
+    channel.query_if(identifier, fact, options) if channel
 	end
 
 	def query_if_and_wait(agent, fact, options = {})
@@ -307,7 +344,13 @@ class Ontology
   #
   # Tick. Every second.
   #
-  def tick; end
+  def tick
+    @sagas.each do |saga|
+      next if saga.is_finished?
+
+      saga.tick
+    end
+  end
 
   #
   # Handles incoming fact. By default, just adds this fact to KB or redirects its processing to corresponding saga
@@ -364,6 +407,13 @@ class Ontology
 
   def handle_query(sender, expression, options = {})
     info "%25s | %s queries %s %s" % [identifier, sender, Sexpistol.new.to_sexp(expression), print_message_options(options)] unless handle_saga_reply(sender, :query, expression, options)
+
+    matcher = PatternMatcher.new(@facts.enumerate)
+    matches = matcher.find_matches_for_condition(expression).map {|data| data.data}
+    info "%25s | (found #{matches.size} matching facts)" % [identifier]
+    matches.each do |fact|
+      inform(sender, fact, reply(options))
+    end
   end
 
   #

data/lib/cirrocumulus/rules/engine.rb

@@ -153,8 +153,7 @@ module RuleEngine
     end
 
     def query(fact)
-      @facts = [] if @facts.nil?
-      return @facts.include? fact
+      find_matches_for_condition(fact).map {|data| data.data}
     end
 
     def match(pattern)

data/lib/cirrocumulus/saga.rb

@@ -22,12 +22,20 @@ class Saga
     @ontology = ontology
     @state = STATE_START
     @started_at = Time.now
+    @timeout_at = nil
   end
 
   def is_finished?
     @state == STATE_ERROR || @state == STATE_FINISHED
   end
 
+  def tick
+    return if @timeout_at.nil? || @timeout_at > Time.now
+
+    @timeout_at = nil
+    handle_reply(nil, nil, nil)
+  end
+
   def handle_reply(sender, contents, options = {}); end
 
   def dump_parameters
@@ -44,32 +52,32 @@ class Saga
   # Inter-agent communications with context of this saga.
   #
 
-  def inform(agent, proposition)
-    @ontology.inform agent, proposition, :conversation_id => self.id
+  def inform(agent, proposition, options = {})
+    @ontology.inform agent, proposition, options.merge(:conversation_id => self.id)
   end
 
-  def agree(agent, action)
-    @ontology.agree agent, action, :conversation_id => self.id
+  def agree(agent, action, options = {})
+    @ontology.agree agent, action, options.merge(:conversation_id => self.id)
   end
 
-  def refuse(agent, action, reason)
-    @ontology.refuse agent, action, reason, :conversation_id => self.id
+  def refuse(agent, action, reason, options = {})
+    @ontology.refuse agent, action, reason, options.merge(:conversation_id => self.id)
   end
 
   def failure(agent, action, reason = true)
-    @ontology.failure agent, action, reason, :conversation_id => self.id
+    @ontology.failure agent, action, reason, options.merge(:conversation_id => self.id)
   end
 
-  def request(agent, action)
-    @ontology.request agent, action, :conversation_id => self.id
+  def request(agent, action, options = {})
+    @ontology.request agent, action, options.merge(:conversation_id => self.id)
   end
 
-  def query(agent, expression)
-    @ontology.query agent, expression, :reply_with => self.id
+  def query(agent, expression, options = {})
+    @ontology.query agent, expression, options.merge(:reply_with => self.id)
   end
 
-  def query_if(agent, proposition)
-    @ontology.query_if agent, proposition, :reply_with => self.id
+  def query_if(agent, proposition, options = {})
+    @ontology.query_if agent, proposition, options.merge(:reply_with => self.id)
   end
 
   def finish()
@@ -84,4 +92,8 @@ class Saga
     @state = new_state
   end
 
+  def timeout(secs)
+    @timeout_at = Time.now + secs.seconds
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cirrocumulus
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-27 00:00:00.000000000 Z
+date: 2013-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: guid
   requirement: !ruby/object:Gem::Requirement