Changeset 914

Timestamp:

02/02/2011 04:44:13 PM (8 years ago)

Author:

joao.dias

Message:

 

Location:

AgentMind/branches/FAtiMA-Modular

Files:

• AgentLauncher/src/AgentLauncher.java (modified) (1 diff)
• FAtiMA.AdvancedMemory/.classpath (modified) (1 diff)
• FAtiMA.AdvancedMemory/src/main/java/FAtiMA/advancedMemoryComponent/RuleEngine.java (modified) (2 diffs)
• FAtiMA/src/FAtiMA/Core/OCCAffectDerivation/OCCEmotionType.java (modified) (1 diff)
• data/characters/minds/LIRECGoalLibrary.xml (modified) (1 diff)

AgentMind/branches/FAtiMA-Modular/AgentLauncher/src/AgentLauncher.java

@@ -35 +35 @@
                         //aG.addComponent(new CulturalDimensionsComponent(cultureFile));
                         //aG.addComponent(new SocialRelationsComponent(extraFiles));
-                        //aG.addComponent(new MotivationalComponent(extraFiles));
+                        aG.addComponent(new MotivationalComponent(extraFiles));
                         //aG.addComponent(new ToMComponent(ConfigurationManager.getName()));
                         //aG.addComponent(new AdvancedMemoryComponent());

AgentMind/branches/FAtiMA-Modular/FAtiMA.AdvancedMemory/.classpath

@@ -9 +9 @@
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
         <classpathentry combineaccessrules="false" kind="src" path="/FAtiMA"/>
+        <classpathentry kind="lib" path="/FAtiMA/xmlenc-0.52.jar"/>
         <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Drools"/>
-        <classpathentry kind="lib" path="/FAtiMA/xmlenc-0.52.jar"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

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

@@ -1 +1 @@
 package FAtiMA.advancedMemoryComponent;
 
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -7 +6 @@
 import java.io.Serializable;
 import java.util.ArrayList;
-
 
 import org.drools.KnowledgeBase;

AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/OCCAffectDerivation/OCCEmotionType.java

