Changeset 929


Ignore:
Timestamp:
02/09/2011 04:54:28 PM (8 years ago)
Author:
joao.dias
Message:
 
Location:
AgentMind/branches/FAtiMA-Modular
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • AgentMind/branches/FAtiMA-Modular/FAtiMA.AdvancedMemory/src/main/java/FAtiMA/advancedMemoryComponent/AdvancedMemoryComponent.java

    r879 r929  
    4141import FAtiMA.Core.AgentModel; 
    4242import FAtiMA.Core.AgentSimulationTime; 
    43 import FAtiMA.Core.IAppraisalDerivationComponent; 
    44 import FAtiMA.Core.IProcessExternalRequestComponent; 
    4543import FAtiMA.Core.Display.AgentDisplayPanel; 
    4644import FAtiMA.Core.OCCAffectDerivation.OCCAppraisalVariables; 
    47 import FAtiMA.Core.OCCAffectDerivation.OCCComponent; 
     45import FAtiMA.Core.componentTypes.IAppraisalDerivationComponent; 
     46import FAtiMA.Core.componentTypes.IProcessExternalRequestComponent; 
    4847import FAtiMA.Core.emotionalState.AppraisalFrame; 
    4948import FAtiMA.Core.memory.Memory; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA.AdvancedMemory/src/main/java/FAtiMA/advancedMemoryComponent/SACondition.java

    r727 r929  
    88 
    99import FAtiMA.Core.AgentModel; 
    10 import FAtiMA.Core.IComponent; 
     10import FAtiMA.Core.componentTypes.IComponent; 
    1111import FAtiMA.Core.conditions.Condition; 
    1212import FAtiMA.Core.wellFormedNames.Name; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA.EmotionalIntelligence/src/FAtiMA/emotionalIntelligence/EmotionalIntelligence.java

    r801 r929  
    88 
    99import FAtiMA.Core.AgentModel; 
    10 import FAtiMA.Core.IComponent; 
    1110import FAtiMA.Core.Display.AgentDisplayPanel; 
     11import FAtiMA.Core.componentTypes.IComponent; 
    1212import FAtiMA.Core.deliberativeLayer.EmotionalPlanner; 
    1313import FAtiMA.Core.deliberativeLayer.plan.Step; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA.Emotivector/src/FAtiMA/emotivector/EmotivectorComponent.java

    r875 r929  
    44 
    55import FAtiMA.Core.AgentModel; 
    6 import FAtiMA.Core.IAffectDerivationComponent; 
    7 import FAtiMA.Core.IAppraisalDerivationComponent; 
    8 import FAtiMA.Core.IComponent; 
    96import FAtiMA.Core.Display.AgentDisplayPanel; 
     7import FAtiMA.Core.componentTypes.IAffectDerivationComponent; 
     8import FAtiMA.Core.componentTypes.IAppraisalDerivationComponent; 
     9import FAtiMA.Core.componentTypes.IComponent; 
    1010import FAtiMA.Core.emotionalState.AppraisalFrame; 
    1111import FAtiMA.Core.emotionalState.BaseEmotion; 
    1212import FAtiMA.Core.sensorEffector.Event; 
    13 import FAtiMA.emotivector.EmotivectorSensationType; 
    1413 
    1514public class EmotivectorComponent implements IComponent, IAppraisalDerivationComponent, IAffectDerivationComponent { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA.MotivationalSystem/src/FAtiMA/motivationalSystem/MotivationalComponent.java

    r887 r929  
    1616import FAtiMA.Core.AgentModel; 
    1717import FAtiMA.Core.AgentSimulationTime; 
    18 import FAtiMA.Core.IAppraisalDerivationComponent; 
    19 import FAtiMA.Core.IComponent; 
    20 import FAtiMA.Core.IModelOfOtherComponent; 
    2118import FAtiMA.Core.Display.AgentDisplayPanel; 
    2219import FAtiMA.Core.OCCAffectDerivation.OCCAppraisalVariables; 
    23 import FAtiMA.Core.OCCAffectDerivation.OCCComponent; 
     20import FAtiMA.Core.componentTypes.IAppraisalDerivationComponent; 
     21import FAtiMA.Core.componentTypes.IComponent; 
     22import FAtiMA.Core.componentTypes.IModelOfOtherComponent; 
    2423import FAtiMA.Core.deliberativeLayer.IActionFailureStrategy; 
    2524import FAtiMA.Core.deliberativeLayer.IExpectedUtilityStrategy; 
     
    5150         
    5251        private static final float UTILITY_WEIGHT = 0.2f; 
     52        private static final float EFFECT_ON_DRIVES_WEIGHT = 0.5f; 
    5353        private static final long serialVersionUID = 1L; 
    5454        public static final String NAME ="MotivationalState"; 
     
    444444        { 
    445445                float result =  UpdateMotivators(am, e); 
    446                 _appraisals.put(e.toString(), new Float(result*0.5)); 
     446                _appraisals.put(e.toString(), new Float(result * EFFECT_ON_DRIVES_WEIGHT)); 
    447447        } 
    448448 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA.SocialRelations/src/FAtiMA/socialRelations/SocialRelationsComponent.java

    r886 r929  
    99 
    1010import FAtiMA.Core.AgentModel; 
    11 import FAtiMA.Core.IAppraisalDerivationComponent; 
    12 import FAtiMA.Core.IComponent; 
    13 import FAtiMA.Core.IModelOfOtherComponent; 
    14 import FAtiMA.Core.IProcessEmotionComponent; 
    1511import FAtiMA.Core.Display.AgentDisplayPanel; 
    1612import FAtiMA.Core.OCCAffectDerivation.OCCAppraisalVariables; 
    17 import FAtiMA.Core.OCCAffectDerivation.OCCComponent; 
    1813import FAtiMA.Core.OCCAffectDerivation.OCCEmotionType; 
     14import FAtiMA.Core.componentTypes.IAppraisalDerivationComponent; 
     15import FAtiMA.Core.componentTypes.IComponent; 
     16import FAtiMA.Core.componentTypes.IModelOfOtherComponent; 
     17import FAtiMA.Core.componentTypes.IProcessEmotionComponent; 
    1918import FAtiMA.Core.emotionalState.ActiveEmotion; 
    2019import FAtiMA.Core.emotionalState.AppraisalFrame; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA.ToM/src/FAtiMA/ToM/ModelOfOther.java

    r848 r929  
    88import FAtiMA.Core.AgentCore; 
    99import FAtiMA.Core.AgentModel; 
    10 import FAtiMA.Core.IAffectDerivationComponent; 
    11 import FAtiMA.Core.IAppraisalDerivationComponent; 
    12 import FAtiMA.Core.IComponent; 
    1310import FAtiMA.Core.IGetModelStrategy; 
    14 import FAtiMA.Core.IProcessEmotionComponent; 
     11import FAtiMA.Core.componentTypes.IAffectDerivationComponent; 
     12import FAtiMA.Core.componentTypes.IAppraisalDerivationComponent; 
     13import FAtiMA.Core.componentTypes.IComponent; 
     14import FAtiMA.Core.componentTypes.IProcessEmotionComponent; 
    1515import FAtiMA.Core.deliberativeLayer.DeliberativeProcess; 
    1616import FAtiMA.Core.emotionalState.ActiveEmotion; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA.ToM/src/FAtiMA/ToM/ModelOfOtherPanel.java

    r742 r929  
    66import FAtiMA.Core.AgentCore; 
    77import FAtiMA.Core.AgentModel; 
    8 import FAtiMA.Core.IComponent; 
    98import FAtiMA.Core.Display.ActionTendenciesPanel; 
    109import FAtiMA.Core.Display.AgentDisplayPanel; 
     
    1211import FAtiMA.Core.Display.KnowledgeBasePanel; 
    1312import FAtiMA.Core.Display.ShortTermMemoryPanel; 
     13import FAtiMA.Core.componentTypes.IComponent; 
    1414 
    1515public class ModelOfOtherPanel extends AgentDisplayPanel { 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA.ToM/src/FAtiMA/ToM/ToMComponent.java

    r880 r929  
    77import FAtiMA.Core.AgentCore; 
    88import FAtiMA.Core.AgentModel; 
    9 import FAtiMA.Core.IAdvancedPerceptionsComponent; 
    10 import FAtiMA.Core.IAppraisalDerivationComponent; 
    11 import FAtiMA.Core.IComponent; 
    129import FAtiMA.Core.IGetModelStrategy; 
    13 import FAtiMA.Core.IModelOfOtherComponent; 
    1410import FAtiMA.Core.Display.AgentDisplayPanel; 
    1511import FAtiMA.Core.OCCAffectDerivation.OCCAppraisalVariables; 
     12import FAtiMA.Core.componentTypes.IAdvancedPerceptionsComponent; 
     13import FAtiMA.Core.componentTypes.IAppraisalDerivationComponent; 
     14import FAtiMA.Core.componentTypes.IComponent; 
     15import FAtiMA.Core.componentTypes.IModelOfOtherComponent; 
    1616import FAtiMA.Core.deliberativeLayer.IGetUtilityForOthers; 
    1717import FAtiMA.Core.deliberativeLayer.goals.ActivePursuitGoal; 
  • AgentMind/branches/FAtiMA-Modular/FAtiMA.culture/src/FAtiMA/culture/CulturalDimensionsComponent.java

    r878 r929  
    1111 
    1212import FAtiMA.Core.AgentModel; 
    13 import FAtiMA.Core.IAppraisalDerivationComponent; 
    1413import FAtiMA.Core.Display.AgentDisplayPanel; 
    1514import FAtiMA.Core.OCCAffectDerivation.OCCAppraisalVariables; 
    16 import FAtiMA.Core.OCCAffectDerivation.OCCComponent; 
     15import FAtiMA.Core.componentTypes.IAppraisalDerivationComponent; 
    1716import FAtiMA.Core.conditions.Condition; 
    1817import FAtiMA.Core.deliberativeLayer.IExpectedUtilityStrategy; 
     
    240239                } 
    241240                else{ 
    242                         return (contributionToOthersNeeds - contributionToSelfNeeds) * collectivismCoefficient; 
     241                        float praiseworthiness = (contributionToOthersNeeds - contributionToSelfNeeds) * collectivismCoefficient; 
     242                        return praiseworthiness; 
    243243                } 
    244244        } 
Note: See TracChangeset for help on using the changeset viewer.