Changeset 750

Timestamp:

12/01/2010 10:42:38 AM (10 years ago)

Author:

myl

Message:

Testing AdvancedMemory?

Location:

AgentMind/branches/FAtiMA-Modular

Files:

• AgentLauncher/src/AgentLauncher.java (modified) (2 diffs)
• FAtiMA.AdvancedMemory/src/main/java/FAtiMA/advancedMemoryComponent/AdvancedMemoryComponent.java (modified) (2 diffs)
• FAtiMA.AdvancedMemory/src/main/java/FAtiMA/advancedMemoryComponent/CCQuery.java (modified) (6 diffs)
• FAtiMA.AdvancedMemory/src/main/java/FAtiMA/advancedMemoryComponent/CompoundCue.java (modified) (3 diffs)
• FAtiMA.AdvancedMemory/src/main/rules/CompoundCue.drl (modified) (1 diff)
• WorldTest/src/UserInterface.java (modified) (1 diff)
• data/characters/minds/LIRECScenarios.xml (modified) (1 diff)

AgentMind/branches/FAtiMA-Modular/AgentLauncher/src/AgentLauncher.java

@@ -12 +12 @@
 import FAtiMA.Core.util.ConfigurationManager;
 import FAtiMA.ToM.ToMComponent;
+import FAtiMA.advancedMemoryComponent.AdvancedMemoryComponent;
 import FAtiMA.culture.CulturalDimensionsComponent;
 import FAtiMA.motivationalSystem.MotivationalComponent;
@@ -39 +40 @@
                 aG.addComponent(new MotivationalComponent(extraFiles));
                 aG.addComponent(new ToMComponent(ConfigurationManager.getName()));
-                
-                
+                aG.addComponent(new AdvancedMemoryComponent());
                 aG.StartAgent();
         }

AgentMind/branches/FAtiMA-Modular/FAtiMA.AdvancedMemory/src/main/java/FAtiMA/advancedMemoryComponent/AdvancedMemoryComponent.java