@@ -4 +4 @@
 
 public enum OCCEmotionType {
-        ADMIRATION (EmotionValence.POSITIVE){public String[] getAppraisalVariables(){return admirationVariables;}},
-        ANGER (EmotionValence.POSITIVE) {public String[] getAppraisalVariables(){return angerVariables;}},
-        DISAPPOINTMENT (EmotionValence.NEGATIVE) {public String[] getAppraisalVariables(){return disappointmentVariables;}},
-        DISTRESS (EmotionValence.NEGATIVE) {public String[] getAppraisalVariables(){return distressVariables;}},
+        ADMIRATION (EmotionValence.POSITIVE){public String[] getAppraisalVariables(){return attribution;}},
+        ANGER (EmotionValence.POSITIVE) {public String[] getAppraisalVariables(){return composed;}},
+        DISAPPOINTMENT (EmotionValence.NEGATIVE) {public String[] getAppraisalVariables(){return prospectBased;}},
+        DISTRESS (EmotionValence.NEGATIVE) {public String[] getAppraisalVariables(){return wellBeing;}},
         FEAR (EmotionValence.NEGATIVE) {public String[] getAppraisalVariables(){return fearVariables;}},
-        FEARS_CONFIRMED (EmotionValence.NEGATIVE) {public String[] getAppraisalVariables(){return fearsConfirmedVariables;}},
-        GRATIFICATION (EmotionValence.POSITIVE) {public String[] getAppraisalVariables(){return gratificationVariables;}},
-        GLOATING (EmotionValence.POSITIVE) {public String[] getAppraisalVariables(){return gloatingVariables;}},
-        HAPPY_FOR(EmotionValence.POSITIVE) {public String[] getAppraisalVariables(){return happyForVariables;}},
-        HATE (EmotionValence.NEGATIVE) {public String[] getAppraisalVariables(){return hateVariables;}},
+        FEARS_CONFIRMED (EmotionValence.NEGATIVE) {public String[] getAppraisalVariables(){return prospectBased;}},
+        GRATIFICATION (EmotionValence.POSITIVE) {public String[] getAppraisalVariables(){return composed;}},
+        GLOATING (EmotionValence.POSITIVE) {public String[] getAppraisalVariables(){return fortuneOfOthers;}},
+        HAPPY_FOR(EmotionValence.POSITIVE) {public String[] getAppraisalVariables(){return fortuneOfOthers;}},
+        HATE (EmotionValence.NEGATIVE) {public String[] getAppraisalVariables(){return attraction;}},
         HOPE (EmotionValence.POSITIVE) {public String[] getAppraisalVariables(){return hopeVariables;}},
-        JOY (EmotionValence.POSITIVE) {public String[] getAppraisalVariables(){return joyVariables;}},
-        LOVE (EmotionValence.POSITIVE) {public String[] getAppraisalVariables(){return loveVariables;}},
-        PITTY (EmotionValence.NEGATIVE) {public String[] getAppraisalVariables(){return pittyVariables;}},
-        PRIDE (EmotionValence.POSITIVE) {public String[] getAppraisalVariables(){return prideVariables;}},
-        RELIEF (EmotionValence.POSITIVE) {public String[] getAppraisalVariables(){return reliefVariables;}},
-        REMORSE (EmotionValence.NEGATIVE) {public String[] getAppraisalVariables(){return remorseVariables;}},
-        REPROACH (EmotionValence.NEGATIVE) {public String[] getAppraisalVariables(){return reproachVariables;}},
-        RESENTMENT (EmotionValence.NEGATIVE) {public String[] getAppraisalVariables(){return resentmentVariables;}},
-        SATISFACTION (EmotionValence.POSITIVE) {public String[] getAppraisalVariables(){return satisfactionVariables;}},
-        SHAME (EmotionValence.NEGATIVE) {public String[] getAppraisalVariables(){return shameVariables;}};
+        JOY (EmotionValence.POSITIVE) {public String[] getAppraisalVariables(){return wellBeing;}},
+        LOVE (EmotionValence.POSITIVE) {public String[] getAppraisalVariables(){return attraction;}},
+        PITTY (EmotionValence.NEGATIVE) {public String[] getAppraisalVariables(){return fortuneOfOthers;}},
+        PRIDE (EmotionValence.POSITIVE) {public String[] getAppraisalVariables(){return attribution;}},
+        RELIEF (EmotionValence.POSITIVE) {public String[] getAppraisalVariables(){return prospectBased;}},
+        REMORSE (EmotionValence.NEGATIVE) {public String[] getAppraisalVariables(){return composed;}},
+        REPROACH (EmotionValence.NEGATIVE) {public String[] getAppraisalVariables(){return attribution;}},
+        RESENTMENT (EmotionValence.NEGATIVE) {public String[] getAppraisalVariables(){return fortuneOfOthers;}},
+        SATISFACTION (EmotionValence.POSITIVE) {public String[] getAppraisalVariables(){return prospectBased;}},
+        SHAME (EmotionValence.NEGATIVE) {public String[] getAppraisalVariables(){return attribution;}};
         
         
         public abstract String[] getAppraisalVariables();
 
-        private static String[] admirationVariables = {OCCAppraisalVariables.PRAISEWORTHINESS.name()};
-        private static String[] angerVariables = {null};
-        private static String[] disappointmentVariables = {OCCAppraisalVariables.GOALCONDUCIVENESS.name(),OCCAppraisalVariables.GOALSTATUS.name()};
-        private static String[] distressVariables = {OCCAppraisalVariables.DESIRABILITY.name()};
+        private static String[] attribution = {OCCAppraisalVariables.PRAISEWORTHINESS.name()};
+        private static String[] wellBeing = {OCCAppraisalVariables.DESIRABILITY.name()};
+        private static String[] fortuneOfOthers = {OCCAppraisalVariables.DESIRABILITY.name(),OCCAppraisalVariables.DESFOROTHER.name()};
+        private static String[] attraction = {OCCAppraisalVariables.DESIRABILITY.name()};
+        private static String[] composed = {OCCAppraisalVariables.DESIRABILITY.name(),OCCAppraisalVariables.PRAISEWORTHINESS.name()};
+        
         private static String[] fearVariables = {OCCAppraisalVariables.GOALCONDUCIVENESS.name(),OCCAppraisalVariables.FAILUREPROBABILITY.name()};
-        private static String[] fearsConfirmedVariables = {OCCAppraisalVariables.GOALCONDUCIVENESS.name(),OCCAppraisalVariables.GOALSTATUS.name()};
-        private static String[] gloatingVariables = {OCCAppraisalVariables.DESIRABILITY.name(),OCCAppraisalVariables.DESFOROTHER.name()};
-        private static String[] gratificationVariables = {null};
-        private static String[] happyForVariables = {OCCAppraisalVariables.DESIRABILITY.name(),OCCAppraisalVariables.DESFOROTHER.name()};
-        private static String[] hateVariables = {OCCAppraisalVariables.LIKE.name()};
-        private static String[] hopeVariables = {OCCAppraisalVariables.GOALCONDUCIVENESS.name(),OCCAppraisalVariables.SUCCESSPROBABILITY.name()};
-        private static String[] joyVariables = {OCCAppraisalVariables.DESIRABILITY.name()};
-        private static String[] loveVariables = {OCCAppraisalVariables.LIKE.name()};
-        private static String[] pittyVariables = {OCCAppraisalVariables.DESIRABILITY.name(),OCCAppraisalVariables.DESFOROTHER.name()};
-        private static String[] prideVariables = {OCCAppraisalVariables.PRAISEWORTHINESS.name()};
-        private static String[] reliefVariables = {OCCAppraisalVariables.GOALCONDUCIVENESS.name(),OCCAppraisalVariables.GOALSTATUS.name()};
-        private static String[] remorseVariables = {null};
-        private static String[] reproachVariables = {OCCAppraisalVariables.PRAISEWORTHINESS.name()};
-        private static String[] resentmentVariables = {OCCAppraisalVariables.DESIRABILITY.name(),OCCAppraisalVariables.DESFOROTHER.name()};
-        private static String[] satisfactionVariables = {null};
-        private static String[] shameVariables = {OCCAppraisalVariables.PRAISEWORTHINESS.name()};
+        private static String[] hopeVariables = {OCCAppraisalVariables.GOALCONDUCIVENESS.name(),OCCAppraisalVariables.SUCCESSPROBABILITY.name()};       
+        private static String[] prospectBased = {OCCAppraisalVariables.GOALCONDUCIVENESS.name(),OCCAppraisalVariables.GOALSTATUS.name()};
+
         
         private final EmotionValence valence; 

AgentMind/branches/FAtiMA-Modular/data/characters/minds/LIRECGoalLibrary.xml

@@ -24 +24 @@
                         <OnSelect drive="Affiliation" target="[SELF]" value="+3"/>
                 </ExpectedEffects>      
-        </ActivePursuitGoal>
+        </ActivePursuitGoal>Click the centre of the hamster wheel!
         <ActivePursuitGoal name="PlayHideCoinWith([target])">
                 <PreConditions>