Changeset 860

Timestamp:

01/19/2011 08:21:55 PM (10 years ago)

Author:

joao.dias

Message:

 

Location:

AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core

Files:

• deliberativeLayer/EmotionalPlanner.java (modified) (2 diffs)
• deliberativeLayer/Intention.java (modified) (3 diffs)
• emotionalState/BaseEmotion.java (modified) (1 diff)

AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/EmotionalPlanner.java

@@ -452 +452 @@
                 af.SetAppraisalVariable(DeliberativeProcess.NAME, (short)7, OCCComponent.SUCCESSPROBABILITY, planProb);
                 af.SetAppraisalVariable(DeliberativeProcess.NAME, (short)7, OCCComponent.FAILUREPROBABILITY, 1-planProb);
+                am.updateEmotions(af);
                 
                 hopeEmotion = am.getEmotionalState().GetEmotion(OCCComponent.getHopeKey(af.getEvent()));
@@ -493 +494 @@
                         auxFrame.SetAppraisalVariable(DeliberativeProcess.NAME, (short)6, OCCComponent.FAILUREPROBABILITY, prob);
                         auxFrame.SetAppraisalVariable(DeliberativeProcess.NAME, (short)6, OCCComponent.GOALCONDUCIVENESS, -tGoal.GetImportanceOfFailure(am));
+                        am.updateEmotions(auxFrame);
                          
                         

AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/Intention.java

@@ -382 +382 @@
             _appraisalFrame.SetAppraisalVariable(DeliberativeProcess.NAME, (short)7, OCCComponent.FAILUREPROBABILITY, 1-probability);
             _appraisalFrame.SetAppraisalVariable(DeliberativeProcess.NAME, (short)7, OCCComponent.GOALCONDUCIVENESS, goalConduciveness);
+            
+            am.updateEmotions(_appraisalFrame);
                 
                 //SetHope(hope);
@@ -402 +404 @@
             af.SetAppraisalVariable(DeliberativeProcess.NAME,(short)8,OCCComponent.GOALSTATUS, OCCComponent.GOALDISCONFIRMED);
             af.SetAppraisalVariable(DeliberativeProcess.NAME, (short)8,OCCComponent.GOALCONDUCIVENESS, am.getDeliberativeLayer().getUtilityStrategy().getUtility(am, _goal));
+            am.updateEmotions(af);
             
             if(!isRootIntention())
@@ -438 +441 @@
             af.SetAppraisalVariable(DeliberativeProcess.NAME,(short)8,OCCComponent.GOALSTATUS, OCCComponent.GOALCONFIRMED);
             af.SetAppraisalVariable(DeliberativeProcess.NAME, (short)8,OCCComponent.GOALCONDUCIVENESS, am.getDeliberativeLayer().getUtilityStrategy().getUtility(am, _goal));
+            am.updateEmotions(af);
                                                 
             AgentLogger.GetInstance().logAndPrint("Goal SUCCESS - " + getGoal().getName());

AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/emotionalState/BaseEmotion.java

@@ -110 +110 @@
          */
         public String GetHashKey() {
-                String aux = _cause.toString()+_cause.GetTime();
+                String aux = _cause.toString();
                 for(String s : _type.getAppraisalVariables())
                 {