Changeset 929

Timestamp:

02/09/2011 04:54:28 PM (8 years ago)

Author:

joao.dias

Message:

 

Location:

AgentMind/branches/FAtiMA-Modular

Files:

• FAtiMA.AdvancedMemory/src/main/java/FAtiMA/advancedMemoryComponent/AdvancedMemoryComponent.java (modified) (1 diff)
• FAtiMA.AdvancedMemory/src/main/java/FAtiMA/advancedMemoryComponent/SACondition.java (modified) (1 diff)
• FAtiMA.EmotionalIntelligence/src/FAtiMA/emotionalIntelligence/EmotionalIntelligence.java (modified) (1 diff)
• FAtiMA.Emotivector/src/FAtiMA/emotivector/EmotivectorComponent.java (modified) (1 diff)
• FAtiMA.MotivationalSystem/src/FAtiMA/motivationalSystem/MotivationalComponent.java (modified) (3 diffs)
• FAtiMA.SocialRelations/src/FAtiMA/socialRelations/SocialRelationsComponent.java (modified) (1 diff)
• FAtiMA.ToM/src/FAtiMA/ToM/ModelOfOther.java (modified) (1 diff)
• FAtiMA.ToM/src/FAtiMA/ToM/ModelOfOtherPanel.java (modified) (2 diffs)
• FAtiMA.ToM/src/FAtiMA/ToM/ToMComponent.java (modified) (1 diff)
• FAtiMA.culture/src/FAtiMA/culture/CulturalDimensionsComponent.java (modified) (2 diffs)

AgentMind/branches/FAtiMA-Modular/FAtiMA.AdvancedMemory/src/main/java/FAtiMA/advancedMemoryComponent/AdvancedMemoryComponent.java

@@ -41 +41 @@
 import FAtiMA.Core.AgentModel;
 import FAtiMA.Core.AgentSimulationTime;
-import FAtiMA.Core.IAppraisalDerivationComponent;
-import FAtiMA.Core.IProcessExternalRequestComponent;
 import FAtiMA.Core.Display.AgentDisplayPanel;
 import FAtiMA.Core.OCCAffectDerivation.OCCAppraisalVariables;
-import FAtiMA.Core.OCCAffectDerivation.OCCComponent;
+import FAtiMA.Core.componentTypes.IAppraisalDerivationComponent;
+import FAtiMA.Core.componentTypes.IProcessExternalRequestComponent;
 import FAtiMA.Core.emotionalState.AppraisalFrame;
 import FAtiMA.Core.memory.Memory;

AgentMind/branches/FAtiMA-Modular/FAtiMA.AdvancedMemory/src/main/java/FAtiMA/advancedMemoryComponent/SACondition.java

@@ -8 +8 @@
 
 import FAtiMA.Core.AgentModel;
-import FAtiMA.Core.IComponent;
+import FAtiMA.Core.componentTypes.IComponent;
 import FAtiMA.Core.conditions.Condition;
 import FAtiMA.Core.wellFormedNames.Name;

AgentMind/branches/FAtiMA-Modular/FAtiMA.EmotionalIntelligence/src/FAtiMA/emotionalIntelligence/EmotionalIntelligence.java

@@ -8 +8 @@
 
 import FAtiMA.Core.AgentModel;
-import FAtiMA.Core.IComponent;
 import FAtiMA.Core.Display.AgentDisplayPanel;
+import FAtiMA.Core.componentTypes.IComponent;
 import FAtiMA.Core.deliberativeLayer.EmotionalPlanner;
 import FAtiMA.Core.deliberativeLayer.plan.Step;

AgentMind/branches/FAtiMA-Modular/FAtiMA.Emotivector/src/FAtiMA/emotivector/EmotivectorComponent.java

@@ -4 +4 @@
 
 import FAtiMA.Core.AgentModel;
