Changeset 860


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/EmotionalPlanner.java

    r848 r860  
    452452                af.SetAppraisalVariable(DeliberativeProcess.NAME, (short)7, OCCComponent.SUCCESSPROBABILITY, planProb); 
    453453                af.SetAppraisalVariable(DeliberativeProcess.NAME, (short)7, OCCComponent.FAILUREPROBABILITY, 1-planProb); 
     454                am.updateEmotions(af); 
    454455                 
    455456                hopeEmotion = am.getEmotionalState().GetEmotion(OCCComponent.getHopeKey(af.getEvent())); 
     
    493494                        auxFrame.SetAppraisalVariable(DeliberativeProcess.NAME, (short)6, OCCComponent.FAILUREPROBABILITY, prob); 
    494495                        auxFrame.SetAppraisalVariable(DeliberativeProcess.NAME, (short)6, OCCComponent.GOALCONDUCIVENESS, -tGoal.GetImportanceOfFailure(am)); 
     496                        am.updateEmotions(auxFrame); 
    495497                          
    496498                         
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/deliberativeLayer/Intention.java

    r848 r860  
    382382            _appraisalFrame.SetAppraisalVariable(DeliberativeProcess.NAME, (short)7, OCCComponent.FAILUREPROBABILITY, 1-probability); 
    383383            _appraisalFrame.SetAppraisalVariable(DeliberativeProcess.NAME, (short)7, OCCComponent.GOALCONDUCIVENESS, goalConduciveness); 
     384             
     385            am.updateEmotions(_appraisalFrame); 
    384386                 
    385387                //SetHope(hope); 
     
    402404            af.SetAppraisalVariable(DeliberativeProcess.NAME,(short)8,OCCComponent.GOALSTATUS, OCCComponent.GOALDISCONFIRMED); 
    403405            af.SetAppraisalVariable(DeliberativeProcess.NAME, (short)8,OCCComponent.GOALCONDUCIVENESS, am.getDeliberativeLayer().getUtilityStrategy().getUtility(am, _goal)); 
     406            am.updateEmotions(af); 
    404407             
    405408            if(!isRootIntention()) 
     
    438441            af.SetAppraisalVariable(DeliberativeProcess.NAME,(short)8,OCCComponent.GOALSTATUS, OCCComponent.GOALCONFIRMED); 
    439442            af.SetAppraisalVariable(DeliberativeProcess.NAME, (short)8,OCCComponent.GOALCONDUCIVENESS, am.getDeliberativeLayer().getUtilityStrategy().getUtility(am, _goal)); 
     443            am.updateEmotions(af); 
    440444                                                 
    441445            AgentLogger.GetInstance().logAndPrint("Goal SUCCESS - " + getGoal().getName()); 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/emotionalState/BaseEmotion.java

    r848 r860  
    110110         */ 
    111111        public String GetHashKey() { 
    112                 String aux = _cause.toString()+_cause.GetTime(); 
     112                String aux = _cause.toString(); 
    113113                for(String s : _type.getAppraisalVariables()) 
    114114                { 
Note: See TracChangeset for help on using the changeset viewer.