Changeset 929
- Timestamp:
- 02/09/2011 04:54:28 PM (10 years ago)
- 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 41 41 import FAtiMA.Core.AgentModel; 42 42 import FAtiMA.Core.AgentSimulationTime; 43 import FAtiMA.Core.IAppraisalDerivationComponent;44 import FAtiMA.Core.IProcessExternalRequestComponent;45 43 import FAtiMA.Core.Display.AgentDisplayPanel; 46 44 import FAtiMA.Core.OCCAffectDerivation.OCCAppraisalVariables; 47 import FAtiMA.Core.OCCAffectDerivation.OCCComponent; 45 import FAtiMA.Core.componentTypes.IAppraisalDerivationComponent; 46 import FAtiMA.Core.componentTypes.IProcessExternalRequestComponent; 48 47 import FAtiMA.Core.emotionalState.AppraisalFrame; 49 48 import FAtiMA.Core.memory.Memory; -
AgentMind/branches/FAtiMA-Modular/FAtiMA.AdvancedMemory/src/main/java/FAtiMA/advancedMemoryComponent/SACondition.java
r727 r929 8 8 9 9 import FAtiMA.Core.AgentModel; 10 import FAtiMA.Core. IComponent;10 import FAtiMA.Core.componentTypes.IComponent; 11 11 import FAtiMA.Core.conditions.Condition; 12 12 import FAtiMA.Core.wellFormedNames.Name; -
AgentMind/branches/FAtiMA-Modular/FAtiMA.EmotionalIntelligence/src/FAtiMA/emotionalIntelligence/EmotionalIntelligence.java
r801 r929 8 8 9 9 import FAtiMA.Core.AgentModel; 10 import FAtiMA.Core.IComponent;11 10 import FAtiMA.Core.Display.AgentDisplayPanel; 11 import FAtiMA.Core.componentTypes.IComponent; 12 12 import FAtiMA.Core.deliberativeLayer.EmotionalPlanner; 13 13 import FAtiMA.Core.deliberativeLayer.plan.Step; -
AgentMind/branches/FAtiMA-Modular/FAtiMA.Emotivector/src/FAtiMA/emotivector/EmotivectorComponent.java
r875 r929 4 4 5 5 import FAtiMA.Core.AgentModel; 6 import FAtiMA.Core.IAffectDerivationComponent;7 import FAtiMA.Core.IAppraisalDerivationComponent;8 import FAtiMA.Core.IComponent;9 6 import FAtiMA.Core.Display.AgentDisplayPanel; 7 import FAtiMA.Core.componentTypes.IAffectDerivationComponent; 8 import FAtiMA.Core.componentTypes.IAppraisalDerivationComponent; 9 import FAtiMA.Core.componentTypes.IComponent; 10 10 import FAtiMA.Core.emotionalState.AppraisalFrame; 11 11 import FAtiMA.Core.emotionalState.BaseEmotion; 12 12 import FAtiMA.Core.sensorEffector.Event; 13 import FAtiMA.emotivector.EmotivectorSensationType;14 13 15 14 public class EmotivectorComponent implements IComponent, IAppraisalDerivationComponent, IAffectDerivationComponent { -
AgentMind/branches/FAtiMA-Modular/FAtiMA.MotivationalSystem/src/FAtiMA/motivationalSystem/MotivationalComponent.java
r887 r929 16 16 import FAtiMA.Core.AgentModel; 17 17 import FAtiMA.Core.AgentSimulationTime; 18 import FAtiMA.Core.IAppraisalDerivationComponent;19 import FAtiMA.Core.IComponent;20 import FAtiMA.Core.IModelOfOtherComponent;21 18 import FAtiMA.Core.Display.AgentDisplayPanel; 22 19 import FAtiMA.Core.OCCAffectDerivation.OCCAppraisalVariables; 23 import FAtiMA.Core.OCCAffectDerivation.OCCComponent; 20 import FAtiMA.Core.componentTypes.IAppraisalDerivationComponent; 21 import FAtiMA.Core.componentTypes.IComponent; 22 import FAtiMA.Core.componentTypes.IModelOfOtherComponent; 24 23 import FAtiMA.Core.deliberativeLayer.IActionFailureStrategy; 25 24 import FAtiMA.Core.deliberativeLayer.IExpectedUtilityStrategy; … … 51 50 52 51 private static final float UTILITY_WEIGHT = 0.2f; 52 private static final float EFFECT_ON_DRIVES_WEIGHT = 0.5f; 53 53 private static final long serialVersionUID = 1L; 54 54 public static final String NAME ="MotivationalState"; … … 444 444 { 445 445 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)); 447 447 } 448 448 -
AgentMind/branches/FAtiMA-Modular/FAtiMA.SocialRelations/src/FAtiMA/socialRelations/SocialRelationsComponent.java
r886 r929 9 9 10 10 import FAtiMA.Core.AgentModel; 11 import FAtiMA.Core.IAppraisalDerivationComponent;12 import FAtiMA.Core.IComponent;13 import FAtiMA.Core.IModelOfOtherComponent;14 import FAtiMA.Core.IProcessEmotionComponent;15 11 import FAtiMA.Core.Display.AgentDisplayPanel; 16 12 import FAtiMA.Core.OCCAffectDerivation.OCCAppraisalVariables; 17 import FAtiMA.Core.OCCAffectDerivation.OCCComponent;18 13 import FAtiMA.Core.OCCAffectDerivation.OCCEmotionType; 14 import FAtiMA.Core.componentTypes.IAppraisalDerivationComponent; 15 import FAtiMA.Core.componentTypes.IComponent; 16 import FAtiMA.Core.componentTypes.IModelOfOtherComponent; 17 import FAtiMA.Core.componentTypes.IProcessEmotionComponent; 19 18 import FAtiMA.Core.emotionalState.ActiveEmotion; 20 19 import FAtiMA.Core.emotionalState.AppraisalFrame; -
AgentMind/branches/FAtiMA-Modular/FAtiMA.ToM/src/FAtiMA/ToM/ModelOfOther.java
r848 r929 8 8 import FAtiMA.Core.AgentCore; 9 9 import FAtiMA.Core.AgentModel; 10 import FAtiMA.Core.IAffectDerivationComponent;11 import FAtiMA.Core.IAppraisalDerivationComponent;12 import FAtiMA.Core.IComponent;13 10 import FAtiMA.Core.IGetModelStrategy; 14 import FAtiMA.Core.IProcessEmotionComponent; 11 import FAtiMA.Core.componentTypes.IAffectDerivationComponent; 12 import FAtiMA.Core.componentTypes.IAppraisalDerivationComponent; 13 import FAtiMA.Core.componentTypes.IComponent; 14 import FAtiMA.Core.componentTypes.IProcessEmotionComponent; 15 15 import FAtiMA.Core.deliberativeLayer.DeliberativeProcess; 16 16 import FAtiMA.Core.emotionalState.ActiveEmotion; -
AgentMind/branches/FAtiMA-Modular/FAtiMA.ToM/src/FAtiMA/ToM/ModelOfOtherPanel.java
r742 r929 6 6 import FAtiMA.Core.AgentCore; 7 7 import FAtiMA.Core.AgentModel; 8 import FAtiMA.Core.IComponent;9 8 import FAtiMA.Core.Display.ActionTendenciesPanel; 10 9 import FAtiMA.Core.Display.AgentDisplayPanel; … … 12 11 import FAtiMA.Core.Display.KnowledgeBasePanel; 13 12 import FAtiMA.Core.Display.ShortTermMemoryPanel; 13 import FAtiMA.Core.componentTypes.IComponent; 14 14 15 15 public class ModelOfOtherPanel extends AgentDisplayPanel { -
AgentMind/branches/FAtiMA-Modular/FAtiMA.ToM/src/FAtiMA/ToM/ToMComponent.java
r880 r929 7 7 import FAtiMA.Core.AgentCore; 8 8 import FAtiMA.Core.AgentModel; 9 import FAtiMA.Core.IAdvancedPerceptionsComponent;10 import FAtiMA.Core.IAppraisalDerivationComponent;11 import FAtiMA.Core.IComponent;12 9 import FAtiMA.Core.IGetModelStrategy; 13 import FAtiMA.Core.IModelOfOtherComponent;14 10 import FAtiMA.Core.Display.AgentDisplayPanel; 15 11 import FAtiMA.Core.OCCAffectDerivation.OCCAppraisalVariables; 12 import FAtiMA.Core.componentTypes.IAdvancedPerceptionsComponent; 13 import FAtiMA.Core.componentTypes.IAppraisalDerivationComponent; 14 import FAtiMA.Core.componentTypes.IComponent; 15 import FAtiMA.Core.componentTypes.IModelOfOtherComponent; 16 16 import FAtiMA.Core.deliberativeLayer.IGetUtilityForOthers; 17 17 import FAtiMA.Core.deliberativeLayer.goals.ActivePursuitGoal; -
AgentMind/branches/FAtiMA-Modular/FAtiMA.culture/src/FAtiMA/culture/CulturalDimensionsComponent.java
r878 r929 11 11 12 12 import FAtiMA.Core.AgentModel; 13 import FAtiMA.Core.IAppraisalDerivationComponent;14 13 import FAtiMA.Core.Display.AgentDisplayPanel; 15 14 import FAtiMA.Core.OCCAffectDerivation.OCCAppraisalVariables; 16 import FAtiMA.Core. OCCAffectDerivation.OCCComponent;15 import FAtiMA.Core.componentTypes.IAppraisalDerivationComponent; 17 16 import FAtiMA.Core.conditions.Condition; 18 17 import FAtiMA.Core.deliberativeLayer.IExpectedUtilityStrategy; … … 240 239 } 241 240 else{ 242 return (contributionToOthersNeeds - contributionToSelfNeeds) * collectivismCoefficient; 241 float praiseworthiness = (contributionToOthersNeeds - contributionToSelfNeeds) * collectivismCoefficient; 242 return praiseworthiness; 243 243 } 244 244 }
Note: See TracChangeset
for help on using the changeset viewer.