Changeset 761

Timestamp:

12/10/2010 01:24:07 PM (10 years ago)

Author:

joao.dias

Message:

 

File:

• AgentMind/branches/FAtiMA-Modular/FAtiMA.SocialRelations/src/FAtiMA/socialRelations/SocialRelationsComponent.java (modified) (8 diffs)

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

@@ -8 +8 @@
 
 import FAtiMA.Core.AgentModel;
+import FAtiMA.Core.IAppraisalComponent;
 import FAtiMA.Core.IComponent;
 import FAtiMA.Core.IModelOfOtherComponent;
 import FAtiMA.Core.IProcessEmotionComponent;
 import FAtiMA.Core.Display.AgentDisplayPanel;
+import FAtiMA.Core.OCCAffectDerivation.OCCComponent;
 import FAtiMA.Core.emotionalState.ActiveEmotion;
-import FAtiMA.Core.emotionalState.AppraisalStructure;
+import FAtiMA.Core.emotionalState.AppraisalFrame;
 import FAtiMA.Core.memory.Memory;
 import FAtiMA.Core.sensorEffector.Event;
@@ -22 +24 @@
 
 
-public class SocialRelationsComponent implements IComponent, IModelOfOtherComponent, IProcessEmotionComponent {
+public class SocialRelationsComponent implements IAppraisalComponent, IModelOfOtherComponent, IProcessEmotionComponent {
         
         public static final String NAME = "SocialRelations";
@@ -79 +81 @@
 
         @Override
-        public void appraisal(AgentModel am, Event e, AppraisalStructure as) {
+        public void startAppraisal(AgentModel am, Event e, AppraisalFrame as) {
                 if(e.GetSubject().equals(Constants.SELF) && e.GetAction().equals("look-at"))
                 {
@@ -85 +87 @@
                         if(relationShip != 0)
                         {
-                                as.SetAppraisalVariable(NAME, (short)7, AppraisalStructure.LIKE, relationShip);
+                                as.SetAppraisalVariable(NAME, (short)7, OCCComponent.LIKE, relationShip);
                         }       
                 }
@@ -91 +93 @@
 
         @Override
-        public void emotionActivation(AgentModel am, Event e, ActiveEmotion em) {
+        public void emotionActivation(AgentModel am, ActiveEmotion em) {
                 Memory m = am.getMemory();
                 switch(em.GetType())
@@ -147 +149 @@
                         case EmotionType.JOY:
                         {
-                                if(e.GetTarget() != null && e.GetTarget().equals(Constants.SELF))
+                                if(em.GetCause().GetTarget() != null && em.GetCause().GetTarget().equals(Constants.SELF))
                                 {
-                                        LikeRelation.getRelation(Constants.SELF,e.GetSubject()).increment(m, em.GetIntensity());
+                                        LikeRelation.getRelation(Constants.SELF,em.GetCause().GetSubject()).increment(m, em.GetIntensity());
                                 }
                                 break;
@@ -155 +157 @@
                         case EmotionType.DISTRESS:
                         {
-                                if(e.GetTarget() != null && e.GetTarget().equals(Constants.SELF))
+                                if(em.GetCause().GetTarget() != null && em.GetCause().GetTarget().equals(Constants.SELF))
                                 {
-                                        LikeRelation.getRelation(Constants.SELF,e.GetSubject()).decrement(m, em.GetIntensity());
+                                        LikeRelation.getRelation(Constants.SELF,em.GetCause().GetSubject()).decrement(m, em.GetIntensity());
                                 }
                                 break;
@@ -174 +176 @@
                 return new SocialRelationsPanel();
         }
+
+        @Override
+        public void continueAppraisal(AgentModel am) {
+                // TODO Auto-generated method stub
+                
+        }
 }