Changeset 251

Timestamp:

12/14/2009 03:12:19 PM (11 years ago)

Author:

myl

Message:

 

Location:

AgentMind/trunk/AgentMind/FAtiMA/src/FAtiMA

Files:

• memory/eventQuery/CompoundCue.java (modified) (3 diffs)
• memory/eventQuery/SpreadActivate.java (modified) (4 diffs)
• sensorEffector/RemoteAgent.java (modified) (2 diffs)

AgentMind/trunk/AgentMind/FAtiMA/src/FAtiMA/memory/eventQuery/CompoundCue.java

@@ -83 +83 @@
          * Match current entry with events in memory
          */
-        public void Match()
+        public void Match(ArrayList<MemoryEpisode> episodes, STMemoryRecord records)
         {                       
                 try {           
@@ -93 +93 @@
                         System.out.println("Compound Cue");
                         
-                        ArrayList<MemoryEpisode> episodes = AutobiographicalMemory.GetInstance().GetAllEpisodes();
                         for (int i = 0; i < episodes.size(); i++)
                         {
@@ -106 +105 @@
                                 
                         }
-                        STMemoryRecord records = ShortTermMemory.GetInstance().GetAllRecords();                         
                         details = records.getDetails();
                         

AgentMind/trunk/AgentMind/FAtiMA/src/FAtiMA/memory/eventQuery/SpreadActivate.java

@@ -56 +56 @@
                         _kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
                         _kbuilder.add(ResourceFactory.newClassPathResource("rules/SpreadActivate.drl"), ResourceType.DRL);
+                        _kbuilder.add(ResourceFactory.newClassPathResource("rules/CompoundCue.drl"), ResourceType.DRL);
                         KnowledgeBuilderErrors errors = _kbuilder.getErrors();
                         if (errors.size() > 0) {
@@ -82 +83 @@
          * Spread activate through the memory
          */
-        public void Spread()
+        public void Spread(ArrayList<MemoryEpisode> episodes, STMemoryRecord records)
         {                       
                 try {
@@ -92 +93 @@
                         System.out.println("Spreading Activation");
                         
-                        ArrayList<MemoryEpisode> episodes = AutobiographicalMemory.GetInstance().GetAllEpisodes();
                         for (int i = 0; i < episodes.size(); i++)
                         {
@@ -105 +105 @@
                                 
                         }
-                        STMemoryRecord records = ShortTermMemory.GetInstance().GetAllRecords();                         
+                
                         details = records.getDetails();
                         

AgentMind/trunk/AgentMind/FAtiMA/src/FAtiMA/sensorEffector/RemoteAgent.java

@@ -95 +95 @@
 import FAtiMA.memory.Memory;
 import FAtiMA.memory.autobiographicalMemory.AutobiographicalMemory;
+import FAtiMA.memory.autobiographicalMemory.MemoryEpisode;
 import FAtiMA.memory.eventQuery.CompoundCue;
 import FAtiMA.memory.eventQuery.SpreadActivate;
+import FAtiMA.memory.shortTermMemory.ShortTermMemory;
 import FAtiMA.memory.shortTermMemory.WorkingMemory;
 import FAtiMA.motivationalSystem.MotivationalState;
@@ -345 +347 @@
                         else if(msgType.equals(QUERY_MEMORY))
                         {
-                                SpreadActivate.GetInstance().Spread();
-                                CompoundCue.GetInstance().Match();                                              
+                                SpreadActivate.GetInstance().Spread(AutobiographicalMemory.GetInstance().GetAllEpisodes(), ShortTermMemory.GetInstance().GetAllRecords());
+                                //CompoundCue.GetInstance().Match(AutobiographicalMemory.GetInstance().GetAllEpisodes(), ShortTermMemory.GetInstance().GetAllRecords());                                                
                         }