@@ -121 +121 @@
         public void AddGER(ArrayList<AttributeItemSet> itemSet)
         {
+                // clearing the list before generalising
+                this._gers.clear();
+                
                 for (int i = 0; i < itemSet.size(); i++)
                 {
@@ -302 +305 @@
                 else if(msgType.equals(CC_MEMORY))
                 {
-                        /*int index = Math.min(8, (int) (Math.random()*10));
+                        int index = Math.min(8, (int) (Math.random()*10));
                         ActionDetail event = _episodicMemory.getDetails().get(index);
                         _compoundCue.Match(event, _episodicMemory);
                         System.out.println("\nEvent ID to match on " + event.getID());
                         
-                        Hashtable<Integer, Float>  results = _compoundCue.getCCResults();
-                        Iterator<E> it = results.keySet().iterator();
-                        while (it.hasNext())
-                        {
-                                int id = (Integer) it.next();
+                        Hashtable<Integer, Float>  results = _compoundCue.getCCEvaluations();
+                        for(Integer id: results.keySet())
+                        {
                                 System.out.println("ID " + id + " evaluation " + results.get(id));
                         }
-                        System.out.println("\n\n");*/
+                        ActionDetail ad = _compoundCue.getStrongestResult();
+                        System.out.println("ID " + ad.getID() + "max evaluation " + _compoundCue.getEvaluation());
+                        System.out.println("\n\n");
                 }
                 else if(msgType.equals(G_MEMORY))

AgentMind/branches/FAtiMA-Modular/FAtiMA.AdvancedMemory/src/main/java/FAtiMA/advancedMemoryComponent/CCQuery.java

@@ -43 +43 @@
         private ActionDetail _result;
         private float _eval;
-        private ArrayList<ActionDetail> _results;
+        //private ArrayList<ActionDetail> _results;
         private Hashtable<Integer, Float> _evaluations;
         private ActionDetail _actionDetail;
@@ -51 +51 @@
         public CCQuery(){
                 this._eval = 0;
-                this._results = new ArrayList<ActionDetail>();
+                this._result = null;
                 this._evaluations = new Hashtable<Integer, Float>();
         }
@@ -68 +68 @@
         }
     
-    public ArrayList<ActionDetail> getCCResults()
-    {
-        return this._results;
-    }
-    
         public void setQuery(ActionDetail actionDetail){
                 this._result = null;
                 this._eval = 0;
-                this._results.clear();
                 this._evaluations.clear();
                 this._actionDetail = actionDetail;
@@ -83 +77 @@
         public void setResults(ActionDetail ad, float evaluation)
         {
+                // getting the event with the highest match
                 if(_result == null || (_result.getID() != ad.getID() && evaluation > _eval))
                 {
@@ -88 +83 @@
                         _eval = evaluation;
                 }
+
+                // saving all evaluation results
+                if (this._evaluations == null || !this._evaluations.containsKey(ad.getID()))
+                {
+                        this._evaluations.put(ad.getID(), evaluation);
+                }
         }
         
@@ -99 +100 @@
                 return _eval/210;
         }
-        
-    /*public void setResults(int id, float evaluation){
-        if (this._results == null || !this._results.containsKey(id))
-                {
-                        this._results.put(id, evaluation);
-                }
-    }*/
     
         public void addPropertyChangeListener(final PropertyChangeListener l) {

AgentMind/branches/FAtiMA-Modular/FAtiMA.AdvancedMemory/src/main/java/FAtiMA/advancedMemoryComponent/CompoundCue.java

@@ -32 +32 @@
 
 
+import java.util.Hashtable;
+
 import FAtiMA.Core.memory.episodicMemory.ActionDetail;
 import FAtiMA.Core.memory.episodicMemory.EpisodicMemory;
@@ -59 +61 @@
         {                       
                 try {           
-                        System.out.println("Compound Cue");
+                        //System.out.println("Compound Cue");
                         
                         // assert events from memory
@@ -82 +84 @@
          * @return a list of answer to the query
          */
-        /*public Hashtable<Integer, Float> getCCResults()
+        public Hashtable<Integer, Float> getCCEvaluations()
         {
-                return _ccQuery.getCCResults();
-        }*/
+                return _ccQuery.getCCEvaluations();
+        }
         
         public ActionDetail getStrongestResult()

AgentMind/branches/FAtiMA-Modular/FAtiMA.AdvancedMemory/src/main/rules/CompoundCue.drl

@@ -640 +640 @@
                         setResults($ad, $cad.getEvaluation())
                 }
-                System.out.println("Evaluation " + $cad.getEvaluation());
-                System.out.println("end match " + $ad.getID());
+                #System.out.println("Evaluation " + $cad.getEvaluation());
+                #System.out.println("end match " + $ad.getID());
                 retract ($cad);
 end

AgentMind/branches/FAtiMA-Modular/WorldTest/src/UserInterface.java

@@ -282 +282 @@
         buttonsPanel.add(stepButton);
         //buttonsPanel.add(usButton);
-        //buttonsPanel.add(saButton);
-        //buttonsPanel.add(ccButton);
+        buttonsPanel.add(saButton);
+        buttonsPanel.add(ccButton);
         buttonsPanel.add(gButton);
         

AgentMind/branches/FAtiMA-Modular/data/characters/minds/LIRECScenarios.xml

@@ -56 +56 @@
         <Scenario name="Remembering">
                 <WorldSimulator port="46874" scenery="AmyHouse" actionsFile="data/characters/minds/LIRECActions.xml" 
-                                                agentLanguageFile="data/characters/minds/language/agent/en/language-set-1" 
+                                                agentLanguageFile="data/characters/minds/language/agent/en/language-set-1"
+                                                userLanguageFile="data/characters/minds/language/user/en/language-set-1" 
                                                 userOptionsFile="LIRECOptions">         
                         <Objects>