Changeset 392

Timestamp:

04/26/2010 05:56:08 PM (11 years ago)

Author:

myl

Message:

Some bugs in SA?

Location:

AgentMind/trunk/AgentMind

Files:

• Amy.txt (modified) (1 diff)
• FAtiMA/src/FAtiMA/conditions/SACondition.java (modified) (6 diffs)
• FAtiMA/src/FAtiMA/deliberativeLayer/DeliberativeProcess.java (modified) (3 diffs)
• FAtiMA/src/FAtiMA/memory/episodicMemory/ActionDetail.java (modified) (1 diff)
• FAtiMA/src/FAtiMA/memory/episodicMemory/Time.java (modified) (3 diffs)
• FAtiMA/src/FAtiMA/util/parsers/StripsOperatorsLoaderHandler.java (modified) (2 diffs)
• MemoryProcesses/src/main/java/MemoryProcesses/SAQuery.java (modified) (10 diffs)
• MemoryProcesses/src/main/rules/SpreadActivate.drl (modified) (4 diffs)
• WorldTest/src/UserInterface.java (modified) (1 diff)
• data/characters/minds/LIRECScenarios.xml (modified) (1 diff)

AgentMind/trunk/AgentMind/Amy.txt

@@ -2 +2 @@
 isPresent True
 has none
-location StudyRoom
+possibleLocation,Afternoon unknown
+knowPossibleLocation,Afternoon False

AgentMind/trunk/AgentMind/FAtiMA/src/FAtiMA/conditions/SACondition.java

@@ -110 +110 @@
                 System.out.println("Result " + result);
                 sset = new SubstitutionSet();
-                sset.AddSubstitution(new Substitution(this._value,new Symbol(result)));
+                sset.AddSubstitution(new Substitution(this._value, new Symbol(result)));
                 subs.add(sset);
                 
@@ -121 +121 @@
                 sac._query = this._query;
                 sac._value = (Symbol) this._value.clone();
-                sac._knownVariables = (Hashtable<String, Symbol>) this._knownVariables.clone();
+                
+                sac._knownVariables = new Hashtable<String, Symbol>();
+                Iterator<String> it = this._knownVariables.keySet().iterator();
+                while (it.hasNext())
+                {
+                        String key = it.next();
+                        sac._knownVariables.put(key, (Symbol) this._knownVariables.get(key).clone());
+                }
+                
                 return sac;
         }
@@ -146 +154 @@
         public void MakeGround(ArrayList<Substitution> bindings) {
                 this._value.MakeGround(bindings);
-                Iterator<String> it = this._knownVariables.keySet().iterator();
+                Iterator<Symbol> it = this._knownVariables.values().iterator();
                 while (it.hasNext())
                 {
-                        String key = it.next();
-                        this._knownVariables.get(key).MakeGround(bindings);
+                        it.next().MakeGround(bindings);
                 }
         }
@@ -157 +164 @@
         public void MakeGround(Substitution subst) {
                 this._value.MakeGround(subst);
-                Iterator<String> it = this._knownVariables.keySet().iterator();
+                Iterator<Symbol> it = this._knownVariables.values().iterator();
                 while (it.hasNext())
                 {
-                        String key = it.next();
-                        this._knownVariables.get(key).MakeGround(subst);
+                        it.next().MakeGround(subst);
                 }
         }
@@ -168 +174 @@
         public void ReplaceUnboundVariables(int variableID) {
                 this._value.ReplaceUnboundVariables(variableID);
-                Iterator<String> it = this._knownVariables.keySet().iterator();
+                Iterator<Symbol> it = this._knownVariables.values().iterator();
                 while (it.hasNext())
                 {
-                        String key = it.next();
-                        this._knownVariables.get(key).ReplaceUnboundVariables(variableID);
+                        it.next().ReplaceUnboundVariables(variableID);
                 }
         }
@@ -179 +184 @@
         public boolean isGrounded() {
                 if(!this._value.isGrounded()) return false;
-                Iterator<String> it = this._knownVariables.keySet().iterator();
+                Iterator<Symbol> it = this._knownVariables.values().iterator();
                 while (it.hasNext())
                 {
-                        String key = it.next();
-                        if(!this._knownVariables.get(key).isGrounded()) return false;
+                        if(!it.next().isGrounded()) return false;
                 }
                 return true;

AgentMind/trunk/AgentMind/FAtiMA/src/FAtiMA/deliberativeLayer/DeliberativeProcess.java

@@ -133 +133 @@
 import FAtiMA.deliberativeLayer.goals.GoalLibrary;
 import FAtiMA.deliberativeLayer.goals.InterestGoal;
+import FAtiMA.deliberativeLayer.plan.Effect;
 import FAtiMA.deliberativeLayer.plan.IPlanningOperator;
 import FAtiMA.deliberativeLayer.plan.Plan;
@@ -991 +992 @@
                                         AddSubIntention(am, _currentIntention, (ActivePursuitGoal) copingAction);       
                                 }
