Changeset 809


Ignore:
Timestamp:
01/12/2011 01:35:12 AM (10 years ago)
Author:
joao.dias
Message:
 
Location:
AgentMind/branches/FAtiMA-Modular
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • AgentMind/branches/FAtiMA-Modular/FAtiMA.MotivationalSystem/src/FAtiMA/motivationalSystem/MotivationalComponent.java

    r801 r809  
    1616import FAtiMA.Core.AgentModel; 
    1717import FAtiMA.Core.AgentSimulationTime; 
    18 import FAtiMA.Core.IAppraisalComponent; 
     18import FAtiMA.Core.IAppraisalDerivationComponent; 
    1919import FAtiMA.Core.IComponent; 
    2020import FAtiMA.Core.IModelOfOtherComponent; 
     
    4747 */ 
    4848 
    49 public class MotivationalComponent implements Serializable, Cloneable, IAppraisalComponent, IModelOfOtherComponent, IExpectedUtilityStrategy, IProbabilityStrategy, IUtilityStrategy, IGoalSuccessStrategy, IGoalFailureStrategy, IActionFailureStrategy { 
     49public class MotivationalComponent implements Serializable, Cloneable, IAppraisalDerivationComponent, IModelOfOtherComponent, IExpectedUtilityStrategy, IProbabilityStrategy, IUtilityStrategy, IGoalSuccessStrategy, IGoalFailureStrategy, IActionFailureStrategy { 
    5050         
    5151        private static final long serialVersionUID = 1L; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA.SocialRelations/src/FAtiMA/socialRelations/SocialRelationsComponent.java

    r801 r809  
    99 
    1010import FAtiMA.Core.AgentModel; 
    11 import FAtiMA.Core.IAppraisalComponent; 
     11import FAtiMA.Core.IAppraisalDerivationComponent; 
    1212import FAtiMA.Core.IComponent; 
    1313import FAtiMA.Core.IModelOfOtherComponent; 
     
    2525 
    2626 
    27 public class SocialRelationsComponent implements Serializable, IAppraisalComponent, IModelOfOtherComponent, IProcessEmotionComponent { 
     27public class SocialRelationsComponent implements Serializable, IAppraisalDerivationComponent, IModelOfOtherComponent, IProcessEmotionComponent { 
    2828         
    2929        /** 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA.ToM/src/FAtiMA/ToM/ModelOfOther.java

    r801 r809  
    99import FAtiMA.Core.AgentModel; 
    1010import FAtiMA.Core.IAffectDerivationComponent; 
    11 import FAtiMA.Core.IAppraisalComponent; 
     11import FAtiMA.Core.IAppraisalDerivationComponent; 
    1212import FAtiMA.Core.IComponent; 
    1313import FAtiMA.Core.IGetModelStrategy; 
     
    3737        private HashMap<String,IComponent> _components; 
    3838        private ArrayList<IProcessEmotionComponent> _processEmotionComponents; 
    39         private ArrayList<IAppraisalComponent> _appraisalComponents; 
     39        private ArrayList<IAppraisalDerivationComponent> _appraisalComponents; 
    4040        private ArrayList<IAffectDerivationComponent> _affectDerivationComponents; 
    4141        private ReactiveProcess _reactiveProcess; 
     
    4949                _components = new HashMap<String,IComponent>(); 
    5050                _processEmotionComponents = new ArrayList<IProcessEmotionComponent>(); 
    51                 _appraisalComponents = new ArrayList<IAppraisalComponent>(); 
     51                _appraisalComponents = new ArrayList<IAppraisalDerivationComponent>(); 
    5252                _affectDerivationComponents = new ArrayList<IAffectDerivationComponent>(); 
    5353                 
     
    9696                _mem.getSemanticMemory().Tell(AgentCore.ACTION_CONTEXT, e.toName().toString()); 
    9797                 
    98                 for(IAppraisalComponent c : _appraisalComponents) 
     98                for(IAppraisalDerivationComponent c : _appraisalComponents) 
    9999                { 
    100100                        c.update(this,e); 
     
    126126                                for(IAffectDerivationComponent c : _affectDerivationComponents) 
    127127                                { 
    128                                         c.inverseAffectElicitation(this,perceivedEmotion,af); 
     128                                        c.inverseAffectDerivation(this,perceivedEmotion,af); 
    129129                                } 
    130130                                 
     
    132132                                _es.AddEmotion(perceivedEmotion, this); 
    133133                                 
    134                                 for(IAppraisalComponent c : _appraisalComponents) 
     134                                for(IAppraisalDerivationComponent c : _appraisalComponents) 
    135135                                { 
    136136                                        c.inverseAppraisal(this,af); 
     
    145145        public void appraisal(Event e, AppraisalFrame as)  
    146146        {        
    147                 for(IAppraisalComponent ac : _appraisalComponents) 
     147                for(IAppraisalDerivationComponent ac : _appraisalComponents) 
    148148                { 
    149149                        ac.appraisal(this,e,as); 
     
    169169                } 
    170170                 
    171                 if(c instanceof IAppraisalComponent) 
    172                 { 
    173                         _appraisalComponents.add((IAppraisalComponent) c); 
     171                if(c instanceof IAppraisalDerivationComponent) 
     172                { 
     173                        _appraisalComponents.add((IAppraisalDerivationComponent) c); 
    174174                } 
    175175                if(c instanceof IAffectDerivationComponent) 
     
    218218                for(IAffectDerivationComponent ac : this._affectDerivationComponents) 
    219219                { 
    220                         emotions = ac.affectElicitation(this, appraisalVariable, af); 
     220                        emotions = ac.affectDerivation(this, appraisalVariable, af); 
    221221                        for(BaseEmotion em : emotions) 
    222222                        { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA.ToM/src/FAtiMA/ToM/ToMComponent.java

    r802 r809  
    77import FAtiMA.Core.AgentCore; 
    88import FAtiMA.Core.AgentModel; 
    9 import FAtiMA.Core.IAppraisalComponent; 
     9import FAtiMA.Core.IAppraisalDerivationComponent; 
    1010import FAtiMA.Core.IComponent; 
    1111import FAtiMA.Core.IGetModelStrategy; 
     
    2323import FAtiMA.Core.wellFormedNames.Symbol; 
    2424 
    25 public class ToMComponent implements Serializable, IAppraisalComponent, IAdvancedPerceptionsComponent, IGetModelStrategy, IGetUtilityForOthers { 
     25public class ToMComponent implements Serializable, IAppraisalDerivationComponent, IAdvancedPerceptionsComponent, IGetModelStrategy, IGetUtilityForOthers { 
    2626         
    2727        /** 
Note: See TracChangeset for help on using the changeset viewer.