-import FAtiMA.Core.IAffectDerivationComponent;
-import FAtiMA.Core.IAppraisalDerivationComponent;
-import FAtiMA.Core.IComponent;
 import FAtiMA.Core.Display.AgentDisplayPanel;
+import FAtiMA.Core.componentTypes.IAffectDerivationComponent;
+import FAtiMA.Core.componentTypes.IAppraisalDerivationComponent;
+import FAtiMA.Core.componentTypes.IComponent;
 import FAtiMA.Core.emotionalState.AppraisalFrame;
 import FAtiMA.Core.emotionalState.BaseEmotion;
 import FAtiMA.Core.sensorEffector.Event;
-import FAtiMA.emotivector.EmotivectorSensationType;
 
 public class EmotivectorComponent implements IComponent, IAppraisalDerivationComponent, IAffectDerivationComponent {

AgentMind/branches/FAtiMA-Modular/FAtiMA.MotivationalSystem/src/FAtiMA/motivationalSystem/MotivationalComponent.java

@@ -16 +16 @@
 import FAtiMA.Core.AgentModel;
 import FAtiMA.Core.AgentSimulationTime;
-import FAtiMA.Core.IAppraisalDerivationComponent;
-import FAtiMA.Core.IComponent;
-import FAtiMA.Core.IModelOfOtherComponent;
 import FAtiMA.Core.Display.AgentDisplayPanel;
 import FAtiMA.Core.OCCAffectDerivation.OCCAppraisalVariables;
-import FAtiMA.Core.OCCAffectDerivation.OCCComponent;
+import FAtiMA.Core.componentTypes.IAppraisalDerivationComponent;
+import FAtiMA.Core.componentTypes.IComponent;
+import FAtiMA.Core.componentTypes.IModelOfOtherComponent;
 import FAtiMA.Core.deliberativeLayer.IActionFailureStrategy;
 import FAtiMA.Core.deliberativeLayer.IExpectedUtilityStrategy;
@@ -51 +50 @@
         
         private static final float UTILITY_WEIGHT = 0.2f;
+        private static final float EFFECT_ON_DRIVES_WEIGHT = 0.5f;
         private static final long serialVersionUID = 1L;
         public static final String NAME ="MotivationalState";
@@ -444 +444 @@
         {
                 float result =  UpdateMotivators(am, e);
-                _appraisals.put(e.toString(), new Float(result*0.5));
+                _appraisals.put(e.toString(), new Float(result * EFFECT_ON_DRIVES_WEIGHT));
         }
 

AgentMind/branches/FAtiMA-Modular/FAtiMA.SocialRelations/src/FAtiMA/socialRelations/SocialRelationsComponent.java

@@ -9 +9 @@
 
 import FAtiMA.Core.AgentModel;
-import FAtiMA.Core.IAppraisalDerivationComponent;
-import FAtiMA.Core.IComponent;
-import FAtiMA.Core.IModelOfOtherComponent;
-import FAtiMA.Core.IProcessEmotionComponent;
 import FAtiMA.Core.Display.AgentDisplayPanel;
 import FAtiMA.Core.OCCAffectDerivation.OCCAppraisalVariables;
-import FAtiMA.Core.OCCAffectDerivation.OCCComponent;
 import FAtiMA.Core.OCCAffectDerivation.OCCEmotionType;
+import FAtiMA.Core.componentTypes.IAppraisalDerivationComponent;
+import FAtiMA.Core.componentTypes.IComponent;
+import FAtiMA.Core.componentTypes.IModelOfOtherComponent;
+import FAtiMA.Core.componentTypes.IProcessEmotionComponent;
 import FAtiMA.Core.emotionalState.ActiveEmotion;
 import FAtiMA.Core.emotionalState.AppraisalFrame;

AgentMind/branches/FAtiMA-Modular/FAtiMA.ToM/src/FAtiMA/ToM/ModelOfOther.java

@@ -8 +8 @@
 import FAtiMA.Core.AgentCore;
 import FAtiMA.Core.AgentModel;
-import FAtiMA.Core.IAffectDerivationComponent;
-import FAtiMA.Core.IAppraisalDerivationComponent;
-import FAtiMA.Core.IComponent;
 import FAtiMA.Core.IGetModelStrategy;
-import FAtiMA.Core.IProcessEmotionComponent;
+import FAtiMA.Core.componentTypes.IAffectDerivationComponent;
+import FAtiMA.Core.componentTypes.IAppraisalDerivationComponent;
+import FAtiMA.Core.componentTypes.IComponent;
+import FAtiMA.Core.componentTypes.IProcessEmotionComponent;
 import FAtiMA.Core.deliberativeLayer.DeliberativeProcess;
 import FAtiMA.Core.emotionalState.ActiveEmotion;

AgentMind/branches/FAtiMA-Modular/FAtiMA.ToM/src/FAtiMA/ToM/ModelOfOtherPanel.java

@@ -6 +6 @@
 import FAtiMA.Core.AgentCore;
 import FAtiMA.Core.AgentModel;
-import FAtiMA.Core.IComponent;
 import FAtiMA.Core.Display.ActionTendenciesPanel;
 import FAtiMA.Core.Display.AgentDisplayPanel;
@@ -12 +11 @@
 import FAtiMA.Core.Display.KnowledgeBasePanel;
 import FAtiMA.Core.Display.ShortTermMemoryPanel;
+import FAtiMA.Core.componentTypes.IComponent;
 
 public class ModelOfOtherPanel extends AgentDisplayPanel {

AgentMind/branches/FAtiMA-Modular/FAtiMA.ToM/src/FAtiMA/ToM/ToMComponent.java

@@ -7 +7 @@
 import FAtiMA.Core.AgentCore;
 import FAtiMA.Core.AgentModel;
-import FAtiMA.Core.IAdvancedPerceptionsComponent;
-import FAtiMA.Core.IAppraisalDerivationComponent;
-import FAtiMA.Core.IComponent;
 import FAtiMA.Core.IGetModelStrategy;
-import FAtiMA.Core.IModelOfOtherComponent;
 import FAtiMA.Core.Display.AgentDisplayPanel;
 import FAtiMA.Core.OCCAffectDerivation.OCCAppraisalVariables;
+import FAtiMA.Core.componentTypes.IAdvancedPerceptionsComponent;
+import FAtiMA.Core.componentTypes.IAppraisalDerivationComponent;
+import FAtiMA.Core.componentTypes.IComponent;
+import FAtiMA.Core.componentTypes.IModelOfOtherComponent;
 import FAtiMA.Core.deliberativeLayer.IGetUtilityForOthers;
 import FAtiMA.Core.deliberativeLayer.goals.ActivePursuitGoal;

AgentMind/branches/FAtiMA-Modular/FAtiMA.culture/src/FAtiMA/culture/CulturalDimensionsComponent.java

@@ -11 +11 @@
 
 import FAtiMA.Core.AgentModel;
-import FAtiMA.Core.IAppraisalDerivationComponent;
 import FAtiMA.Core.Display.AgentDisplayPanel;
 import FAtiMA.Core.OCCAffectDerivation.OCCAppraisalVariables;
-import FAtiMA.Core.OCCAffectDerivation.OCCComponent;
+import FAtiMA.Core.componentTypes.IAppraisalDerivationComponent;
 import FAtiMA.Core.conditions.Condition;
 import FAtiMA.Core.deliberativeLayer.IExpectedUtilityStrategy;
@@ -240 +239 @@
                 }
                 else{
-                        return (contributionToOthersNeeds - contributionToSelfNeeds) * collectivismCoefficient;
+                        float praiseworthiness = (contributionToOthersNeeds - contributionToSelfNeeds) * collectivismCoefficient;
+                        return praiseworthiness;
                 }
         }