Changeset 878 for AgentMind/branches

Timestamp:

01/25/2011 02:04:18 PM (10 years ago)

Author:

joao.dias

Message:

 

Location:

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

Files:

• CulturalDimensionType.java (copied) (copied from AgentMind/branches/FAtiMA-Modular/FAtiMA/src/FAtiMA/Core/util/enumerables/CulturalDimensionType.java) (1 diff)
• CulturalDimensionsComponent.java (modified) (4 diffs)
• CultureLoaderHandler.java (modified) (1 diff)

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

@@ -1 @@
-package FAtiMA.Core.util.enumerables;
+package FAtiMA.culture;
 
 import FAtiMA.Core.exceptions.InvalidDimensionTypeException;

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

@@ -13 +13 @@
 import FAtiMA.Core.IAppraisalDerivationComponent;
 import FAtiMA.Core.Display.AgentDisplayPanel;
+import FAtiMA.Core.OCCAffectDerivation.OCCAppraisalVariables;
 import FAtiMA.Core.OCCAffectDerivation.OCCComponent;
 import FAtiMA.Core.conditions.Condition;
@@ -25 +26 @@
 import FAtiMA.Core.util.AgentLogger;
 import FAtiMA.Core.util.Constants;
-import FAtiMA.Core.util.enumerables.CulturalDimensionType;
 import FAtiMA.Core.wellFormedNames.Name;
 import FAtiMA.Core.wellFormedNames.SubstitutionSet;
@@ -67 +67 @@
         {
                 float desirabilityForOther = 0;
-                float desirability = af.getAppraisalVariable(OCCComponent.DESIRABILITY);
+                float desirability = af.getAppraisalVariable(OCCAppraisalVariables.DESIRABILITY.name());
                 
                 
                 for(String variable : af.getAppraisalVariables())
                 {
-                        if(variable.startsWith(OCCComponent.DESFOROTHER))
+                        if(variable.startsWith(OCCAppraisalVariables.DESFOROTHER.name()))
                         {
                                 desirabilityForOther += af.getAppraisalVariable(variable);
@@ -82 +82 @@
                                 desirabilityForOther);
                 
-                af.SetAppraisalVariable(NAME, (short)4, OCCComponent.PRAISEWORTHINESS, praiseWorthiness);       
+                af.SetAppraisalVariable(NAME, (short)4, OCCAppraisalVariables.PRAISEWORTHINESS.name(), praiseWorthiness);       
                 
         }

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

@@ -53 +53 @@
 import FAtiMA.Core.sensorEffector.Event;
 import FAtiMA.Core.util.AgentLogger;
-import FAtiMA.Core.util.enumerables.CulturalDimensionType;
 import FAtiMA.Core.util.parsers.ReflectXMLHandler;
 import FAtiMA.Core.wellFormedNames.Name;