-                                 else if(!actionName.startsWith("Inference") && !actionName.endsWith("Appraisal") && !actionName.startsWith("SA"))
+                                else if(!actionName.startsWith("Inference") && !actionName.endsWith("Appraisal") && !actionName.startsWith("SA"))
                                 {
                                         fear = i.GetFear(am.getEmotionalState());
@@ -1019 +1020 @@
                                                 
                                         _selectedAction = (Step) copingAction;
+                                }
+                                else if(actionName.startsWith("SA"))
+                                {
+                                        Effect eff;
+                                
+                                    for(ListIterator<Effect> li =  copingAction.getEffects().listIterator(); li.hasNext();)
+                                    {
+                                      eff = (Effect) li.next();
+                                      if(eff.isGrounded())
+                                          am.getMemory().getSemanticMemory().Tell(eff.GetEffect().getName(), eff.GetEffect().GetValue().toString());
+                                    }
                                 }
                                 else

AgentMind/trunk/AgentMind/FAtiMA/src/FAtiMA/memory/episodicMemory/ActionDetail.java

@@ -306 +306 @@
                         updated = true;
                 }
-                
+        
                 switch(em.GetType())
                 {

AgentMind/trunk/AgentMind/FAtiMA/src/FAtiMA/memory/episodicMemory/Time.java

@@ -50 +50 @@
         private long _narrativeTime;
         private long _realTime;
+        private String _strRealTime;
         private int _eventSequence;
         
@@ -57 +58 @@
                 GregorianCalendar gcal = new GregorianCalendar();
                 this._realTime = gcal.get(Calendar.HOUR_OF_DAY);
+                if(this._realTime >= 0 && this._realTime < 12)
+                        this._strRealTime = "Morning";
+                else
+                        this._strRealTime = "Afternoon";
                 this._eventSequence = _eventCounter;
                 _eventCounter++;
@@ -69 +74 @@
         {
                 return this._realTime;
+        }
+        
+        public String getStrRealTime()
+        {
+                return this._strRealTime;
         }
         

AgentMind/trunk/AgentMind/FAtiMA/src/FAtiMA/util/parsers/StripsOperatorsLoaderHandler.java

@@ -258 +258 @@
                 _sac = SACondition.ParseSA(attributes);
                 _sac.MakeGround(_self);
-        }
-        catch(Exception e)
-        {
-                e.printStackTrace();
-        }
-        }
-        
-        public void SAKnown(Attributes attributes) {
-                String name;
-                Symbol value;
-
-                try
-        {
-                name = attributes.getValue("name");             
-                value = new Symbol(attributes.getValue("value"));
-                System.out.println("known " + name + " " + value);
-                _sac.AddKnownVariables(name, value);
-                _sac.MakeGround(_self);
                 if(_precondition) 
                         _currentOperator.AddPrecondition(_sac);
@@ -286 +268 @@
         {
                 e.printStackTrace();
+        }
+        }
+        
+        public void SAKnown(Attributes attributes) {
+                String name;
+                Symbol value;
+
+                try
+        {
+                name = attributes.getValue("name");             
+                value = new Symbol(attributes.getValue("value"));
+                System.out.println("known " + name + " " + value);
+                _sac.AddKnownVariables(name, value);
+        }
+        catch(Exception e)
+        {
+                e.printStackTrace();
         }               
         }

AgentMind/trunk/AgentMind/MemoryProcesses/src/main/java/MemoryProcesses/SAQuery.java

@@ -50 +50 @@
         private String _intention;
         private String _status;
+        private String _time;
         private String _speechActMeaning;
         private String _multimediaPath;
@@ -74 +75 @@
                 this._intention = "";
                 this._status = "";
+                this._time = "";
                 this._speechActMeaning = "";
                 this._multimediaPath = "";
@@ -155 +157 @@
                                 this._numKnownVar++;
                         }
+                        if (queryType.equals("time"))
+                        {
+                                while(query.hasMoreTokens())
+                                {
+                                        this._time = query.nextToken();
+                                }
+                                this._numKnownVar++;
+                        }
                         if (queryType.equals("speeachActMeaning"))
                         {
@@ -198 +208 @@
                 System.out.println("ID" + this._id + "subject " + this._subject + " target " + this._target 
                                 + " action " + this._action + " location " + this._location 
-                                + "intention " + this._intention + "status " + this._status     
+                                + "intention " + this._intention + "status " + this._status     + "time " + this._time  
                                 + "speechActMeaning " + this._speechActMeaning + "multimediaPath " 
                                 + this._multimediaPath + "object " + this._object + "desirability " + this._desirability
@@ -215 +225 @@
                 this._intention = "";
                 this._status = "";
+                this._time = "";
                 this._speechActMeaning = "";
                 this._multimediaPath = "";
@@ -259 +270 @@
     public String getStatus(){
         return this._status;
+    }
+    
+    public String getTime(){
+        return this._time;
     }
     
@@ -340 +355 @@
     }
     
+    public void setTime(String time){
+        this._time = time;
+    }
+    
     public void setSpeechActMeaning(String speechActMeaning){
         this._speechActMeaning = speechActMeaning;
@@ -367 +386 @@
     public void setResults(String result)
         {
+        Integer val = new Integer(1); 
+        
         if (result != null)
         {
                         if (this._results == null || !this._results.containsKey(result))
                         {
-                                this._results.put(result, new Integer(1));
+                                this._results.put(result, val);
                         }
                         else
                         {
-                                Integer val = (Integer) _results.get(result);
+                                val = (Integer) _results.get(result);
                                 this._results.put(result, ++val);
-                                if (this._maxFrequency < val)
-                                        this._maxFrequency = val;
                         }
+                        if (this._maxFrequency < val)
+                                this._maxFrequency = val;
         }
         }
@@ -385 +406 @@
     public void setResultIDs(int result)
         {
+        Integer val = new Integer(1);
+        
         if (result != -1)
         {
@@ -393 +416 @@
                         else
                         {
-                                Integer val = (Integer) _results.get(Integer.toString(result));
+                                val = (Integer) _results.get(Integer.toString(result));
                                 this._results.put(Integer.toString(result), ++val);
-                                if (this._maxFrequency < val)
-                                        this._maxFrequency = val;
+                                
                         }
+                        if (this._maxFrequency < val)
+                                this._maxFrequency = val;
         }
         }

AgentMind/trunk/AgentMind/MemoryProcesses/src/main/rules/SpreadActivate.drl

@@ -7 +7 @@
 
 import FAtiMA.memory.episodicMemory.ActionDetail;
+import FAtiMA.memory.episodicMemory.Time;
 
 
@@ -112 +113 @@
                 System.out.println("Status " + $st1);
                 System.out.println("status-status " + $ad.getID());
+end
+
+rule "time-time phase1"
+        no-loop true
+        salience 50
+        when
+                $q: SAQuery($t1: time)
+                $ad: ActionDetail(time.strRealTime == $t1)      
+        then
+                insert (new CandidateEvent($ad, "time", 1.0f));
+                retract ($ad);
+                System.out.println("Time " + $t1);
+                System.out.println("time-time " + $ad.getID());
 end
 
@@ -244 +258 @@
 end
 
+rule "time-time"
+        no-loop true
+        when
+                $q: SAQuery($t1: time)
+                $cad: CandidateEvent(extension not contains "time")
+                $ad: ActionDetail(time.strRealTime == $t1) from $cad.actionDetail       
+        then
+                modify ($cad) {
+                        increasePhase(), 
+                        setExtension("time")
+                }
+                System.out.println("Time " + $t1);
+                System.out.println("time-time " + $ad.getID());
+end
+
 rule "speechAct-speechAct"
         no-loop true
@@ -426 +455 @@
 end
 
+rule "time"
+        no-loop true
+        when
+                $q: SAQuery(question == "time")
+                $cad: CandidateEvent( phase == $q.numKnownVar )
+                $ad: ActionDetail() from $cad.actionDetail              
+                Time($t: strRealTime) from $ad  
+        then                    
+                modify ($q) {
+                        setResults($t)
+                }
+                System.out.println("Time " + $t);
+                System.out.println("Retracted " +$ad.getID());
+                retract ($cad);                 
+end
+
 rule "speechActMeaning"
         no-loop true

AgentMind/trunk/AgentMind/WorldTest/src/UserInterface.java

@@ -201 +201 @@
         _infoOptions.addItem("target SELF");
         _infoOptions.addItem("target Amy");
+        _infoOptions.addItem("time 17");
         _infoOptions.addItem("location LivingRoom");
         _infoOptions.addItem("action Greet");

AgentMind/trunk/AgentMind/data/characters/minds/LIRECScenarios.xml

@@ -141 +141 @@
                         
                         <Properties>
-                                <Property name="time" value="Morning"/>
+                                <Property name="time" value="Afternoon"/>
                                 <Property name="isPerson" value="True"/>
                                 <Property name="location" value="LivingRoom"/>